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

Mathieu Parent sathieu at alioth.debian.org
Sun Oct 18 12:48:46 UTC 2009


Author: sathieu
Date: 2009-10-18 12:48:46 +0000 (Sun, 18 Oct 2009)
New Revision: 1379

Added:
   kolab-cyrus-imapd/trunk/debian/README.source
Removed:
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.linda
Modified:
   kolab-cyrus-imapd/scripts/cyrus-to-kolab
   kolab-cyrus-imapd/trunk/debian/changelog
   kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
   kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch
   kolab-cyrus-imapd/trunk/debian/rules
Log:
  * Remove kolab-cyrus-common.linda
  * 01-fix_Makefile.in.dpatch: sync with cyrus-imapd-2.2
    (add '@WARNERROR@ -fPIC' to CFLAGS)
  * README.source: describe "cyrus-to-kolab" process
  * Other minor fixes


Modified: kolab-cyrus-imapd/scripts/cyrus-to-kolab
===================================================================
--- kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-10-18 12:16:24 UTC (rev 1378)
+++ kolab-cyrus-imapd/scripts/cyrus-to-kolab	2009-10-18 12:48:46 UTC (rev 1379)
@@ -142,7 +142,7 @@
 
 #==============================================================================
 # unwanted files
-rm $dest_dir_debian/{README.Debian.simpleinstall,README.exim,README.sendmail,TODO.Debian,UPGRADE.Debian,*.pam,cyrus*-common*.NEWS}
+rm $dest_dir_debian/{README.Debian.simpleinstall,README.new_upstream,README.exim,README.sendmail,TODO.Debian,UPGRADE.Debian,*.pam,cyrus*-common*.NEWS}
 
 #==============================================================================
 # debian/changelog
@@ -247,7 +247,7 @@
 
 path=$dest_dir_debian/README.Debian
 file=README.Debian
-cat <<HEADER > $dest_dir_debian/README.Debian
+cat <<HEADER > $path
 Kolab-Cyrus IMAP for Debian
 
 This is a special version of the Cyrus package to run in a Kolab system.
@@ -271,9 +271,32 @@
 HEADER
 #do
 
-cat $cyrus_dir_debian/README.Debian >> $dest_dir_debian/README.Debian
+cat $cyrus_dir_debian/$file >> $path
 
 #==============================================================================
+# debian/README.source
+
+path=$dest_dir_debian/README.source
+file=README.source
+cat <<HEADER > $path
+This package is based on the cyrus-imapd package. The Debian Kolab Maintainers
+maintain a separate source package for use with Kolab.
+The Cyrus Maintainers know and accept this.
+
+This package is made using the "cyrus-to-kolab" script available from the
+Debian Kolab Maintainers repository under the kolab-cyrus-imapd/scripts
+directory.
+
+Information about the original Cyrus package follows.  Be aware that the
+file names will be different in some cases.
+
+
+HEADER
+#do
+
+cat $cyrus_dir_debian/$file >> $path
+
+#==============================================================================
 # debian/patches
 for patch in $kolab_patches; do
     cp $trunk_dir_debian/patches/$patch $dest_dir_debian/patches/$patch
@@ -321,6 +344,7 @@
 			esac
 			case $newfile in *.init)
                 sed -i 's at cyrus 2.2 at kolab-cyrus@g' $dest_dir_debian/$newfile
+                sed -i 's@/usr/share/doc/kolab-cyrus-common/UPGRADE.Debian@/usr/share/doc/cyrus-common-2.2/UPGRADE.Debian at g' $dest_dir_debian/$newfile
 			esac
         done
     fi

Added: kolab-cyrus-imapd/trunk/debian/README.source
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.source	                        (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/README.source	2009-10-18 12:48:46 UTC (rev 1379)
@@ -0,0 +1,41 @@
+This package is based on the cyrus-imapd package. The Debian Kolab Maintainers
+maintain a separate source package for use with Kolab.
+The Cyrus Maintainers know and accept this.
+
+This package is made using the "cyrus-to-kolab" script available from the
+Debian Kolab Maintainers repository under the kolab-cyrus-imapd/scripts
+directory.
+
+Information about the original Cyrus package follows.  Be aware that the
+file names will be different in some cases.
+
+
+Debian packages for cyrus-imapd-2.2 use the dpatch patch system.
+
+If you are not familiar with this patch system, this document provides you
+with a very short description of how to patch the sources. It assumes that
+you want to add a patch on top of what the package already contains, not that
+you want to edit one of the existing patches.
+
+1) cd to the main source directory (the one containing debian/)
+3) Tell dpatch that you intend to edit your patch:
+      dpatch-edit-patch patch 99_your.dpatch \
+                   99-update-autoconf.dpatch \
+	--description="Description of your patch" \
+        --add2list
+   That command will create the new patch as file
+   debian/patches/99_your.dpatch, adding the Description to the patch header,
+   apply all patches up to 99-update-autoconf.dpatch, add your patch to the
+   list of patches that are to be applied on build and open a shell for you
+   in which you can do the edits.
+   If you want to edit your patch again later on, the first line of the above
+   multiline command will suffice.
+4) Do the edits you want to do and exit the shell with an
+   exit code of 0 (a plain "exit" will do that). If you want
+   to abort your edit, use "exit 230".
+5) Once finished, run "dpatch deapply-all" to unpatch the whole tree again
+   (i.e. return to an unpatched source, preserving your edits as
+   debian/patches/99_your.dpatch, which is now listed in debian/patches/00list
+   and will be applied automatically on package builds).
+
+Document your patch in debian/changelog, please.

Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog	2009-10-18 12:16:24 UTC (rev 1378)
+++ kolab-cyrus-imapd/trunk/debian/changelog	2009-10-18 12:48:46 UTC (rev 1379)
@@ -1,3 +1,12 @@
+kolab-cyrus-imapd (2.2.13-8~pre1) UNRELEASED; urgency=low
+
+  * Remove kolab-cyrus-common.linda 
+  * 01-fix_Makefile.in.dpatch: sync with cyrus-imapd-2.2
+    (add '@WARNERROR@ -fPIC' to CFLAGS)
+  * README.source: describe "cyrus-to-kolab" process
+
+ -- Mathieu Parent <sathieu at debian.org>  Sun, 18 Oct 2009 14:23:31 +0200
+
 kolab-cyrus-imapd (2.2.13-7) unstable; urgency=high
 
   * Setting urgency to high due to the CVE below

Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init	2009-10-18 12:16:24 UTC (rev 1378)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.kolab-cyrus.init	2009-10-18 12:48:46 UTC (rev 1379)
@@ -7,8 +7,8 @@
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: common init system for kolab-cyrus IMAP/POP3 daemons.
-# Description: common init system for kolab-cyrus IMAP/POP3 daemons.
-#              start central kolab-cyrus master process, which can 
+# Description: common init system the for kolab-cyrus IMAP/POP3 daemons.
+#              starts the central kolab-cyrus master process, which can 
 #              then start various services depending on configuration.
 #              Typically starts IMAP and POP3 daemons, but might also
 #              start an NNTP daemon and various helper daemons for

Deleted: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.linda
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.linda	2009-10-18 12:16:24 UTC (rev 1378)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.linda	2009-10-18 12:48:46 UTC (rev 1379)
@@ -1,2 +0,0 @@
-Tag: postinst-db-input
-

Modified: kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch	2009-10-18 12:16:24 UTC (rev 1378)
+++ kolab-cyrus-imapd/trunk/debian/patches/01-fix_Makefile.in.dpatch	2009-10-18 12:48:46 UTC (rev 1379)
@@ -41,6 +41,18 @@
  LDFLAGS = @LDFLAGS@
  
  INSTALL = @INSTALL@
+diff -urNad complete.dpatch/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in
+--- complete.dpatch/lib/Makefile.in	2004-05-28 20:03:04.000000000 +0200
++++ /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in	2005-11-10 16:34:20.134821720 +0100
+@@ -62,7 +62,7 @@
+ LIBS = @LIBS@
+ 
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ @WARNERROR@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
 diff -urNad complete.dpatch/master/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in
 --- complete.dpatch/master/Makefile.in	2004-12-17 17:32:24.000000000 +0100
 +++ /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in	2005-11-10 16:34:20.134821720 +0100

Modified: kolab-cyrus-imapd/trunk/debian/rules
===================================================================
--- kolab-cyrus-imapd/trunk/debian/rules	2009-10-18 12:16:24 UTC (rev 1378)
+++ kolab-cyrus-imapd/trunk/debian/rules	2009-10-18 12:48:46 UTC (rev 1379)
@@ -351,7 +351,7 @@
 #	dh_installpam -a
 #	dh_installmime -a
 	dh_installinit -p $(MAINPKG) --noscripts --name=kolab-cyrus
-	dh_installcron -a --name=kolab-cyrus
+	dh_installcron -a --name=kolab-cyrus 
 	dh_installman -a
 #	dh_installinfo -a
 	dh_installchangelogs -p $(MAINPKG) -p kolab-cyrus-clients doc/changes.html




More information about the pkg-kolab-devel mailing list