[med-svn] r13203 - trunk/packages/libquazip/trunk/debian

[Eric Maeker]

Author: ericmaeker-guest
Date: 2013-03-18 17:13:28 +0000 (Mon, 18 Mar 2013)
New Revision: 13203

Added:
   trunk/packages/libquazip/trunk/debian/libquazip0.lintian-overrides
Modified:
   trunk/packages/libquazip/trunk/debian/changelog
   trunk/packages/libquazip/trunk/debian/libquazip0-dev.install
   trunk/packages/libquazip/trunk/debian/rules
Log:
libquazip: adding the static lib to the dev package, some cleanings

Modified: trunk/packages/libquazip/trunk/debian/changelog
===================================================================
--- trunk/packages/libquazip/trunk/debian/changelog	2013-03-18 14:56:52 UTC (rev 13202)
+++ trunk/packages/libquazip/trunk/debian/changelog	2013-03-18 17:13:28 UTC (rev 13203)
@@ -1,14 +1,19 @@
-libquazip (0.5.1-1) UNRELEASED; urgency=low
+libquazip (0.5.1-2) UNRELEASED; urgency=low
 
   [ Eric Maeker ]
   * New upstream
   * debian/patch: Updating patches (multiarch, remove tests)
+  * Static lib
+    * debian/rules: building the static version of the lib
+    * debian/libquazip0-dev.install: adding the static lib to the dev package
+  * debian/rules: libquazip0-headers was removed
+  * Adding debian/libquazip-doc.lintian-overrides
 
   [ Andreas Tille ]
   * remove debian/d-{devlibdeps,shlibmove} which were injected as a hack
     aroung not yet working d-shlibs but are not used anyway
 
- -- Eric Maeker <eric.maeker at gmail.com>  Mon, 18 Mar 2013 11:52:42 +0100
+ -- Eric Maeker <eric.maeker at gmail.com>  Mon, 18 Mar 2013 18:02:42 +0100
 
 libquazip (0.5-1) unstable; urgency=low
 

Modified: trunk/packages/libquazip/trunk/debian/libquazip0-dev.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip0-dev.install	2013-03-18 14:56:52 UTC (rev 13202)
+++ trunk/packages/libquazip/trunk/debian/libquazip0-dev.install	2013-03-18 17:13:28 UTC (rev 13203)
@@ -1,3 +1,4 @@
 usr/lib/*/libquazip.so
+usr/lib/*/libquazip.a
 usr/include/quazip/*
 

Added: trunk/packages/libquazip/trunk/debian/libquazip0.lintian-overrides
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip0.lintian-overrides	                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip0.lintian-overrides	2013-03-18 17:13:28 UTC (rev 13203)
@@ -0,0 +1 @@
+libquazip0: hardening-no-fortify-functions usr/lib/i386-linux-gnu/libquazip.so.*

Modified: trunk/packages/libquazip/trunk/debian/rules
===================================================================
--- trunk/packages/libquazip/trunk/debian/rules	2013-03-18 14:56:52 UTC (rev 13202)
+++ trunk/packages/libquazip/trunk/debian/rules	2013-03-18 17:13:28 UTC (rev 13203)
@@ -10,7 +10,6 @@
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 name := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 
-# Actually not needed
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 QMAKE_GENERIC := \
@@ -18,12 +17,15 @@
 		VERSION=$(VERSION) \
 		LIB_ARCH="$(DEB_HOST_MULTIARCH)"
 
+QMAKE_STATIC := CONFIG+=staticlib -o Makefile.Static
+
 %:
 	dh $@ --buildsystem=qmake_qt4 --parallel --dbg-package=libquazip0-dbg
 	
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(QMAKE_GENERIC) $(extra_configure_opts)
+	dh_auto_configure -- $(QMAKE_GENERIC) $(QMAKE_STATIC) $(extra_configure_opts)
 	cp NEWS.txt NEWS
 
 override_dh_auto_clean:
@@ -33,15 +35,22 @@
 	rm -Rf NEWS
 	dh_auto_clean
 
+override_dh_auto_build:
+	# Build the static lib
+	dh_auto_build -Smakefile -- -f Makefile.Static
+	rm -Rf quazip/.obj
+	rm -Rf quazip/.moc
+	# Build the dynamic lib
+	dh_auto_build -Smakefile
+
 override_dh_auto_install:
-	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp 
+	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
+	cp -a quazip/libquazip.a $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installchangelogs:
-	pwd
-#	cp NEWS.txt NEWS
 	dh_installchangelogs -plibquazip0 NEWS upstream
 	dh_installchangelogs -plibquazip0-dev NEWS upstream
 	dh_installchangelogs -plibquazip0-dbg NEWS upstream
-	dh_installchangelogs -plibquazip0-headers NEWS upstream
+	#dh_installchangelogs -plibquazip0-headers NEWS upstream
 	dh_installchangelogs