[med-svn] r15199 - in trunk/packages/libg2/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-11-20 21:56:48 +0000 (Wed, 20 Nov 2013)
New Revision: 15199

Added:
   trunk/packages/libg2/trunk/debian/patches/hardening.patch
Modified:
   trunk/packages/libg2/trunk/debian/changelog
   trunk/packages/libg2/trunk/debian/patches/series
   trunk/packages/libg2/trunk/debian/rules
Log:
Mass commit for 0.72-3


Modified: trunk/packages/libg2/trunk/debian/changelog
===================================================================
--- trunk/packages/libg2/trunk/debian/changelog	2013-11-20 21:56:10 UTC (rev 15198)
+++ trunk/packages/libg2/trunk/debian/changelog	2013-11-20 21:56:48 UTC (rev 15199)
@@ -1,4 +1,4 @@
-g2 (0.72-3) UNRELEASED; urgency=low
+g2 (0.72-3) unstable; urgency=low
 
   * debian/control:
     - Standards-Version: 3.9.4 (no changes needed)
@@ -15,6 +15,8 @@
   * debian/patches/010_configure_in.diff: Add change from Samuel Thibault to the
     patch to build on HURD as well (thanks to Samuel)
     Closes: #729186
+  * debian/patches/hardening.patch,debian/rules:  Propagate hardening options
+    which looks OK, but lintian warning remains anyway
 
  -- Andreas Tille <tille at debian.org>  Sun, 10 Nov 2013 08:12:07 +0100
 

Added: trunk/packages/libg2/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/libg2/trunk/debian/patches/hardening.patch	2013-11-20 21:56:48 UTC (rev 15199)
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Sun, 10 Nov 2013 08:12:07 +0100
+Description: Providing CFLAGS from outside overrides CFLAGS setting
+ completely whic leads to build failure.  So rather provide DEBCFLAGS
+ which is added to CFLAGS
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -22,7 +22,7 @@ INCDIR = @prefix@/include
+ SHELL = /bin/sh
+ 
+ CC           = @CC@
+-CFLAGS       = -I./src @CFLAGS@ @DEFS@
++CFLAGS       = -I./src @CFLAGS@ @DEFS@ $(DEBCFLAGS)
+ INSTALL      = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ FIND         = @FIND@

Modified: trunk/packages/libg2/trunk/debian/patches/series
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/series	2013-11-20 21:56:10 UTC (rev 15198)
+++ trunk/packages/libg2/trunk/debian/patches/series	2013-11-20 21:56:48 UTC (rev 15199)
@@ -4,3 +4,4 @@
 do_not_remove_files_from_orig_source.diff
 fix_pod2man_errors.diff
 fix_linker_libs.diff
+hardening.patch

Modified: trunk/packages/libg2/trunk/debian/rules
===================================================================
--- trunk/packages/libg2/trunk/debian/rules	2013-11-20 21:56:10 UTC (rev 15198)
+++ trunk/packages/libg2/trunk/debian/rules	2013-11-20 21:56:48 UTC (rev 15199)
@@ -6,39 +6,38 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+pkglib=libg20
+pkgdev=libg2-dev
+
 %:
-	dh $@ --with autotools-dev
+	dh $@ --with autotools_dev
 
-override_dh_auto_build:
-	dh_auto_build
-	(cd ./g2_perl && perl Makefile.PL INSTALLDIRS=vendor LIBS="-L$(CURDIR)/g2_perl/.. -lg2")
-	$(MAKE) -C ./g2_perl
-
 # Compile with -fPIC on all platforms
 #override_dh_auto_configure:
 #        dh_auto_configure -- CFLAGS="$(dpkg-buildflags --get CFLAGS) -fPIC" FFLAGS="$(dpkg-buildflags --get FFLAGS) -fPIC"
 
 # Use the latest version number in the CHANGES file 
-version=`head -n 1 CHANGES | \
- awk '{if (match($$0,/^[0-9]+\.[0-9]+[A-Za-z]/)) print substr($$0,RSTART,RLENGTH)}'`
-rversion=`head -n 1 CHANGES | \
- awk '{if (match($$0,/^[0-9]+\.[0-9]+/)) print substr($$0,RSTART,RLENGTH)}'`
-major=`head -n 1 CHANGES | \
- awk '{if (match($$0,/^[0-9]+/)) print substr($$0,RSTART,RLENGTH)}'`
+version:=$(shell head -n 1 CHANGES | \
+ awk '{if (match($$0,/^[0-9]+\.[0-9]+[A-Za-z]/)) print substr($$0,RSTART,RLENGTH)}')
+rversion:=$(shell head -n 1 CHANGES | \
+ awk '{if (match($$0,/^[0-9]+\.[0-9]+/)) print substr($$0,RSTART,RLENGTH)}')
+major:=$(shell head -n 1 CHANGES | \
+ awk '{if (match($$0,/^[0-9]+/)) print substr($$0,RSTART,RLENGTH)}')
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f libg*.a lib*.so.0
+
 override_dh_auto_build:
 	$(MAKE) depend
-	$(MAKE) libg2.a RVERSION=$(rversion) MVERSION=$(major)
+	$(MAKE) libg2.a DEBCFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 	# clean up and build the shared lib
 	-rm -f src/*.o src/*/*.o
-	$(MAKE) PICFLAG="-fPIC" RVERSION=$(rversion) MVERSION=$(major) shared
+	$(MAKE) PICFLAG="-fPIC" RVERSION=$(rversion) MVERSION=$(major) DEBCFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" shared
 	(cd ./g2_perl && perl Makefile.PL INSTALLDIRS=vendor LIBS="-L$(CURIDR)/g2_perl/.. -lg2")
 	$(MAKE) -C ./g2_perl
 
 override_dh_auto_install:
 	$(MAKE) RVERSION=$(rversion) MVERSION=$(major) install prefix=$(CURDIR)/debian/libg2-dev
+	mv $(CURDIR)/debian/$(pkgdev)/usr/lib/lib*.so.0* $(CURDIR)/debian/$(pkglib)/usr/lib
 	$(MAKE) -C ./g2_perl install DESTDIR=$(CURDIR)/debian/libg2$(major)-perl
-	#mkdir -p debian/tmp/usr/lib
-	#mv debian/libg2-dev/usr/lib/libg2.so.$(rversion) debian/tmp/usr/lib/libg2.so.$(rversion)
-	#mv debian/libg2-dev/usr/lib/libg2.so.$(major) debian/tmp/usr/lib/libg2.so.$(major)
-	#ln -s libg2.so.$(rversion) debian/tmp/usr/lib/libg2.so