[pkg-kolab] r898 - in kolab-webadmin: branches/2.2/debian branches/2.2/debian/patches upstream

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-07-12 07:41:10 +0000 (Sat, 12 Jul 2008)
New Revision: 898

Added:
   kolab-webadmin/upstream/kolab-webadmin_2.2.0-20080709.orig.tar.gz
Removed:
   kolab-webadmin/branches/2.2/debian/patches/common/
   kolab-webadmin/upstream/kolab-webadmin_2.1.99-20080521.orig.tar.gz
Modified:
   kolab-webadmin/branches/2.2/debian/changelog
   kolab-webadmin/branches/2.2/debian/patches/00list
   kolab-webadmin/branches/2.2/debian/watch
Log:
new upstream relase:
- updated debian/watch accordingly
- removed common/dist_conf.dpatch integrated upstream


Modified: kolab-webadmin/branches/2.2/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2/debian/changelog	2008-07-12 07:34:08 UTC (rev 897)
+++ kolab-webadmin/branches/2.2/debian/changelog	2008-07-12 07:41:10 UTC (rev 898)
@@ -1,17 +1,17 @@
-kolab-webadmin (2.1.99-20080521-1) experimental; urgency=low
+kolab-webadmin (2.2.0-20080709-1) experimental; urgency=low
 
   * New upstream version: 2.2-rc2
   * updated common/dist_conf.dpatch
-    - mostly integrated upstream
     - smarty has now the good path
     - kolab-webadmin url is now /admin
     - added spamassassin_confdir (not used) as requested by Sascha Wilde on
       http://kolab.org/pipermail/kolab-devel/2008-June/009079.html
+    - removed: integrated upstream
   * updated 10-fix-requires.dpatch
   * 60-no_extra_doc partially dropped
   * Bump Standards-Version to 3.8.0 (updated Vcs-Browser and Vcs-Svn fields)
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 15 Jun 2008 13:30:16 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 12 Jul 2008 09:37:22 +0200
 
 kolab-webadmin (2.1.0-20070510-3) UNRELEASED; urgency=low
 

Modified: kolab-webadmin/branches/2.2/debian/patches/00list
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/00list	2008-07-12 07:34:08 UTC (rev 897)
+++ kolab-webadmin/branches/2.2/debian/patches/00list	2008-07-12 07:41:10 UTC (rev 898)
@@ -1,4 +1,3 @@
-common/dist_conf
 10-fix-require
 20-service_index
 60-no_extra_doc

Modified: kolab-webadmin/branches/2.2/debian/watch
===================================================================
--- kolab-webadmin/branches/2.2/debian/watch	2008-07-12 07:34:08 UTC (rev 897)
+++ kolab-webadmin/branches/2.2/debian/watch	2008-07-12 07:41:10 UTC (rev 898)
@@ -1,3 +1,6 @@
 version=3
 opts=dversionmangle=s/~rc/.rc/ \
-ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/kolab-webadmin-([\d\w.-]+).src.rpm  debian  debian/uupdate-wrapper
+# original URL for stable releases:
+ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/kolab-webadmin-([\d.-]+).src.rpm debian debian/uupdate-wrapper
+# URL for development releases:
+#ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/kolab-webadmin-([\d\w.-]+).src.rpm debian debian/uupdate-wrapper

Deleted: kolab-webadmin/upstream/kolab-webadmin_2.1.99-20080521.orig.tar.gz
===================================================================
(Binary files differ)

Added: kolab-webadmin/upstream/kolab-webadmin_2.2.0-20080709.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: kolab-webadmin/upstream/kolab-webadmin_2.2.0-20080709.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream