[pkg-kolab] r1556 - in kolabadmin/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2011-06-25 13:58:33 +0000 (Sat, 25 Jun 2011)
New Revision: 1556

Added:
   kolabadmin/trunk/debian/patches/20_spelling-error.diff
Removed:
   kolabadmin/trunk/debian/README.source
   kolabadmin/trunk/debian/patches/02_spelling-error.diff
Modified:
   kolabadmin/trunk/debian/changelog
   kolabadmin/trunk/debian/patches/series
Log:
deleting unneeded debian/README.source

Deleted: kolabadmin/trunk/debian/README.source
===================================================================
--- kolabadmin/trunk/debian/README.source	2011-06-25 13:53:38 UTC (rev 1555)
+++ kolabadmin/trunk/debian/README.source	2011-06-25 13:58:33 UTC (rev 1556)
@@ -1,9 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.  Please see:
-
-    /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
-

Modified: kolabadmin/trunk/debian/changelog
===================================================================
--- kolabadmin/trunk/debian/changelog	2011-06-25 13:53:38 UTC (rev 1555)
+++ kolabadmin/trunk/debian/changelog	2011-06-25 13:58:33 UTC (rev 1556)
@@ -3,8 +3,9 @@
   * Fix "FTBFS: g++: error: unrecognized option '--no-add-needed'"
     thanks to Ilya Barygin on Ubuntu (Closes: #628260)
   * Updated Standards-Version to 3.9.2: no changes
-  * Switch to dpkg-source 3.0 (quilt) format
-  * New 02_spelling-error.diff: dont -> don't
+  * Switch to dpkg-source 3.0 (quilt) format, removed quilt dep and deleted
+    unneeded debian/README.source
+  * New 20_spelling-error.diff: dont -> don't
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 25 Jun 2011 15:40:09 +0200
 

Deleted: kolabadmin/trunk/debian/patches/02_spelling-error.diff
===================================================================
--- kolabadmin/trunk/debian/patches/02_spelling-error.diff	2011-06-25 13:53:38 UTC (rev 1555)
+++ kolabadmin/trunk/debian/patches/02_spelling-error.diff	2011-06-25 13:58:33 UTC (rev 1556)
@@ -1,19 +0,0 @@
-Goal: Correct spelling error
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Upstream unreachable
-       
-Index: b/passwordfield.cpp
-===================================================================
---- a/passwordfield.cpp	2011-06-25 15:49:30.000000000 +0200
-+++ b/passwordfield.cpp	2011-06-25 15:49:53.000000000 +0200
-@@ -62,7 +62,7 @@
- 
-   if ( state == PagePolicy::Add || state == PagePolicy::Modify ) {
-     if ( mPassword->text() != mPasswordVerify->text() ) {
--      msg = tr( "Passwords dont match" );
-+      msg = tr( "Passwords don't match" );
-       return false;
-     }
-   }

Copied: kolabadmin/trunk/debian/patches/20_spelling-error.diff (from rev 1555, kolabadmin/trunk/debian/patches/02_spelling-error.diff)
===================================================================
--- kolabadmin/trunk/debian/patches/20_spelling-error.diff	                        (rev 0)
+++ kolabadmin/trunk/debian/patches/20_spelling-error.diff	2011-06-25 13:58:33 UTC (rev 1556)
@@ -0,0 +1,19 @@
+Goal: Correct spelling error
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Upstream unreachable
+       
+Index: b/passwordfield.cpp
+===================================================================
+--- a/passwordfield.cpp	2011-06-25 15:49:30.000000000 +0200
++++ b/passwordfield.cpp	2011-06-25 15:49:53.000000000 +0200
+@@ -62,7 +62,7 @@
+ 
+   if ( state == PagePolicy::Add || state == PagePolicy::Modify ) {
+     if ( mPassword->text() != mPasswordVerify->text() ) {
+-      msg = tr( "Passwords dont match" );
++      msg = tr( "Passwords don't match" );
+       return false;
+     }
+   }

Modified: kolabadmin/trunk/debian/patches/series
===================================================================
--- kolabadmin/trunk/debian/patches/series	2011-06-25 13:53:38 UTC (rev 1555)
+++ kolabadmin/trunk/debian/patches/series	2011-06-25 13:58:33 UTC (rev 1556)
@@ -1,2 +1,2 @@
 10_no-add-needed.diff
-02_spelling-error.diff
+20_spelling-error.diff