[med-svn] r11616 - in trunk/packages/libquazip/trunk/debian: . patches

Sat Jul 7 10:40:38 UTC 2012

Author: ericmaeker-guest
Date: 2012-07-07 10:40:38 +0000 (Sat, 07 Jul 2012)
New Revision: 11616

Added:
   trunk/packages/libquazip/trunk/debian/libquazip0-headers.install
   trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch
Modified:
   trunk/packages/libquazip/trunk/debian/changelog
   trunk/packages/libquazip/trunk/debian/control
   trunk/packages/libquazip/trunk/debian/libquazip0-dev.install
   trunk/packages/libquazip/trunk/debian/libquazip0.install
   trunk/packages/libquazip/trunk/debian/patches/series
   trunk/packages/libquazip/trunk/debian/rules
Log:
libquazip: multiarch

Modified: trunk/packages/libquazip/trunk/debian/changelog
===================================================================

--- trunk/packages/libquazip/trunk/debian/changelog	2012-07-07 08:03:36 UTC (rev 11615)
+++ trunk/packages/libquazip/trunk/debian/changelog	2012-07-07 10:40:38 UTC (rev 11616)
@@ -1,3 +1,15 @@
+libquazip (0.4.4-2) unstable; urgency=low
+
+  * creating multi-arch binaries
+    * debian/rules
+    * debian/libquazip0.install
+    * debian/libquazip0-dev.install
+  * debian/copyright: removed symlink
+  * including upstream changelog in all packages
+  * debian/libquazip-doc: lintian overrides duplicate files
+
+ -- Eric Maeker <eric.maeker at gmail.com>  Sat, 07 Jul 2012 12:31:34 +0200
+
 libquazip (0.4.4-1) unstable; urgency=low
 
   * Initial release (Closes: #675276)

Modified: trunk/packages/libquazip/trunk/debian/control
===================================================================
--- trunk/packages/libquazip/trunk/debian/control	2012-07-07 08:03:36 UTC (rev 11615)
+++ trunk/packages/libquazip/trunk/debian/control	2012-07-07 10:40:38 UTC (rev 11616)
@@ -12,7 +12,9 @@
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libquazip/trunk/
 
 Package: libquazip0
+Multi-Arch: same
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libquazip-doc
 Description: C++ wrapper wrapper for ZIP/UNZIP
@@ -30,8 +32,9 @@
 Section: libdevel
 Provides: libquazip-dev
 Conflicts: libquazip-dev
+Multi-Arch: same
 Architecture: any
-Depends: libquazip0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libquazip0 (= ${binary:Version}), libquazip0-headers (= ${binary:Version}), ${misc:Depends}
 Description: C++ wrapper wrapper for ZIP/UNZIP (development files)
  QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
  can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
@@ -47,6 +50,7 @@
 
 Package: libquazip0-dbg
 Priority: extra
+Multi-Arch: same
 Architecture: any
 Section: debug
 Depends: libquazip0 (= ${binary:Version}), ${misc:Depends}
@@ -63,8 +67,27 @@
  .
  This package contains the debugging symbols for Qt Creator IDE.
 
+#Package: libquazip0-headers
+#Section: libdevel
+#Multi-Arch: foreign
+#Architecture: all
+#Depends: ${misc:Depends}
+#Description: C++ wrapper for ZIP/UNZIP (documentation)
+# QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+# can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
+# .
+# QuaZIP allows you to access files inside ZIP archives using QIODevice API,
+# and that means that you can also use QTextStream, QDataStream or
+# whatever you would like to use on your zipped files.
+# .
+# QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading
+# from and writing to ZIP archives.
+# .
+# This package contains the headers files for the dev package.
+
 Package: libquazip-doc
 Section: doc
+Multi-Arch: foreign
 Architecture: all
 Depends: ${misc:Depends}
 Description: C++ wrapper for ZIP/UNZIP (documentation)

Modified: trunk/packages/libquazip/trunk/debian/libquazip0-dev.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip0-dev.install	2012-07-07 08:03:36 UTC (rev 11615)
+++ trunk/packages/libquazip/trunk/debian/libquazip0-dev.install	2012-07-07 10:40:38 UTC (rev 11616)
@@ -1,2 +1,3 @@
-usr/lib/libquazip.so
+usr/lib/*/libquazip.so
 usr/include/quazip/*
+

Added: trunk/packages/libquazip/trunk/debian/libquazip0-headers.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip0-headers.install	                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip0-headers.install	2012-07-07 10:40:38 UTC (rev 11616)
@@ -0,0 +1,2 @@
+usr/include/quazip/*
+

Modified: trunk/packages/libquazip/trunk/debian/libquazip0.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip0.install	2012-07-07 08:03:36 UTC (rev 11615)
+++ trunk/packages/libquazip/trunk/debian/libquazip0.install	2012-07-07 10:40:38 UTC (rev 11616)
@@ -1 +1 @@
-usr/lib/libquazip.so.*
+usr/lib/*/libquazip.so.*

Added: trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch	                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch	2012-07-07 10:40:38 UTC (rev 11616)
@@ -0,0 +1,13 @@
+Index: libquazip-0.4.4.obsolete.0.470476196686835/quazip/quazip.pro
+===================================================================
+--- libquazip-0.4.4.obsolete.0.470476196686835.orig/quazip/quazip.pro	2011-09-10 11:38:11.000000000 +0200
++++ libquazip-0.4.4.obsolete.0.470476196686835/quazip/quazip.pro	2012-07-07 11:14:06.423456139 +0200
+@@ -28,7 +28,7 @@
+ unix:!symbian {
+     headers.path=$$PREFIX/include/quazip
+     headers.files=$$HEADERS
+-    target.path=$$PREFIX/lib
++    target.path=$$PREFIX/lib/$${LIB_ARCH}
+     INSTALLS += headers target
+ 
+ 	OBJECTS_DIR=.obj

Modified: trunk/packages/libquazip/trunk/debian/patches/series
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/series	2012-07-07 08:03:36 UTC (rev 11615)
+++ trunk/packages/libquazip/trunk/debian/patches/series	2012-07-07 10:40:38 UTC (rev 11616)
@@ -1,2 +1,2 @@
 no-test-build.patch
-
+multiarch_prefix.patch

Modified: trunk/packages/libquazip/trunk/debian/rules
===================================================================
--- trunk/packages/libquazip/trunk/debian/rules	2012-07-07 08:03:36 UTC (rev 11615)
+++ trunk/packages/libquazip/trunk/debian/rules	2012-07-07 10:40:38 UTC (rev 11616)
@@ -10,9 +10,13 @@
 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 := \
 		LIBS+=-lz \
-		VERSION=$(VERSION)
+		VERSION=$(VERSION) \
+		LIB_ARCH="$(DEB_HOST_MULTIARCH)"
 
 %:
 	dh $@ --buildsystem=qmake_qt4 --parallel --dbg-package=libquazip0-dbg
@@ -28,10 +32,11 @@
 	dh_auto_clean
 
 override_dh_auto_install:
-	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
+	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp 
 
 override_dh_installchangelogs:
 	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


