[pkg-kolab] r1108 - in kolab-webadmin/branches/2.2.1/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-01-04 18:15:21 +0000 (Sun, 04 Jan 2009)
New Revision: 1108

Modified:
   kolab-webadmin/branches/2.2.1/debian/changelog
   kolab-webadmin/branches/2.2.1/debian/patches/10-fix-require.diff
   kolab-webadmin/branches/2.2.1/debian/patches/60-no_extra_doc.diff
Log:
patches refreshed


Modified: kolab-webadmin/branches/2.2.1/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/changelog	2009-01-04 16:22:55 UTC (rev 1107)
+++ kolab-webadmin/branches/2.2.1/debian/changelog	2009-01-04 18:15:21 UTC (rev 1108)
@@ -2,8 +2,9 @@
 
   * New beta release 2.2.1-beta-1
   * removed 20-service_index.diff, integrated
+  * patches refreshed 
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 00:10:20 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 04 Jan 2009 19:11:23 +0100
 
 kolab-webadmin (2.2.0-20080709-2) UNRELEASED; urgency=low
 

Modified: kolab-webadmin/branches/2.2.1/debian/patches/10-fix-require.diff
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/patches/10-fix-require.diff	2009-01-04 16:22:55 UTC (rev 1107)
+++ kolab-webadmin/branches/2.2.1/debian/patches/10-fix-require.diff	2009-01-04 18:15:21 UTC (rev 1108)
@@ -1,12 +1,13 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix-requrires.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Correction of the require paths
+Goal: Correction of the require paths
 
- at DPATCH@
-diff -urNad kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in
---- kolab-webadmin-2.1.99+20080314~/php/admin/include/ldap.class.php.in	2008-03-06 12:46:29.000000000 +0100
-+++ kolab-webadmin-2.1.99+20080314/php/admin/include/ldap.class.php.in	2008-03-17 19:52:48.000000000 +0100
+Author: Steffen Joeris <steffen.joeris at skolelinux.de>
+
+Upstream status: Specific to Debian
+
+Index: b/php/admin/include/ldap.class.php.in
+===================================================================
+--- a/php/admin/include/ldap.class.php.in
++++ b/php/admin/include/ldap.class.php.in
 @@ -19,7 +19,7 @@
   */
  

Modified: kolab-webadmin/branches/2.2.1/debian/patches/60-no_extra_doc.diff
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/patches/60-no_extra_doc.diff	2009-01-04 16:22:55 UTC (rev 1107)
+++ kolab-webadmin/branches/2.2.1/debian/patches/60-no_extra_doc.diff	2009-01-04 18:15:21 UTC (rev 1108)
@@ -1,15 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60-no_extra_doc.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Disables installation of unnecessary documentation
+Goal: Disables installation of unnecessary documentation
 
- at DPATCH@
-diff -urNad kolab-webadmin-2.1.0-20070510~/Makefile.am kolab-webadmin-2.1.0-20070510/Makefile.am
---- kolab-webadmin-2.1.0-20070510~/Makefile.am	2007-01-10 16:59:58.000000000 +0100
-+++ kolab-webadmin-2.1.0-20070510/Makefile.am	2007-06-18 02:23:33.000000000 +0200
-@@ -187,11 +187,11 @@
- dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
- dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+Author: Peter Eisentraut <petere at debian.org>
+
+Upstream status: Specific to Debian
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -210,11 +210,11 @@
+ 	$(PHP_LOCALE_IT_PO) \
+ 	$(PHP_LOCALE_ES_PO)
  
 -kwadocdir = $(pkgdocdir)/@PACKAGE@
 -dist_kwadoc_DATA = ChangeLog \
@@ -24,10 +25,11 @@
  
  EXTRA_DIST += dist_conf/common \
  	dist_conf/debian \
-diff -urNad kolab-webadmin-2.1.99-20080314~/Makefile.in kolab-webadmin-2.1.99-20080314/Makefile.in
---- kolab-webadmin-2.1.99-20080314~/Makefile.in	2008-05-20 19:28:39.000000000 +0200
-+++ kolab-webadmin-2.1.99-20080314/Makefile.in	2008-05-20 19:38:22.000000000 +0200
-@@ -386,11 +386,11 @@
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -385,11 +385,11 @@
  phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
  phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
  phplocalees_DATA = $(PHP_LOCALE_ES_MO)
@@ -44,4 +46,3 @@
  
  all: all-am
  
-