[med-svn] r10579 - in trunk/packages/epcr/trunk/debian: . patches

Andreas Tille tille at alioth.debian.org
Wed Apr 25 07:32:47 UTC 2012 

Author: tille
Date: 2012-04-25 07:32:47 +0000 (Wed, 25 Apr 2012)
New Revision: 10579

Added:
   trunk/packages/epcr/trunk/debian/patches/use-dpkg-buildflags.patch
Removed:
   trunk/packages/epcr/trunk/debian/patches/gcc-4.7.patch
Modified:
   trunk/packages/epcr/trunk/debian/changelog
   trunk/packages/epcr/trunk/debian/control
   trunk/packages/epcr/trunk/debian/patches/series
   trunk/packages/epcr/trunk/debian/rules
Log:
  * New upstream version that has applied debian/patches/gcc-4.7.patch
    (so this patch was removed)
  * debian/control: SVN dir was renamed from ncbi-epcr to epcr
  * debian/use-dpkg-buildflags.patch: Regard LDFLAGS/CPPFLAGS
    hardening flags
  * debian/rules:
     - do not specify fixed version strings but rather obtain these
       via dpkg-parsechangelog
     - Enable hardening flags


Modified: trunk/packages/epcr/trunk/debian/changelog
===================================================================
--- trunk/packages/epcr/trunk/debian/changelog	2012-04-25 06:48:13 UTC (rev 10578)
+++ trunk/packages/epcr/trunk/debian/changelog	2012-04-25 07:32:47 UTC (rev 10579)
@@ -1,8 +1,17 @@
-epcr (2.3.12-4) UNRELEASED; urgency=low
+epcr (2.3.12-1-1) unstable; urgency=low
 
+  * New upstream version that has applied debian/patches/gcc-4.7.patch
+    (so this patch was removed)
   * debian/copyright: Add Upstream-Name & Upstream-Contact
+  * debian/control: SVN dir was renamed from ncbi-epcr to epcr
+  * debian/use-dpkg-buildflags.patch: Regard LDFLAGS/CPPFLAGS
+    hardening flags
+  * debian/rules:
+     - do not specify fixed version strings but rather obtain these
+       via dpkg-parsechangelog
+     - Enable hardening flags
 
- -- Andreas Tille <tille at debian.org>  Mon, 23 Apr 2012 16:11:39 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 25 Apr 2012 08:27:20 +0200
 
 epcr (2.3.12-3) unstable; urgency=low
 

Modified: trunk/packages/epcr/trunk/debian/control
===================================================================
--- trunk/packages/epcr/trunk/debian/control	2012-04-25 06:48:13 UTC (rev 10578)
+++ trunk/packages/epcr/trunk/debian/control	2012-04-25 07:32:47 UTC (rev 10579)
@@ -9,8 +9,8 @@
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.3
 Homepage: http://www.ncbi.nlm.nih.gov/sutils/e-pcr/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ncbi-epcr/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/ncbi-epcr/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/epcr/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/epcr/trunk/
 
 Package: ncbi-epcr
 Architecture: any

Deleted: trunk/packages/epcr/trunk/debian/patches/gcc-4.7.patch
===================================================================
--- trunk/packages/epcr/trunk/debian/patches/gcc-4.7.patch	2012-04-25 06:48:13 UTC (rev 10578)
+++ trunk/packages/epcr/trunk/debian/patches/gcc-4.7.patch	2012-04-25 07:32:47 UTC (rev 10579)
@@ -1,15 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Date: Sun, 22 Apr 2012 22:52:29 +0200
-Bug-Closed: http://bugs.debian.org/667156
-Description: Add missing include to build using gcc 4.7
-
---- e-PCR-2.3.12.orig/minilcs.hpp
-+++ e-PCR-2.3.12/minilcs.hpp
-@@ -36,6 +36,7 @@
- #include <vector>
- 
- #include <ctype.h>
-+#include <cstring>
- 
- BEGIN_NCBI_SCOPE
- BEGIN_SCOPE(EPCR_SCOPE)

Modified: trunk/packages/epcr/trunk/debian/patches/series
===================================================================
--- trunk/packages/epcr/trunk/debian/patches/series	2012-04-25 06:48:13 UTC (rev 10578)
+++ trunk/packages/epcr/trunk/debian/patches/series	2012-04-25 07:32:47 UTC (rev 10579)
@@ -1,4 +1,4 @@
 fix_clean_target.patch
 fix_header_location.patch
 ensure_build_options.patch
-gcc-4.7.patch
+use-dpkg-buildflags.patch

Added: trunk/packages/epcr/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/epcr/trunk/debian/patches/use-dpkg-buildflags.patch	                        (rev 0)
+++ trunk/packages/epcr/trunk/debian/patches/use-dpkg-buildflags.patch	2012-04-25 07:32:47 UTC (rev 10579)
@@ -0,0 +1,16 @@
+Description: Use build flags from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2012-04-25
+
+--- e-PCR-2.3.12.orig/stand/config.mk
++++ e-PCR-2.3.12/stand/config.mk
+@@ -104,7 +104,7 @@
+ 	-test -L $(LIBNAME) && rm $(LIBNAME)
+ 
+ $(objdir)/%.o: $(srcdir)/%.cpp
+-	$(CXX) $(CXXFLAGS) -c $< -o $@
++	$(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $< -o $@
+ 
+ ########################################################################
+ ## $Log: config.mk,v $

Modified: trunk/packages/epcr/trunk/debian/rules
===================================================================
--- trunk/packages/epcr/trunk/debian/rules	2012-04-25 06:48:13 UTC (rev 10578)
+++ trunk/packages/epcr/trunk/debian/rules	2012-04-25 07:32:47 UTC (rev 10579)
@@ -2,6 +2,14 @@
 # debian/rules for ncbi-epcr using
 # Andreas Tille <tille at debian.org>, GPL
 
+VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+VER_MAJOR := $(shell echo $(VERSION) | sed 's/^\([0-9]\+\)\..*/\1/')
+VER_MINOR := $(shell echo $(VERSION) | sed 's/^[0-9]\+\.\([0-9]\+\)\..*/\1/')
+VER_BUILD := $(shell echo $(VERSION) | sed 's/^[0-9]\+\.[0-9]\+\.\(.*\)/\1/')
+
+CFLAGS += -I. -g2 -DDEALLOCATE=0 -DVERSION=\"$(VERSION)\" -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) -DVER_BUILD=$(VER_BUILD) -DSTANDALONE=1
+LDFLAGS += -L.
+
 %:
 	dh $@
 
@@ -12,9 +20,7 @@
 	rm -f e-PCR famap fahash re-PCR
 
 override_dh_auto_build:
-	$(MAKE) links depend all OPTIMIZE=6 \
-	    CFLAGS='-I. -g2 -DDEALLOCATE=0 -DVERSION=\"2.3.12\" -DVER_MAJOR=2 -DVER_MINOR=3 -DVER_BUILD=12 -DSTANDALONE=1' \
-	    LDFLAGS=-L.
+	$(MAKE) links depend all OPTIMIZE=6
 
 override_dh_auto_install:
 	# do nothing

More information about the debian-med-commit mailing list