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

[Mathieu Parent]

Author: sathieu
Date: 2011-06-25 13:53:38 +0000 (Sat, 25 Jun 2011)
New Revision: 1555

Added:
   kolabadmin/trunk/debian/patches/02_spelling-error.diff
   kolabadmin/trunk/debian/source/
   kolabadmin/trunk/debian/source/format
Modified:
   kolabadmin/trunk/debian/changelog
   kolabadmin/trunk/debian/control
   kolabadmin/trunk/debian/patches/series
   kolabadmin/trunk/debian/rules
Log:
Switch to dpkg-source 3.0 (quilt) format and correct spelling error

Modified: kolabadmin/trunk/debian/changelog
===================================================================
--- kolabadmin/trunk/debian/changelog	2011-06-25 13:41:25 UTC (rev 1554)
+++ kolabadmin/trunk/debian/changelog	2011-06-25 13:53:38 UTC (rev 1555)
@@ -2,6 +2,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
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 25 Jun 2011 15:40:09 +0200
 

Modified: kolabadmin/trunk/debian/control
===================================================================
--- kolabadmin/trunk/debian/control	2011-06-25 13:41:25 UTC (rev 1554)
+++ kolabadmin/trunk/debian/control	2011-06-25 13:53:38 UTC (rev 1555)
@@ -3,7 +3,7 @@
 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: cdbs (>= 0.4.41), debhelper (>= 5), quilt, libqt4-dev, libldap2-dev, libssl-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), libqt4-dev, libldap2-dev, libssl-dev
 Standards-Version: 3.9.2
 Homepage: http://wgess16.dyndns.org/~tobias/qt/kolabadmin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolabadmin/trunk/

Added: kolabadmin/trunk/debian/patches/02_spelling-error.diff
===================================================================
--- kolabadmin/trunk/debian/patches/02_spelling-error.diff	                        (rev 0)
+++ kolabadmin/trunk/debian/patches/02_spelling-error.diff	2011-06-25 13:53:38 UTC (rev 1555)
@@ -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:41:25 UTC (rev 1554)
+++ kolabadmin/trunk/debian/patches/series	2011-06-25 13:53:38 UTC (rev 1555)
@@ -1 +1,2 @@
 10_no-add-needed.diff
+02_spelling-error.diff

Modified: kolabadmin/trunk/debian/rules
===================================================================
--- kolabadmin/trunk/debian/rules	2011-06-25 13:41:25 UTC (rev 1554)
+++ kolabadmin/trunk/debian/rules	2011-06-25 13:53:38 UTC (rev 1555)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/qmake.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 QMAKE = qmake-qt4
 DEB_INSTALL_MANPAGES_kolabadmin = debian/kolabadmin.1

Added: kolabadmin/trunk/debian/source/format
===================================================================
--- kolabadmin/trunk/debian/source/format	                        (rev 0)
+++ kolabadmin/trunk/debian/source/format	2011-06-25 13:53:38 UTC (rev 1555)
@@ -0,0 +1 @@
+3.0 (quilt)