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

[Eric Maeker]

Author: ericmaeker-guest
Date: 2012-06-24 01:18:07 +0000 (Sun, 24 Jun 2012)
New Revision: 11444

Modified:
   trunk/packages/libquazip/trunk/debian/control
   trunk/packages/libquazip/trunk/debian/libquazip0-dev.install
   trunk/packages/libquazip/trunk/debian/rules
Log:
libquazip: extreme simplification of rules, using default qt4 buildsystem, correctly build the debug package

Modified: trunk/packages/libquazip/trunk/debian/control
===================================================================
--- trunk/packages/libquazip/trunk/debian/control	2012-06-24 01:11:37 UTC (rev 11443)
+++ trunk/packages/libquazip/trunk/debian/control	2012-06-24 01:18:07 UTC (rev 11444)
@@ -45,11 +45,29 @@
  .
  This package contains the development files.
 
+Package: libquazip0-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: libquazip0 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for libquazip
+ 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 debugging symbols for Qt Creator IDE.
+
 Package: libquazip-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: C++ wrapper wrapper for ZIP/UNZIP (documentation)
+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.
  .

Modified: trunk/packages/libquazip/trunk/debian/libquazip0-dev.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip0-dev.install	2012-06-24 01:11:37 UTC (rev 11443)
+++ trunk/packages/libquazip/trunk/debian/libquazip0-dev.install	2012-06-24 01:18:07 UTC (rev 11444)
@@ -1,3 +1,2 @@
 usr/lib/libquazip.so
-usr/lib/libquazip.a
 usr/include/quazip/*

Modified: trunk/packages/libquazip/trunk/debian/rules
===================================================================
--- trunk/packages/libquazip/trunk/debian/rules	2012-06-24 01:11:37 UTC (rev 11443)
+++ trunk/packages/libquazip/trunk/debian/rules	2012-06-24 01:18:07 UTC (rev 11444)
@@ -4,83 +4,29 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Notes
-# The debug package is not actually correctly built
-
 # Extract the current version number and package name
 DEBIAN  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 name := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-#DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# QMake command line
-RELEASE_PREFIX := "PREFIX=$(CURDIR)/debian/tmp/usr"
-DEBUG_PREFIX := "PREFIX=$(CURDIR)/debian/tmp/usr/lib/debug/usr"
 QMAKE_GENERIC := \
 		LIBS+=-lz \
 		VERSION=$(VERSION)
 
-QMAKE_RELEASE := $(RELEASE_PREFIX) CONFIG+=release CONFIG-=debug
-QMAKE_DEBUG := $(DEBUG_PREFIX) CONFIG-=release CONFIG+=debug
-QMAKE_STATIC := $(RELEASE_PREFIX) CONFIG+=staticlib
-
-# Parallel building
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
 %:
-	dh $@ --buildsystem=qmake --parallel
-	#dh $@  \
+	dh $@ --buildsystem=qmake_qt4 --parallel --dbg-package=libquazip0-dbg
 	
 
 override_dh_auto_configure:
-	# Configure the shared library (release)
-	qmake quazip/quazip.pro $(QMAKE_GENERIC) $(QMAKE_RELEASE) -o Make.shared.release
-	# Configure the shared library (debug)
-	#qmake quazip/quazip.pro $(QMAKE_GENERIC) $(QMAKE_DEBUG) -o Make.shared.debug
-	# Configure the static library
-	qmake quazip/quazip.pro $(QMAKE_GENERIC) $(QMAKE_RELEASE) $(QMAKE_STATIC) -o Make.static
-	
-# Clean build path
+	dh_auto_configure -- $(QMAKE_GENERIC) $(extra_configure_opts)
+
 override_dh_auto_clean:
 	rm -Rf quazip/.obj
 	rm -Rf quazip/.moc
-	find . -name Make.* -delete
+	find . -name Makefile -delete
 	dh_auto_clean
 
-override_dh_auto_build:
-	# make the shared lib
-	$(MAKE) -f Make.shared.release
-	#$(MAKE) -f Make.shared.debug
-	# make the static lib
-	$(MAKE) -f Make.static
-
-#.PHONY: override_dh_strip
-#override_dh_strip:
-	# dh_strip
-#        dh_strip --dbg-package=libquazip0-dbg
-
 override_dh_auto_install:
-	$(MAKE) -f Make.shared.release install
-	#$(MAKE) -f Make.shared.debug install
-	$(MAKE) -f Make.static install_target
+	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
 
-#override_dh_auto_install:
-#	dh_auto_install --destdir=debian/libquazip0
-
-#override_dh_installdocs:
-#	dh_installdocs --link-doc=libquazip0
-
-#	# d-shlibs needs enhancement --> #675500
-#	# Call d-shlibmove to comply with library packaging guide
-#	debian/d-devlibdeps debian/$(name)0-dev.substvars \
-#	             $(name).so
-#	debian/d-shlibmove --commit \
-#	            --movedev debian/tmp/usr/include usr/ \
-#	            debian/tmp/usr/lib/$(name).so \
-#	            #$(name).a
-
-