[pkg-kolab] r897 - in kolabd: branches/2.2/debian branches/2.2/debian/patches upstream

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-07-12 07:34:08 +0000 (Sat, 12 Jul 2008)
New Revision: 897

Added:
   kolabd/upstream/kolabd_2.2.0-20080709.dfsg.orig.tar.gz
Removed:
   kolabd/branches/2.2/debian/patches/common/
   kolabd/upstream/kolabd_2.1.99-20080521.dfsg.orig.tar.gz
Modified:
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/patches/00list
   kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch
   kolabd/branches/2.2/debian/watch
Log:
New upstream stable version:
- removed common/dist_conf.dpatch, integrated upstream
- updated patch 30-bootstrap
  - gethostname rewriten upstream to use Net::Domain
- updated debian/watch accoordingly



Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-07-12 07:12:25 UTC (rev 896)
+++ kolabd/branches/2.2/debian/changelog	2008-07-12 07:34:08 UTC (rev 897)
@@ -1,4 +1,4 @@
-kolabd (2.1.99-20080521.dfsg-1) experimental; urgency=low
+kolabd (2.2.0-20080709.dfsg-1) experimental; urgency=low
 
   * New upstream version: 2.2-rc2
     - removed 80-kolab-syslog-facility.dpatch: partially applied upstream
@@ -9,13 +9,15 @@
     - add user postfix to group sasl during postinst, to allow authentication
       within postfix
     - remove /etc/kolab/templates/local.cf.template (new amavisd config)
-  * updated common/dist_conf.dpatch
-    - mostly integrated upstream
+  * updated then removed common/dist_conf.dpatch
     - 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
-  * updated patch 30-bootstrap to run newaliases at the end of kolab_bootstrap
+    - removed: integrated upstream
+  * updated patch 30-bootstrap
+    - run newaliases at the end of kolab_bootstrap
+    - gethostname rewriten upstream to use Net::Domain
   * new patch 40-disable-amavis: amavis is suggested, so disabled as default
   * new patch 50-postfix-hashes: Postfix hashes templates
     - Added RUNONCHANGE=/usr/sbin/postmap -o @emailserver_confdir@/... so that 
@@ -41,7 +43,7 @@
   * debian/postinst: add user cyrus to group kolab. This is needed for PKI.
   * Bump Standards-Version to 3.8.0 (updated Vcs-Browser and Vcs-Svn fields) 
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 25 Jun 2008 23:38:21 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 12 Jul 2008 09:31:52 +0200
 
 kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
 

Modified: kolabd/branches/2.2/debian/patches/00list
===================================================================
--- kolabd/branches/2.2/debian/patches/00list	2008-07-12 07:12:25 UTC (rev 896)
+++ kolabd/branches/2.2/debian/patches/00list	2008-07-12 07:34:08 UTC (rev 897)
@@ -1,4 +1,3 @@
-common/dist_conf
 30-bootstrap
 40-disable-amavis
 50-postfix-hashes

Modified: kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch	2008-07-12 07:12:25 UTC (rev 896)
+++ kolabd/branches/2.2/debian/patches/30-bootstrap.dpatch	2008-07-12 07:34:08 UTC (rev 897)
@@ -13,39 +13,8 @@
  use File::Copy;
 +use File::Path;
  use Getopt::Std;
- use Sys::Hostname;
  use Term::ReadKey;
-@@ -49,19 +50,19 @@
- sub myhostname {
-   my $host = '';
-   # FIXME: hardcoded - maybe fixed later
--  if( open( HOSTNAME, '/etc/HOSTNAME' ) ) {
--    $host = <HOSTNAME>;
--    chomp $host;
--    close( HOSTNAME );
--  }
-+#  if( open( HOSTNAME, '/etc/HOSTNAME' ) ) {
-+#    $host = <HOSTNAME>;
-+#    chomp $host;
-+#    close( HOSTNAME );
-+#  }
-   # FIXME: hardcoded - maybe fixed later
--  if( open( HOSTNAME, '/etc/hostname' ) ) {
--    $host = <HOSTNAME>;
--    chomp $host;
--    close( HOSTNAME );
--  }
-+#  if( open( HOSTNAME, '/etc/hostname' ) ) {
-+#    $host = <HOSTNAME>;
-+#    chomp $host;
-+#    close( HOSTNAME );
-+#  }
-   if( $host eq '' ) {
--    $host = `hostname`;
-+    $host = `hostname --fqdn`;
-   }
-   return $host;
- }
+ use Term::Local;
 @@ -90,7 +91,7 @@
      print ("Error: Found $name running on Port $port\n");
      print ("Check your installation!\n");

Modified: kolabd/branches/2.2/debian/watch
===================================================================
--- kolabd/branches/2.2/debian/watch	2008-07-12 07:12:25 UTC (rev 896)
+++ kolabd/branches/2.2/debian/watch	2008-07-12 07:34:08 UTC (rev 897)
@@ -1,3 +1,6 @@
 version=3
 opts=dversionmangle=s/\.dfsg$// \
-ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/kolabd-([\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/kolabd-([\d\w.-]+).src.rpm debian debian/uupdate-wrapper
+# URL for development releases:
+#ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/kolabd-([\d\w.-]+).src.rpm  debian  debian/uupdate-wrapper

Deleted: kolabd/upstream/kolabd_2.1.99-20080521.dfsg.orig.tar.gz
===================================================================
(Binary files differ)

Added: kolabd/upstream/kolabd_2.2.0-20080709.dfsg.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: kolabd/upstream/kolabd_2.2.0-20080709.dfsg.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream