[pkg-kolab] r1528 - in kolab-webclient/trunk/debian: . patches source

[Mathieu Parent]

Author: sathieu
Date: 2010-09-30 20:44:38 +0000 (Thu, 30 Sep 2010)
New Revision: 1528

Added:
   kolab-webclient/trunk/debian/source/
   kolab-webclient/trunk/debian/source/format
Modified:
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/control
   kolab-webclient/trunk/debian/patches/20-data-directories.diff
   kolab-webclient/trunk/debian/patches/30-sieve-port.diff
   kolab-webclient/trunk/debian/rules
Log:
- Updated Standards-Version to 3.9.1: no changes
- Switch to dpkg-source 3.0 (quilt) format
- Updated patches description to match DEP 3


Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2010-09-30 20:14:59 UTC (rev 1527)
+++ kolab-webclient/trunk/debian/changelog	2010-09-30 20:44:38 UTC (rev 1528)
@@ -1,11 +1,12 @@
 kolab-webclient (1.2.0-20091202+debian0-1) UNRELEASED; urgency=low
 
   * New upstream release 2.2.3 (20091202)
-  * Updated Standards-Version to 3.8.4: no changes
+  * Updated Standards-Version to 3.9.1: no changes
   * New 30-sieve-port.diff: Fix "could not connect to sieve port: connexion
     driver failed" by changing sieve port to 4190 (Closes: #598024)
+  * Switch to dpkg-source 3.0 (quilt) format
 
- -- Mathieu Parent <sathieu at debian.org>  Thu, 30 Sep 2010 22:15:39 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Thu, 30 Sep 2010 22:43:31 +0200
 
 kolab-webclient (1.2.0-20090514+debian0-2) experimental; urgency=low
 

Modified: kolab-webclient/trunk/debian/control
===================================================================
--- kolab-webclient/trunk/debian/control	2010-09-30 20:14:59 UTC (rev 1527)
+++ kolab-webclient/trunk/debian/control	2010-09-30 20:44:38 UTC (rev 1528)
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Mathieu Parent <sathieu at debian.org>
-Build-Depends: debhelper (>= 7), quilt (>= 0.40)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.1
 Homepage: http://kolab.org/webclient.html
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-webclient/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-webclient/trunk/

Modified: kolab-webclient/trunk/debian/patches/20-data-directories.diff
===================================================================
--- kolab-webclient/trunk/debian/patches/20-data-directories.diff	2010-09-30 20:14:59 UTC (rev 1527)
+++ kolab-webclient/trunk/debian/patches/20-data-directories.diff	2010-09-30 20:44:38 UTC (rev 1528)
@@ -1,9 +1,7 @@
-Goal: Change data directories to match FHS
-
+Description: Change data directories to match FHS
+ Should be reported upstream.
 Author: Mathieu Parent <math.parent at gmail.com>
 
-Upstream status: Should be reported (parts can be integrated)
-
 Index: b/var/kolab/www/client/config/conf.php
 ===================================================================
 --- a/var/kolab/www/client/config/conf.php

Modified: kolab-webclient/trunk/debian/patches/30-sieve-port.diff
===================================================================
--- kolab-webclient/trunk/debian/patches/30-sieve-port.diff	2010-09-30 20:14:59 UTC (rev 1527)
+++ kolab-webclient/trunk/debian/patches/30-sieve-port.diff	2010-09-30 20:44:38 UTC (rev 1528)
@@ -1,3 +1,11 @@
+Description: Change sieve port to 4190
+ This is needed since "NOTICE: Debian is moving sieve to its IANA allocated
+ port (4190)":
+ <http://lists.alioth.debian.org/pipermail/pkg-cyrus-imapd-debian-devel/2009-December/003103.html>
+Bug-Debian: http://bugs.debian.org/598024
+Forwarded: https://issues.kolab.org/issue4373
+Author: Mathieu Parent <math.parent at gmail.com>
+
 Index: kolab-webclient-1.2.0-20091202+debian0/var/kolab/www/client/config/conf.php
 ===================================================================
 --- kolab-webclient-1.2.0-20091202+debian0.orig/var/kolab/www/client/config/conf.php	2010-09-30 22:11:44.000000000 +0200

Modified: kolab-webclient/trunk/debian/rules
===================================================================
--- kolab-webclient/trunk/debian/rules	2010-09-30 20:14:59 UTC (rev 1527)
+++ kolab-webclient/trunk/debian/rules	2010-09-30 20:44:38 UTC (rev 1528)
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
-
-build: patch
-
-clean: unpatch
+clean: 
 	dh_testdir
 	dh_testroot
 

Added: kolab-webclient/trunk/debian/source/format
===================================================================
--- kolab-webclient/trunk/debian/source/format	                        (rev 0)
+++ kolab-webclient/trunk/debian/source/format	2010-09-30 20:44:38 UTC (rev 1528)
@@ -0,0 +1 @@
+3.0 (quilt)