[eso-midas] 01/01: Fix last lintian warnings
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue Apr 22 11:57:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository eso-midas.
commit c8c47dbf9695d617ce2cb203833806028acfd46d
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Apr 22 13:57:30 2014 +0200
Fix last lintian warnings
---
debian/lintian-overrides | 4 +-
debian/patches/fix_formaterrors.patch | 2 +
debian/patches/fix_shellscripts.patch | 2 +
debian/patches/ftoc.patch | 17 ++++
debian/patches/output-to-stdout.patch | 3 +
debian/patches/propagate_buildflags.patch | 14 +--
debian/patches/series | 1 +
debian/patches/setup-debian.patch | 4 +-
debian/patches/syskeys.patch | 23 +++++
debian/patches/writting.patch | 154 +++++++++++++++++++++++++++++-
debian/rules | 12 ++-
11 files changed, 219 insertions(+), 17 deletions(-)
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index a9f0718..3b15c5f 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,2 +1,4 @@
# False positive: this is not a license file.
-extra-license-file usr/lib/eso-midas/13SEP/prim/proc/license.prg
+extra-license-file usr/lib/eso-midas/*/prim/proc/license.prg
+# False positive: all compilations were done with hardening flags.
+hardening-no-fortify-functions usr/lib/eso-midas/*/*/exec/*.exe
diff --git a/debian/patches/fix_formaterrors.patch b/debian/patches/fix_formaterrors.patch
index 4c3ccac..3ca92af 100644
--- a/debian/patches/fix_formaterrors.patch
+++ b/debian/patches/fix_formaterrors.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix non-constant format strings in printf() family
--- a/gui/GraphLib/libsrc/uimxR5/src/ux_error.c
+++ b/gui/GraphLib/libsrc/uimxR5/src/ux_error.c
@@ -77,7 +77,7 @@
diff --git a/debian/patches/fix_shellscripts.patch b/debian/patches/fix_shellscripts.patch
index c3ddf50..6c92d3d 100644
--- a/debian/patches/fix_shellscripts.patch
+++ b/debian/patches/fix_shellscripts.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix various problems with provided shell scripts
--- a/install/unix/select
+++ b/install/unix/select
@@ -187,4 +187,3 @@
diff --git a/debian/patches/ftoc.patch b/debian/patches/ftoc.patch
index f01903f..5cab740 100644
--- a/debian/patches/ftoc.patch
+++ b/debian/patches/ftoc.patch
@@ -1,3 +1,20 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix new ftoc compilation.
+ Always use ftoc_amd64.h instead of calling ftoc_comm.
+--- a/system/ftoc-new/makefile
++++ b/system/ftoc-new/makefile
+@@ -57,9 +57,8 @@
+ $(INC)/ftoc.h: $(M)/ftoc_noop
+ cp $(INC)/ftoc_pc3.h $(INC)/ftoc.h
+
+-$(INC)/ftoc_comm.h: $(M)/ftoc_comm.exe
+- rm -f $@
+- cp $(INC)/`$(M)/ftoc_comm.exe` $@
++$(INC)/ftoc_comm.h:
++ cp $(INC)/ftoc_amd64.h $@
+
+ $(INC)/ftoc_log.h: $(M)/ftoc_log.exe
+ rm -f $(INC)/ftoc_log.h
--- a/libsrc/ftoc-new/stf.fc
+++ b/libsrc/ftoc-new/stf.fc
@@ -44,6 +44,7 @@
diff --git a/debian/patches/output-to-stdout.patch b/debian/patches/output-to-stdout.patch
index 70d0716..ad27924 100644
--- a/debian/patches/output-to-stdout.patch
+++ b/debian/patches/output-to-stdout.patch
@@ -1,3 +1,6 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Run compilation in foreground and write log to stdout
+ instead of a file.
--- a/install/unix/install3
+++ b/install/unix/install3
@@ -112,8 +112,6 @@
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
index bd5fa3d..3a1bc90 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/propagate_buildflags.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Propagate CFLAGS, CPPFLAGS and LDFLAGS
--- a/contrib/template/libsrc/makefile
+++ b/contrib/template/libsrc/makefile
@@ -14,7 +14,7 @@
@@ -583,18 +585,6 @@
$(LD77_CMD) $(OBJ3) $(SLIB) -o $@ $(DEV_NULL)
$(M)/ftoc_generic.exe:: $(OBJ5)
-@@ -57,9 +57,8 @@
- $(INC)/ftoc.h: $(M)/ftoc_noop
- cp $(INC)/ftoc_pc3.h $(INC)/ftoc.h
-
--$(INC)/ftoc_comm.h: $(M)/ftoc_comm.exe
-- rm -f $@
-- cp $(INC)/`$(M)/ftoc_comm.exe` $@
-+$(INC)/ftoc_comm.h:
-+ cp $(INC)/ftoc_amd64.h $@
-
- $(INC)/ftoc_log.h: $(M)/ftoc_log.exe
- rm -f $(INC)/ftoc_log.h
--- a/system/machine/makefile
+++ b/system/machine/makefile
@@ -31,8 +31,8 @@
diff --git a/debian/patches/series b/debian/patches/series
index 764b344..4e48358 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix_shellscripts.patch
propagate_buildflags.patch
ftoc.patch
fix_formaterrors.patch
+syskeys.patch
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index 771ff4b..f3ee91d 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Debian specific changes
--- /dev/null
+++ b/local/setup
@@ -0,0 +1,4 @@
@@ -23,6 +25,6 @@
#
# For Linux 2.0.0
-gcc -shared -Wl,-soname,$1 -o $*
-+gcc -shared -Wl,-soname,$1 -o $* -lm
++gcc $LDFLAGS -shared -Wl,-soname,$1 -o $* -lm
rm -f $library.so
ln -s $1 $library.so
diff --git a/debian/patches/syskeys.patch b/debian/patches/syskeys.patch
new file mode 100644
index 0000000..96187d5
--- /dev/null
+++ b/debian/patches/syskeys.patch
@@ -0,0 +1,23 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Write correct syskeys instead of patching in install/unix/setup
+--- a/monit/syskeys.datorg
++++ b/monit/syskeys.datorg
+@@ -60,7 +60,8 @@
+ C (31:32) no. of bits for memory addresses (32 or 64)
+ C SECT./END_OF_KEY
+ MID$SYS/C/32/R
+-Vax/VMS $EDIT 32
++PC/Linux $vi
++C Vax/VMS $EDIT 32
+ C Sun/Solaris $vi 32
+ C HP/UX $vi 32
+ C PC/Linux $vi 32
+@@ -426,7 +427,7 @@
+ C $debugger debug_flags MID$EXE:module options
+ C SECT./END_OF_KEY
+ MID$DEBUG/C*40/3/R
+-$dbx
++$gdb
+ ?
+ ?
+ C
diff --git a/debian/patches/writting.patch b/debian/patches/writting.patch
index 8a5c09a..f47208b 100644
--- a/debian/patches/writting.patch
+++ b/debian/patches/writting.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix (some) spelling errors
--- a/test/os/atestosu.c
+++ b/test/os/atestosu.c
@@ -168,7 +168,7 @@
@@ -29,11 +31,73 @@
else printf("...OK");
--- a/test/os/atestosx.c
+++ b/test/os/atestosx.c
-@@ -651,7 +651,7 @@
+@@ -476,28 +476,28 @@
+ printf("OPEN SOCKET IN WRITE MODE... OK\n");
+
+ if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNA,UPPER)) != SIZEBUF) {
+- printf("WRITTING PATTERN A IN SOCKET... FAILED.\n");
++ printf("WRITING PATTERN A IN SOCKET... FAILED.\n");
+ if (nbytes != -1)
+ printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
+ ospexit(1);
+ }
+- else printf("WRITTING PATTERN A IN SOCKET... OK\n");
++ else printf("WRITING PATTERN A IN SOCKET... OK\n");
+
+ if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNB,UPPER)) != SIZEBUF) {
+- printf("WRITTING PATTERN B IN SOCKET... FAILED.\n");
++ printf("WRITING PATTERN B IN SOCKET... FAILED.\n");
+ if (nbytes != -1)
+ printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
+ ospexit(1);
+ }
+- else printf("WRITTING PATTERN B IN SOCKET... OK\n");
++ else printf("WRITING PATTERN B IN SOCKET... OK\n");
+
+ if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNC,UPPER)) != SIZEBUF) {
+- printf("WRITTING PATTERN C IN SOCKET... FAILED.\n");
++ printf("WRITING PATTERN C IN SOCKET... FAILED.\n");
+ if (nbytes != -1)
+ printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
+ ospexit(1);
+ }
+- else printf("WRITTING PATTERN C IN SOCKET... OK\n");
++ else printf("WRITING PATTERN C IN SOCKET... OK\n");
+
+ if ( (nbytes = testread(fd,buf,SIZEBUF,PATTERNA,UPPER)) != SIZEBUF) {
+ PRINTF("READING PATTERN A IN SOCKET... FAILED.\n");
+@@ -574,20 +574,20 @@
+
+
+ if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNC,UPPER)) != SIZEBUF) {
+- printf("WRITTING PATTERN C IN SOCKET... FAILED.\n");
++ printf("WRITING PATTERN C IN SOCKET... FAILED.\n");
+ if (nbytes != -1)
+ printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
+ ospexit(1);
+ }
+- else printf("WRITTING PATTERN C IN SOCKET... OK\n");
++ else printf("WRITING PATTERN C IN SOCKET... OK\n");
+
+ if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNA,UPPER)) != SIZEBUF) {
+- printf("WRITTING PATTERN A IN SOCKET... FAILED.\n");
++ printf("WRITING PATTERN A IN SOCKET... FAILED.\n");
+ if (nbytes != -1)
+ printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
+ ospexit(1);
+ }
+- else printf("WRITTING PATTERN A IN SOCKET... OK\n");
++ else printf("WRITING PATTERN A IN SOCKET... OK\n");
+
+ if ( (nbytes = testread(fd,buf,SIZEBUF,PATTERNC,UPPER)) != SIZEBUF) {
+ PRINTF("READING PATTERN C IN SOCKET... FAILED.\n");
+@@ -650,8 +650,8 @@
+
if ( (nbytes = osxwrite(fd,buffer,size)) != size) {
if (type == UPPER)
- printf("\tERROR WRITTING A BUFFER: %s\n",osmsg());
+- printf("\tERROR WRITTING A BUFFER: %s\n",osmsg());
- else printf("\tError writting a buffer: %s\n",osmsg());
++ printf("\tERROR WRITING A BUFFER: %s\n",osmsg());
+ else printf("\tError writing a buffer: %s\n",osmsg());
return(-1);
}
@@ -100,3 +164,89 @@
widx -= no; return -1;
}
pbuf += n; no -= n;
+--- a/applic/fit/libsrc/fitcon.for
++++ b/applic/fit/libsrc/fitcon.for
+@@ -695,6 +695,6 @@
+ 9020 FORMAT (I6,8X,I7,7X,1PE9.1,8X,0PF4.2,6X,0PF8.0,5X,A1)
+ 9030 FORMAT ('FIT/TABLE : Bad Scaling of the problem ','HSD from ',
+ + 1PD9.2,' to ',1PD9.2)
+- 9040 FORMAT ('*** Detected only ',I3,' linear independant parameters ',
++ 9040 FORMAT ('*** Detected only ',I3,' linear independent parameters ',
+ + 'on the total of ',I3,' ***')
+ END
+--- a/applic/fit/libsrc/fitunc.for
++++ b/applic/fit/libsrc/fitunc.for
+@@ -463,6 +463,6 @@
+ CALL TDMFRE(NBYT,PTRW,STATUS)
+ RETURN
+ 9000 FORMAT (I6,8X,I7,7X,1PE9.1,8X,0PF4.2,6X,0PF8.0,5X,A1)
+- 9010 FORMAT ('*** Detected only ',I3,' linear independant parameters ',
++ 9010 FORMAT ('*** Detected only ',I3,' linear independent parameters ',
+ + 'on the total of ',I3,' ***')
+ END
+--- a/contrib/lyman/src/minuit.for
++++ b/contrib/lyman/src/minuit.for
+@@ -2726,7 +2726,7 @@
+ +is rewound before',/,' reading. Note that this command is imple
+ +mented in standard',/' Fortran 77 and the results may depend on
+ + the system;',/,' for example, if a filename is given under VM
+- +/CMS, it must',/,' be preceeded by a slash.')
++ +/CMS, it must',/,' be preceded by a slash.')
+ 11804 FORMAT(/,' SET INTeractive',/,' Informs Minuit that it is run
+ +ning interactively.')
+ 11805 FORMAT(/,' SET LIMits [parno] [lolim] [uplim]',/,' Allows
+--- a/contrib/romafot/src/rfotmfit.for
++++ b/contrib/romafot/src/rfotmfit.for
+@@ -191,7 +191,7 @@
+ 9023 FORMAT('Total Mag. index Histogram')
+ 9024 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I',A50)
+ 9025 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I')
+- 9026 FORMAT('Components succesfully fitted: ',I6)
++ 9026 FORMAT('Components successfully fitted: ',I6)
+ 9027 FORMAT('Components with no convergency: ',I6)
+ C
+ 9031 FORMAT('Iteration: ',I6,'; Added star: ',I6)
+--- a/contrib/romafot/src/rfotrfit.for
++++ b/contrib/romafot/src/rfotrfit.for
+@@ -185,7 +185,7 @@
+ 9023 FORMAT('Total Mag. index Histogram')
+ 9024 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I',A50)
+ 9025 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I')
+- 9026 FORMAT('Components succesfully fitted: ',I6)
++ 9026 FORMAT('Components successfully fitted: ',I6)
+ 9027 FORMAT('Components with no convergency: ',I6)
+
+ 9031 FORMAT('Iteration: ',I6,'; Added star: ',I6)
+--- a/gui/XFilter/src/MainFilt.c
++++ b/gui/XFilter/src/MainFilt.c
+@@ -1376,7 +1376,7 @@
+
+ UxPutFontList( me_f_cwbw, BoldTextFont );
+ UxPutMnemonic( me_f_cwbw, "B" );
+- UxPutLabelString( me_f_cwbw, "Central Wave & Bandwith ..." );
++ UxPutLabelString( me_f_cwbw, "Central Wave & Bandwidth ..." );
+
+ UxPutFontList( me_f_filterlist, BoldTextFont );
+ UxPutMnemonic( me_f_filterlist, "L" );
+--- a/gui/XFilter/src/WaveBShell.c
++++ b/gui/XFilter/src/WaveBShell.c
+@@ -321,7 +321,7 @@
+ UxPutBackground( WaveBShell, WindowBackground );
+ UxPutBorderColor( WaveBShell, WindowBackground );
+ UxPutKeyboardFocusPolicy( WaveBShell, "pointer" );
+- UxPutIconName( WaveBShell, "Wavelength & Bandwith" );
++ UxPutIconName( WaveBShell, "Wavelength & Bandwidth" );
+ UxPutHeight( WaveBShell, 260 );
+ UxPutWidth( WaveBShell, 325 );
+ UxPutY( WaveBShell, 275 );
+--- a/monit/communi.c
++++ b/monit/communi.c
+@@ -222,7 +222,7 @@
+ else if (verify > 1)
+ {
+ (void) printf("********************************\n");
+- (void) printf("Verification procedure succesfully terminated...\n");
++ (void) printf("Verification procedure successfully terminated...\n");
+ (void) printf("********************************\n");
+ ospexit(0);
+ }
diff --git a/debian/rules b/debian/rules
index 51dfcd2..67d0882 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,10 +28,15 @@ override_dh_auto_configure:
override_dh_auto_build:
(cd $(MID_HOME); $(MID_INSTALL)/install1 -a CFLAGS=\"$(CFLAGS)\" )
- #(cd $(MID_HOME); MIDASHOME=/usr/lib/eso-midas $(MID_INSTALL)/setup -a)
+ (cd $(MID_HOME)/monit ; make syskeys.unix )
$(INMIDAS) -j "@ compile.all"
$(INMIDAS) -j "@ ascii_bin no ; bye"
(cd $(MID_HOME) ; yes | $(CLEANMIDAS) -a)
+ sed -e "s:^MIDVERS0=.*:MIDVERS0=$(MIDVERS):" \
+ -e "s:^MIDASHOME0=.*:MIDASHOME0=/usr/lib/eso-midas:" \
+ -i $(MIDVERS)/system/unix/inmidas \
+ $(MIDVERS)/system/unix/helpmidas \
+ $(MIDVERS)/system/unix/drs
override_dh_install:
dh_install $(MIDVERS) usr/lib/eso-midas/ -X.mod -XCOPYING -Xsetup~
@@ -40,6 +45,8 @@ override_dh_link:
dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/inmidas usr/bin/inmidas
dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/gomidas usr/bin/gomidas
dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/helpmidas usr/bin/helpmidas
+ dh_link /usr/lib/eso-midas/$(MIDVERS)/libsrc/ftoc-new /usr/lib/eso-midas/$(MIDVERS)/libsrc/ftoc
+ dh_link /usr/lib/eso-midas/$(MIDVERS)/system/ftoc-new /usr/lib/eso-midas/$(MIDVERS)/system/good-ftoc
override_dh_fixperms:
dh_fixperms
@@ -52,6 +59,9 @@ override_dh_fixperms:
find debian/eso-midas/usr/lib/eso-midas/13SEP/ -name \*.sh | xargs chmod 0755
chmod 0755 debian/eso-midas/usr/lib/eso-midas/13SEP/util/bench/brun
+override_dh_makeshlibs:
+ # Avoid Lintian complaint: we don't have public shared libs
+
override_dh_clean:
dh_clean
rm -rf $(MIDVERS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git
More information about the debian-science-commits
mailing list