[med-svn] r12232 - in trunk/packages/seaview/trunk/debian: . patches

[Charles Plessy]

Author: plessy
Date: 2012-09-20 04:24:01 +0000 (Thu, 20 Sep 2012)
New Revision: 12232

Modified:
   trunk/packages/seaview/trunk/debian/changelog
   trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch
Log:
Removed parts of the hardening patch which were adopted upstream.


Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog	2012-09-20 04:21:28 UTC (rev 12231)
+++ trunk/packages/seaview/trunk/debian/changelog	2012-09-20 04:24:01 UTC (rev 12232)
@@ -11,6 +11,9 @@
   * debian/upstream: Keep old information from tasks file as additional
     citation
 
+  [ Charles Plessy ]
+  * debian/patches/use-dpkg-buildflags.patch: removed parts adopted upstream.
+
  -- Andreas Tille <tille at debian.org>  Sun, 01 Apr 2012 09:38:55 +0200
 
 seaview (1:4.3.3-3) unstable; urgency=low

Modified: trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch	2012-09-20 04:21:28 UTC (rev 12231)
+++ trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch	2012-09-20 04:24:01 UTC (rev 12232)
@@ -1,19 +1,10 @@
-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 <simon at ruderich.org>
-Last-Update: 2012-03-06
-Forewarded: Manolo Gouy <mgouy at biomserv.univ-lyon1.fr>
-Alternative-Solution: See discussion on debian-devel mailing list at
-   http://lists.debian.org/debian-devel/2012/03/msg00214.html
- It seems when applying this approach the patch might not be necessary
- any more.
+Description: Allow users to override CFLAGS.
+Last-Update: Thu, 20 Sep 2012 13:16:04 +0900
+Forwarded: Manolo Gouy <mgouy at biomserv.univ-lyon1.fr>
 
 --- seaview-4.3.3.orig/Makefile
 +++ seaview-4.3.3/Makefile
-@@ -36,7 +36,7 @@
+@@ -29,7 +29,7 @@
  #DEBUG = -g
  OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
  
@@ -21,56 +12,4 @@
 +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) $<
+ OBJECTS = seaview.o custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o \