[med-svn] r11167 - trunk/packages/quazip/trunk/debian

[Eric Maeker]

Author: ericmaeker-guest
Date: 2012-06-01 21:30:42 +0000 (Fri, 01 Jun 2012)
New Revision: 11167

Added:
   trunk/packages/quazip/trunk/debian/libquazip0-dev.install
   trunk/packages/quazip/trunk/debian/libquazip0.install
Removed:
   trunk/packages/quazip/trunk/debian/quazip0-dev.install
   trunk/packages/quazip/trunk/debian/quazip0.install
Modified:
   trunk/packages/quazip/trunk/debian/rules
Log:
quazip: correcting qmake line, *.install

Added: trunk/packages/quazip/trunk/debian/libquazip0-dev.install
===================================================================
--- trunk/packages/quazip/trunk/debian/libquazip0-dev.install	                        (rev 0)
+++ trunk/packages/quazip/trunk/debian/libquazip0-dev.install	2012-06-01 21:30:42 UTC (rev 11167)
@@ -0,0 +1,3 @@
+usr/lib/libquazip.so
+usr/lib/libquazip.a
+usr/include/quazip/*

Added: trunk/packages/quazip/trunk/debian/libquazip0.install
===================================================================
--- trunk/packages/quazip/trunk/debian/libquazip0.install	                        (rev 0)
+++ trunk/packages/quazip/trunk/debian/libquazip0.install	2012-06-01 21:30:42 UTC (rev 11167)
@@ -0,0 +1 @@
+usr/lib/libquazip.so.*

Deleted: trunk/packages/quazip/trunk/debian/quazip0-dev.install
===================================================================
--- trunk/packages/quazip/trunk/debian/quazip0-dev.install	2012-06-01 21:05:01 UTC (rev 11166)
+++ trunk/packages/quazip/trunk/debian/quazip0-dev.install	2012-06-01 21:30:42 UTC (rev 11167)
@@ -1,4 +0,0 @@
-usr/lib/*.so
-usr/lib/*.a
-usr/include/quazip/*
-

Deleted: trunk/packages/quazip/trunk/debian/quazip0.install
===================================================================
--- trunk/packages/quazip/trunk/debian/quazip0.install	2012-06-01 21:05:01 UTC (rev 11166)
+++ trunk/packages/quazip/trunk/debian/quazip0.install	2012-06-01 21:30:42 UTC (rev 11167)
@@ -1 +0,0 @@
-usr/lib/libquazip.so*

Modified: trunk/packages/quazip/trunk/debian/rules
===================================================================
--- trunk/packages/quazip/trunk/debian/rules	2012-06-01 21:05:01 UTC (rev 11166)
+++ trunk/packages/quazip/trunk/debian/rules	2012-06-01 21:30:42 UTC (rev 11167)
@@ -15,7 +15,11 @@
 	dh $@
 
 override_dh_auto_configure:
-	qmake quazip/quazip.pro PREFIX=debian/tmp/usr/lib/ LIBS+=-lz VERSION=$(VERSION)
+	# we can add
+	# "QMAKE_INSTALL_FILE=cp -a"
+	# "QMAKE_INSTALL_PROGRAM=cp -a"
+	# to the qmake command if symlinks are followed
+	qmake quazip/quazip.pro "PREFIX=$(CURDIR)/debian/tmp/usr" LIBS+=-lz VERSION=$(VERSION)
 	
 # Clean build path
 override_dh_auto_clean:
@@ -26,24 +30,21 @@
 
 override_dh_auto_build:
 	dh_auto_build
+	# make the .so
+	$(MAKE)
+	# make the .a
 	$(MAKE) lib$(name).a
 
 override_dh_auto_install:
-	# dh_auto_install # moves files into wrong dir
-	# FIXME: This hack should be replaced by a proper call of install target / proper call of qmake
-	mkdir -p debian/tmp/usr/include
-	cp -a $(name)/*.h debian/tmp/usr/include
-	mkdir -p debian/tmp/usr/lib
-	cp -a lib$(name).so* lib$(name).a debian/tmp/usr/lib
-	
-	# d-shlibs needs enhancement --> #675500
-	# Call d-shlibmove to comply with library packaging guide
-	debian/d-devlibdeps debian/$(pkg)0-dev.substvars \
-	             lib$(name).so
-	debian/d-shlibmove --commit \
-	            --movedev debian/tmp/usr/include usr/ \
-	            debian/tmp/usr/lib/lib$(name).so 
-	            # lib$(name).a
-
-#override_dh_shlibdeps:
-#	LD_LIBRARY_PATH=debian/tmp/usr/lib/freemedforms dh_shlibdeps -l/usr/lib/freemedforms
+	$(MAKE) install
+	# we need to manage .a by hand
+	cp -a lib$(name).a $(CURDIR)/debian/tmp/usr/lib
+#	
+#	# d-shlibs needs enhancement --> #675500
+#	# Call d-shlibmove to comply with library packaging guide
+#	debian/d-devlibdeps debian/$(pkg)0-dev.substvars \
+#	             lib$(name).so
+#	debian/d-shlibmove --commit \
+#	            --movedev debian/tmp/usr/include usr/ \
+#	            debian/tmp/usr/lib/lib$(name).so 
+#	            # lib$(name).a