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

[Andreas Tille]

Author: tille
Date: 2012-03-07 08:19:15 +0000 (Wed, 07 Mar 2012)
New Revision: 9912

Modified:
   trunk/packages/seaview/trunk/debian/changelog
   trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch
   trunk/packages/seaview/trunk/debian/rules
Log:
Information about alternative to patch upstream Makefile; do not force hardening


Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog	2012-03-07 08:09:46 UTC (rev 9911)
+++ trunk/packages/seaview/trunk/debian/changelog	2012-03-07 08:19:15 UTC (rev 9912)
@@ -1,3 +1,13 @@
+seaview (1:4.3.3-4) UNRELEASED; urgency=low
+
+  * debian/patches/use-dpkg-buildflags.patch:
+    - Added Forewarded field
+    - Added information about alternative solution which might make
+      the patch superfluous
+  * debian/rules: do not force hardening
+
+ -- Andreas Tille <tille at debian.org>  Wed, 07 Mar 2012 09:17:06 +0100
+
 seaview (1:4.3.3-3) unstable; urgency=low
 
   * debian/control: drop cdbs Build-Dependency

Modified: trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch	2012-03-07 08:09:46 UTC (rev 9911)
+++ trunk/packages/seaview/trunk/debian/patches/use-dpkg-buildflags.patch	2012-03-07 08:19:15 UTC (rev 9912)
@@ -5,6 +5,11 @@
  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.
 
 --- seaview-4.3.3.orig/Makefile
 +++ seaview-4.3.3/Makefile

Modified: trunk/packages/seaview/trunk/debian/rules
===================================================================
--- trunk/packages/seaview/trunk/debian/rules	2012-03-07 08:09:46 UTC (rev 9911)
+++ trunk/packages/seaview/trunk/debian/rules	2012-03-07 08:19:15 UTC (rev 9912)
@@ -12,7 +12,7 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # Hardening options
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@