[pkg-kolab] r1380 - in kolab-cyrus-imapd: scripts trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2009-10-18 13:06:47 +0000 (Sun, 18 Oct 2009)
New Revision: 1380

Modified:
   kolab-cyrus-imapd/scripts/cyrus-to-kolab
   kolab-cyrus-imapd/trunk/debian/changelog
   kolab-cyrus-imapd/trunk/debian/rules
Log:
Some minor changes to match a little more cyrus-imapd-2.2


Modified: kolab-cyrus-imapd/scripts/cyrus-to-kolab
===================================================================
--- kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-10-18 12:48:46 UTC (rev 1379)
+++ kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-10-18 13:06:47 UTC (rev 1380)
@@ -315,8 +315,12 @@
 file=rules
 
 map_names $path
+sed -i 's at export DOCPKG=cyrus-doc-2.2@#&@' $path
+sed -i 's@^.*DOCDIR@#&@' $path
+sed -i 's at mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d at mkdir -p $(TMPPKG)/etc/cyrus #$(TMPPKG)/etc/pam.d@' $path
+sed -i 's at logcheck-cyrus2_2@logcheck-kolab-cyrus at g' $path
 sed -i 's/dh_installdocs -p kolab-cyrus-admin -p cyrus-doc-2.2/dh_installdocs -p kolab-cyrus-admin/'  $path
-sed -i 's/dh_installchangelogs -p cyrus-doc-2.2/#dh_installchangelogs -p cyrus-doc-2.2/'  $path
+sed -i 's/dh_installchangelogs -p cyrus-doc-2.2/#&/'  $path
 sed -i 's/dh_installinit -p $(MAINPKG) --noscripts --name=cyrus2.2/dh_installinit -p $(MAINPKG) --noscripts --name=kolab-cyrus/'  $path
 sed -i 's/dh_installcron -a --name=cyrus22/dh_installcron -a --name=kolab-cyrus/' $path
 

Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2009-10-18 12:48:46 UTC (rev 1379)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2009-10-18 13:06:47 UTC (rev 1380)
@@ -1,4 +1,4 @@
-kolab-cyrus-imapd (2.2.13-8~pre1) UNRELEASED; urgency=low
+kolab-cyrus-imapd (2.2.13-8~pre2) UNRELEASED; urgency=low
 
   * Remove kolab-cyrus-common.linda 
   * 01-fix_Makefile.in.dpatch: sync with cyrus-imapd-2.2

Modified: kolab-cyrus-imapd/trunk/debian/rules
===================================================================
--- kolab-cyrus-imapd/trunk/debian/rules	2009-10-18 12:48:46 UTC (rev 1379)
+++ kolab-cyrus-imapd/trunk/debian/rules	2009-10-18 13:06:47 UTC (rev 1380)
@@ -11,8 +11,10 @@
 export DH_ALWAYS_EXCLUDE=CVS
 
 export MAINPKG=kolab-cyrus-common
+#export DOCPKG=cyrus-doc-2.2
 export TMPPKG := $(CURDIR)/debian/tmp
 export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
+#export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG)
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -297,7 +299,7 @@
 	dh_installdirs -i
 	#
 	# Massage the documentation into place
-	#mkdir -p $(DOCDIR)
+#	#mkdir -p $(DOCDIR)
 	#find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \;
 	#-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c)
 	#find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \;
@@ -311,7 +313,7 @@
 	#
 	# Install contrib/ files
 #	mkdir -p $(DOCDIR)/contrib
-#	xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
+#	xargs < debian/kolab-cyrus-common.contrib -rti cp -r '{}' $(DOCDIR)/contrib
 	#
 	dh_install -i --sourcedir=$(TMPPKG)
 
@@ -328,6 +330,7 @@
 #	dh_installcron -i
 	dh_installman -i
 	dh_installchangelogs -p kolab-cyrus-admin doc/changes.html
+	#dh_installchangelogs -p cyrus-doc-2.2
 	dh_strip -i
 	dh_link -i
 	dh_compress -i