[pkg-kolab] r55 - trunk/kolab-cyrus-imapd/debian

[Steffen Joeris]

Author: white-guest
Date: 2005-12-20 14:43:06 +0000 (Tue, 20 Dec 2005)
New Revision: 55

Modified:
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
   trunk/kolab-cyrus-imapd/debian/rules
Log:
* fix the build-arch stuff in packaging and some links


Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links	2005-12-20 12:17:34 UTC (rev 54)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-dev.links	2005-12-20 14:43:06 UTC (rev 55)
@@ -1 +1 @@
-usr/share/doc/cyrus21-common usr/share/doc/cyrus21-dev
+usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-dev

Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links	2005-12-20 12:17:34 UTC (rev 54)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-imapd.links	2005-12-20 14:43:06 UTC (rev 55)
@@ -1 +1 @@
-usr/share/doc/cyrus21-common usr/share/doc/cyrus21-imapd
+usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-imapd

Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links	2005-12-20 12:17:34 UTC (rev 54)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-murder.links	2005-12-20 14:43:06 UTC (rev 55)
@@ -1 +1 @@
-usr/share/doc/cyrus21-common usr/share/doc/cyrus21-murder
+usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-murder

Modified: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links	2005-12-20 12:17:34 UTC (rev 54)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links	2005-12-20 14:43:06 UTC (rev 55)
@@ -1 +1 @@
-usr/share/doc/cyrus21-common usr/share/doc/cyrus21-pop3d
+usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-pop3d

Modified: trunk/kolab-cyrus-imapd/debian/rules
===================================================================
--- trunk/kolab-cyrus-imapd/debian/rules	2005-12-20 12:17:34 UTC (rev 54)
+++ trunk/kolab-cyrus-imapd/debian/rules	2005-12-20 14:43:06 UTC (rev 55)
@@ -202,14 +202,13 @@
 	#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
 	#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
 
-	# Uncomment this for Kolab as we don't need pam authentification ...
-	# for stuff in /etc
-#	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
-	install -m 644 debian/imapd.conf    $(TMPPKG)/etc
-	install -m 644 debian/cyrus.conf    $(TMPPKG)/etc
-#	(cd debian ; for i in *.pam ;\
-#		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
-#	done)
+	# for stuff in /etc, small modification (really install the file under /etc)
+	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
+	install -D -m 644 debian/imapd.conf    $(TMPPKG)/etc/imapd.conf
+	install -D -m 644 debian/cyrus.conf    $(TMPPKG)/etc/cyrus.conf
+	(cd debian ; for i in *.pam ;\
+		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
+	done)
 
 	# We rename some utils, so we need to sort out the manpages
 	for i in master reconstruct quota deliver ; do \
@@ -220,7 +219,7 @@
 	mkdir -p $(TMPPKG)/usr/share/man/man8
 
 	# Uncomment it for Kolab
-#	install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
+	install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
 	install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
 
 	# SNMP files
@@ -238,7 +237,7 @@
 	# First we have to look at them and decide wether we include them or not.
 	# Install debian-provided scripts
 	install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
-#	install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
+	install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
 
 	# Uncomment this for Kolab.
 	# First check ...
@@ -285,8 +284,8 @@
 #		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
 #	done
 #
-#	dh_movefiles -a
-#	touch install-arch-stamp
+	dh_movefiles -a
+	touch install-arch-stamp
 
 # We aren't actually able to install arch-indep independently from
 # arch-dep, so we guarantee that the arch build has been done first