[pkg-kolab] r845 - kolab-freebusy/trunk/debian kolabconf/trunk/debian php-kolab/trunk/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-05-05 20:23:09 +0000 (Mon, 05 May 2008)
New Revision: 845

Modified:
   kolab-freebusy/trunk/debian/rules
   kolabconf/trunk/debian/changelog
   php-kolab/trunk/debian/rules
Log:
* Cleaned up rules
* kolabconf is experimental


Modified: kolab-freebusy/trunk/debian/rules
===================================================================
--- kolab-freebusy/trunk/debian/rules	2008-05-05 20:02:42 UTC (rev 844)
+++ kolab-freebusy/trunk/debian/rules	2008-05-05 20:23:09 UTC (rev 845)
@@ -2,66 +2,44 @@
 
 include /usr/share/dpatch/dpatch.make
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-configure: configure-stamp patch-stamp
-configure-stamp:
-	dh_testdir
-	# nothing to configure
-
-	touch configure-stamp
-
-
 build: build-stamp
-
-build-stamp: configure
+build-stamp: patch-stamp
 	dh_testdir
-
-	#nothing to compile
-
 	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp
+	dh_clean
 
-	#nothing to clean
-
-	dh_clean 
-
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
 
-	#here is the important stuff
 	mkdir -p $(CURDIR)/debian/kolab-freebusy/var/lib/kolab/freebusy-cache/
 	install -D -m 644 config.php $(CURDIR)/debian/kolab-freebusy/etc/kolab/freebusy_config.php
 	install -D -m 644 freebusy.php $(CURDIR)/debian/kolab-freebusy/usr/share/kolab/freebusy/freebusy.php
 	install -D -m 644 pfb.php $(CURDIR)/debian/kolab-freebusy/usr/share/kolab/freebusy/pfb.php
 	install -D -m 644 debian/apache.conf debian/kolab-freebusy/etc/kolab/apache.conf
 
-# Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	dh_installchangelogs  -i
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install

Modified: kolabconf/trunk/debian/changelog
===================================================================
--- kolabconf/trunk/debian/changelog	2008-05-05 20:02:42 UTC (rev 844)
+++ kolabconf/trunk/debian/changelog	2008-05-05 20:23:09 UTC (rev 845)
@@ -1,4 +1,4 @@
-kolabconf (2.2~rc2-20080314-1) UNRELEASED; urgency=low
+kolabconf (2.2~rc2-20080314-1) experimental; urgency=low
 
   * New upstream version: 2.2-rc2
     - Upstream split of kolabd package

Modified: php-kolab/trunk/debian/rules
===================================================================
--- php-kolab/trunk/debian/rules	2008-05-05 20:02:42 UTC (rev 844)
+++ php-kolab/trunk/debian/rules	2008-05-05 20:23:09 UTC (rev 845)
@@ -2,37 +2,16 @@
 
 include /usr/share/dpatch/dpatch.make
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-configure: configure-stamp patch-stamp
-configure-stamp:
-	dh_testdir
-	# nothing to configure
-
-	touch configure-stamp
-
-
 build: build-stamp
-
-build-stamp: configure
+build-stamp: patch-stamp
 	dh_testdir
-
-	#nothing to compile
-
 	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	#nothing to clean
-
+	rm -f build-stamp
 	dh_clean 
 
 install: build
@@ -41,7 +20,6 @@
 	dh_clean -k 
 	dh_installdirs
 
-	#here is the important stuff
 	mkdir -p $(CURDIR)/debian/php-kolab/usr/share/php/Kolab
 	for i in Filter/*.php ; do install -D -m 644 $$i $(CURDIR)/debian/php-kolab/usr/share/php/Kolab/$$i ; done
 	for i in Freebusy/*.php ; do install -D -m 644 $$i $(CURDIR)/debian/php-kolab/usr/share/php/Kolab/$$i ; done
@@ -49,18 +27,19 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
+        dh_testdir -i
+        dh_testroot -i
+        dh_installdocs -i
+        dh_installchangelogs  -i
+        dh_link -i
+        dh_strip -i
+        dh_compress -i
+        dh_fixperms -i
+        dh_installdeb -i
+        dh_shlibdeps -i
+        dh_gencontrol -i
+        dh_md5sums -i
+        dh_builddeb -i
+  	
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install