Author: tille Date: 2012-03-06 21:55:22 +0000 (Tue, 06 Mar 2012) New Revision: 9904
Added: trunk/packages/seaview/trunk/debian/example_files/ trunk/packages/seaview/trunk/debian/patches/ trunk/packages/seaview/trunk/debian/patches/series trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch Removed: trunk/packages/seaview/trunk/debian/examples/ Modified: trunk/packages/seaview/trunk/debian/changelog trunk/packages/seaview/trunk/debian/control trunk/packages/seaview/trunk/debian/rules trunk/packages/seaview/trunk/debian/seaview.examples Log: Drop cdbs build-depends by switching to dh; rename examples directory; apply patch to really enable hardening flags Modified: trunk/packages/seaview/trunk/debian/changelog =================================================================== --- trunk/packages/seaview/trunk/debian/changelog 2012-03-06 21:13:41 UTC (rev 9903) +++ trunk/packages/seaview/trunk/debian/changelog 2012-03-06 21:55:22 UTC (rev 9904) @@ -1,3 +1,17 @@ +seaview (1:4.3.3-3) unstable; urgency=low + + * debian/control: drop cdbs Build-Dependency + * debian/rules: switch to short dh + * debian/patches/use-dpkg-buildflags.patch: Patch for upstream Makefile + to ensure hardening flags (Thanks to Simon Ruderich <[email protected]> + for the patch) + Closes: #662818 + * mv debian/examples debian/example_files + because lintian claimed executable debhelper file (missinterpreting + dir as debhelper input file) + + -- Andreas Tille <[email protected]> Tue, 06 Mar 2012 20:38:53 +0100 + seaview (1:4.3.3-2) unstable; urgency=low * Build on libpng-dev instead of libpng12-dev (Closes: #662499). Modified: trunk/packages/seaview/trunk/debian/control =================================================================== --- trunk/packages/seaview/trunk/debian/control 2012-03-06 21:13:41 UTC (rev 9903) +++ trunk/packages/seaview/trunk/debian/control 2012-03-06 21:55:22 UTC (rev 9904) @@ -5,7 +5,7 @@ DM-Upload-Allowed: yes Uploaders: Charles Plessy <[email protected]>, Andreas Tille <[email protected]> -Build-Depends: cdbs, debhelper ( >= 9 ), libfltk1.3-dev, libjpeg62-dev, libpng-dev, +Build-Depends: debhelper ( >= 9 ), libfltk1.3-dev, libjpeg62-dev, libpng-dev, libxft-dev, libxext-dev, libxinerama-dev, zlib1g-dev Standards-Version: 3.9.3 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/seaview/trunk/ Added: trunk/packages/seaview/trunk/debian/patches/series =================================================================== --- trunk/packages/seaview/trunk/debian/patches/series (rev 0) +++ trunk/packages/seaview/trunk/debian/patches/series 2012-03-06 21:55:22 UTC (rev 9904) @@ -0,0 +1 @@ +use-dpkg-buildflags.patch Added: trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch =================================================================== --- trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch (rev 0) +++ trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch 2012-03-06 21:55:22 UTC (rev 9904) @@ -0,0 +1,71 @@ +Description: Use build flags from environment (dpkg-buildflags). + Add $CPPFLAGS and $LDFLAGS for (hardening) flags. + . + Normally $CXXFLAGS is used to compile .cxx/.cpp files, but this wasn't + changed. +Author: Simon Ruderich <[email protected]> +Last-Update: 2012-03-06 + +--- seaview-4.3.3.orig/Makefile ++++ seaview-4.3.3/Makefile +@@ -36,7 +36,7 @@ + #DEBUG = -g + OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi) + +-CFLAGS = $(USE_XFT) -DFLTK1 -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS) ++CFLAGS += $(USE_XFT) -DFLTK1 -Dunix $(OPT) $(IFLTK) -I$(CSRC) -I. $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS) + + + OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o resource.o nexus.o viewasprots.o racnuc_fetch.o concatenate.o \ +@@ -47,37 +47,37 @@ + + + seaview : seaview.cxx $(OBJECTS) +- $(CXX) -o $@ $(DEBUG) $(CFLAGS) seaview.cxx $(OBJECTS) \ ++ $(CXX) -o $@ $(DEBUG) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) seaview.cxx $(OBJECTS) \ + $(LFLTK) -lfltk_images -lfltk \ + $(EXTRALIBS) \ + -lX11 -lm -lz + + raa_acnuc.o : $(CSRC)/raa_acnuc.c +- $(CC) -c $(CFLAGS) $(CSRC)/raa_acnuc.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CSRC)/raa_acnuc.c + parser.o : $(CSRC)/parser.c +- $(CC) -c $(CFLAGS) $(CSRC)/parser.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CSRC)/parser.c + misc_acnuc.o : $(CSRC)/misc_acnuc.c +- $(CC) -c $(CFLAGS) $(CSRC)/misc_acnuc.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CSRC)/misc_acnuc.c + md5.o : $(CSRC)/md5.c +- $(CC) -c $(CFLAGS) $(CSRC)/md5.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CSRC)/md5.c + zsockr.o : $(CSRC)/zsockr.c +- $(CC) -c $(CFLAGS) $(CSRC)/zsockr.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CSRC)/zsockr.c + dnapars.o : csrc/dnapars.c +- $(CC) -c $(CFLAGS) csrc/dnapars.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) csrc/dnapars.c + protpars.o : csrc/protpars.c +- $(CC) -c $(CFLAGS) csrc/protpars.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) csrc/protpars.c + lwl.o : csrc/lwl.c +- $(CC) -c $(CFLAGS) csrc/lwl.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) csrc/lwl.c + bionj.o : csrc/bionj.c +- $(CC) -c $(CFLAGS) csrc/bionj.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) csrc/bionj.c + phyml_util.o : csrc/phyml_util.c +- $(CC) -c $(CFLAGS) csrc/phyml_util.c ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) csrc/phyml_util.c + Fl_Native_File_Chooser_FLTK.o : FL/Fl_Native_File_Chooser_FLTK.cxx +- $(CC) -c $(CFLAGS) FL/Fl_Native_File_Chooser_FLTK.cxx ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) FL/Fl_Native_File_Chooser_FLTK.cxx + + .SUFFIXES: .c .cxx .h .o + + .cxx.o : +- $(CXX) -c $(CFLAGS) $< ++ $(CXX) -c $(CFLAGS) $(CPPFLAGS) $< + .c.o : +- $(CC) -c $< ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< Modified: trunk/packages/seaview/trunk/debian/rules =================================================================== --- trunk/packages/seaview/trunk/debian/rules 2012-03-06 21:13:41 UTC (rev 9903) +++ trunk/packages/seaview/trunk/debian/rules 2012-03-06 21:55:22 UTC (rev 9904) @@ -1,13 +1,19 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/cdbs/1/rules/debhelper.mk - # Same as upstream Makefile CFLAGS += -DUSE_XFT -I/usr/include/freetype2 -DFLTK1 -Dunix -Icsrc -I. -DNO_PDF +# Debian-specific names and paths +CFLAGS += -DDEFAULT_HELPFILE=\"/usr/share/seaview/seaview.html\" -DPHYMLNAME=\"phyml\" + +export DEB_CFLAGS_MAINT_APPEND = $(CFLAGS) + # Link as needed -CFLAGS += -Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -# Debian-specific names and paths -CFLAGS += -DDEFAULT_HELPFILE=\\\"/usr/share/seaview/seaview.html\\\" -DPHYMLNAME=\\\"phyml\\\" +# Hardening options +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ + Modified: trunk/packages/seaview/trunk/debian/seaview.examples =================================================================== --- trunk/packages/seaview/trunk/debian/seaview.examples 2012-03-06 21:13:41 UTC (rev 9903) +++ trunk/packages/seaview/trunk/debian/seaview.examples 2012-03-06 21:55:22 UTC (rev 9904) @@ -1,2 +1,2 @@ -debian/examples/* +debian/example_files/* example.nxs _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
