[pkg-kolab] r382 - trunk/libkolab-perl/debian

[Peter Eisentraut]

Author: petere
Date: 2006-04-10 11:22:53 +0000 (Mon, 10 Apr 2006)
New Revision: 382

Modified:
   trunk/libkolab-perl/debian/changelog
   trunk/libkolab-perl/debian/control
   trunk/libkolab-perl/debian/rules
Log:
* Changed build process to use upstream makefile for installation
  (closes: #361288)
* Build in binary-indep


Modified: trunk/libkolab-perl/debian/changelog
===================================================================
--- trunk/libkolab-perl/debian/changelog	2006-04-09 17:25:48 UTC (rev 381)
+++ trunk/libkolab-perl/debian/changelog	2006-04-10 11:22:53 UTC (rev 382)
@@ -1,9 +1,10 @@
 libkolab-perl (0.9.2-6) unstable; urgency=low
 
-  * adjust build system and make it compatible with sarge
-    (Closes: #361288)
+  * Changed build process to use upstream makefile for installation
+    (closes: #361288)
+  * Build in binary-indep
 
- -- Steffen Joeris <steffen.joeris at skolelinux.de>  Sun,  9 Apr 2006 19:23:50 +0200
+ -- Peter Eisentraut <petere at debian.org>  Mon, 10 Apr 2006 13:05:25 +0200
 
 libkolab-perl (0.9.2-5) unstable; urgency=low
 

Modified: trunk/libkolab-perl/debian/control
===================================================================
--- trunk/libkolab-perl/debian/control	2006-04-09 17:25:48 UTC (rev 381)
+++ trunk/libkolab-perl/debian/control	2006-04-10 11:22:53 UTC (rev 382)
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
-Uploaders: Noèl Köthe <noel at debian.org>, Steffen Jöris <steffen.joeris at skolelinux.de>
+Uploaders: Noèl Köthe <noel at debian.org>, Steffen Jöris <steffen.joeris at skolelinux.de>, Peter Eisentraut <petere at debian.org>
 Build-Depends-Indep: debhelper (>= 4.0.0), dpatch
 Standards-Version: 3.6.2
 

Modified: trunk/libkolab-perl/debian/rules
===================================================================
--- trunk/libkolab-perl/debian/rules	2006-04-09 17:25:48 UTC (rev 381)
+++ trunk/libkolab-perl/debian/rules	2006-04-10 11:22:53 UTC (rev 382)
@@ -1,64 +1,43 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
 
-build: build-stamp
+unpack: unpack-stamp
+unpack-stamp:
+	dh_testdir
+	for i in Kolab*.tar.gz; do tar xvfz $$i || exit; done
+	touch $@
 
-build-stamp:  
+configure: configure-stamp
+configure-stamp: unpack-stamp patch-stamp
 	dh_testdir
-	# extract tar.gz and build them
-	for i in Kolab*.tar.gz;do tar xvfz $$i; done
+	for i in `find . -maxdepth 1 -type d -name "Kolab*"`; do (cd $$i && perl Makefile.PL INSTALLDIRS=vendor) || exit; done
+	touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
 	dpatch apply-all
-	for i in `find . -type d -name "Kolab*"`; do cd $$i && perl Makefile.PL && make && cd ..; done
-	touch build-stamp
+	for i in `find . -maxdepth 1 -type d -name "Kolab*"`; do $(MAKE) -C $$i || exit; done
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	dpatch deapply-all
-	rm -rf debian/patched
-	rm -f build-stamp
-	# Add here commands to clean up after the build process.
-	find . -type d -name "Kolab*"|xargs rm -rf
-	dh_clean 
+	rm -f build-stamp configure-stamp
+	rm -rf debian/patched patch-stamp
+	rm -f unpack-stamp
+	find . -maxdepth 1 -type d -name "Kolab*" | xargs rm -rf
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	# Add here commands to install the package into debian/libkolab-perl.
-	# Kolab
-	install -D -m 644 Kolab/blib/lib/Kolab.pm debian/libkolab-perl/usr/share/perl5/Kolab.pm
-	# Kolab-Conf
-	install -D -m 644 Kolab-Conf/blib/lib/Kolab/Conf.pm debian/libkolab-perl/usr/share/perl5/Kolab/Conf.pm
-	# Kolab-Cyrus
-	install -D -m 644 Kolab-Cyrus/blib/lib/Kolab/Cyrus.pm debian/libkolab-perl/usr/share/perl5/Kolab/Cyrus.pm
-	# Kolab-DirServ
-	install -D -m 644 Kolab-DirServ/blib/lib/Kolab/DirServ.pm debian/libkolab-perl/usr/share/perl5/Kolab/DirServ.pm
-	# Kolab-LDAP
-	install -D -m 644 Kolab-LDAP/blib/lib/Kolab/LDAP.pm debian/libkolab-perl/usr/share/perl5/Kolab/LDAP.pm
-	# Kolab-LDAP-Backend
-	install -D -m 644 Kolab-LDAP-Backend/blib/lib/Kolab/LDAP/Backend.pm debian/libkolab-perl/usr/share/perl5/Kolab/LDAP/Backend.pm
-	# Kolab-LDAP-Backend-ad
-	install -D -m 644 Kolab-LDAP-Backend-ad/blib/lib/Kolab/LDAP/Backend/ad.pm debian/libkolab-perl/usr/share/perl5/Kolab/LDAP/Backend/ad.pm
-	# Kolab-LDAP-Backend-dirservd
-	install -D -m 644 Kolab-LDAP-Backend-dirservd/blib/lib/Kolab/LDAP/Backend/dirservd.pm debian/libkolab-perl/usr/share/perl5/Kolab/LDAP/Backend/dirservd.pm
-	# Kolab-LDAP-Backend-slurpd
-	install -D -m 644 Kolab-LDAP-Backend-slurpd/blib/lib/Kolab/LDAP/Backend/slurpd.pm debian/libkolab-perl/usr/share/perl5/Kolab/LDAP/Backend/slurpd.pm
-	# Kolab-Mailer
-	install -D -m 644 Kolab-Mailer/blib/lib/Kolab/Mailer.pm debian/libkolab-perl/usr/share/perl5/Kolab/Mailer.pm
-	# Kolab-Util
-	install -D -m 644 Kolab-Util/blib/lib/Kolab/Util.pm debian/libkolab-perl/usr/share/perl5/Kolab/Util.pm
-	# manpages
-	for i in `find . -name "*3pm"` ; do install -D -m 644 $$i debian/libkolab-perl/usr/share/man/man3/`echo $$i | cut -d / -f 5`; done 
+	for i in `find . -maxdepth 1 -type d -name "Kolab*"`; do $(MAKE) -C $$i install PREFIX=$(CURDIR)/debian/libkolab-perl/usr || exit; done
 
-# Build architecture-independent files here.
 binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs