rev 17459 - in kde-extras/gtk-qt-engine/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Thu Mar 18 11:55:59 UTC 2010 

Author: fabo
Date: 2010-03-18 11:55:58 +0000 (Thu, 18 Mar 2010)
New Revision: 17459

Modified:
   kde-extras/gtk-qt-engine/trunk/debian/changelog
   kde-extras/gtk-qt-engine/trunk/debian/control
   kde-extras/gtk-qt-engine/trunk/debian/copyright
   kde-extras/gtk-qt-engine/trunk/debian/patches/07_point_to_package.patch
   kde-extras/gtk-qt-engine/trunk/debian/patches/08_update_translations.patch
   kde-extras/gtk-qt-engine/trunk/debian/rules
Log:
Enable parallel build (pass --paralle option to dh).

Modified: kde-extras/gtk-qt-engine/trunk/debian/changelog
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/changelog	2010-03-18 11:41:14 UTC (rev 17458)
+++ kde-extras/gtk-qt-engine/trunk/debian/changelog	2010-03-18 11:55:58 UTC (rev 17459)
@@ -2,12 +2,14 @@
 
   * Switch to dpkg-source 3.0 (quilt) format.
     - Remove README.source
-    - Remove quilt B-D
+    - Remove quilt build dependency.
   * Update debian/rules:
     - Remove quilt addon.
     - Use kde sequence addon (Closes: #574318).
-      - Bump pkg-kde-tools B-D.
-  * Bump Standards to 3.8.4. No changes needed.
+    - Enable parallel build (pass --paralle option to dh).
+  * Update debian/control:
+    - Bump build dependencies (debhelper and pkg-kde-tools).
+    - Bump Standards to 3.8.4 (no changes needed).
 
  -- Didier Raboud <didier at raboud.com>  Thu, 18 Mar 2010 12:02:18 +0100
 

Modified: kde-extras/gtk-qt-engine/trunk/debian/control
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/control	2010-03-18 11:41:14 UTC (rev 17458)
+++ kde-extras/gtk-qt-engine/trunk/debian/control	2010-03-18 11:55:58 UTC (rev 17459)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Xavier Vello <xavier.vello at gmail.com>, Didier Raboud <didier at raboud.com>
-Build-Depends: debhelper (>= 7.3.12), cmake, pkg-kde-tools (>= 0.5.0),
+Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.4),
  kdelibs5-dev, libgtk2.0-dev
 Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/gtk-qt-engine/

Modified: kde-extras/gtk-qt-engine/trunk/debian/copyright
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/copyright	2010-03-18 11:41:14 UTC (rev 17458)
+++ kde-extras/gtk-qt-engine/trunk/debian/copyright	2010-03-18 11:55:58 UTC (rev 17459)
@@ -35,7 +35,7 @@
 
 The Debian packaging is:
 
-	Copyright (C) 2008-2009 Fathi Boudra <fabo at debian.org>
-	Copyright (C) 2009 Didier Raboud <didier at raboud.com>
+	Copyright (C) 2008-2010 Fathi Boudra <fabo at debian.org>
+	Copyright (C) 2009-2010 Didier Raboud <didier at raboud.com>
 
 and is licensed under the GPL, see above.

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/07_point_to_package.patch
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/07_point_to_package.patch	2010-03-18 11:41:14 UTC (rev 17458)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/07_point_to_package.patch	2010-03-18 11:55:58 UTC (rev 17459)
@@ -2,11 +2,9 @@
 Origin:      vendor
 Author:      Didier Raboud <didier at raboud.com>
 Last-Update: 2009-08-25
-Index: gtk-qt-engine-1.1+svn5/kcm_gtk/kcmgtkwidget.ui
-===================================================================
---- gtk-qt-engine-1.1+svn5.orig/kcm_gtk/kcmgtkwidget.ui	2009-08-25 14:35:26.000000000 +0200
-+++ gtk-qt-engine-1.1+svn5/kcm_gtk/kcmgtkwidget.ui	2009-08-25 14:35:38.000000000 +0200
-@@ -89,6 +89,25 @@
+--- a/kcm_gtk/kcmgtkwidget.ui
++++ b/kcm_gtk/kcmgtkwidget.ui
+@@ -89,6 +89,25 @@ p, li { white-space: pre-wrap; }
         </widget>
        </item>
        <item row="3" column="1" colspan="4" >
@@ -32,7 +30,7 @@
         <widget class="KUrlLabel" name="warning2" >
          <property name="text" >
           <string>Gtk-Qt theme engine homepage</string>
-@@ -104,7 +123,7 @@
+@@ -104,7 +123,7 @@ p, li { white-space: pre-wrap; }
           <string>Change search paths...</string>
          </property>
         </widget>
@@ -41,11 +39,9 @@
        <item row="4" column="3" colspan="2" >
         <spacer>
          <property name="orientation" >
-Index: gtk-qt-engine-1.1+svn5/kcm_gtk/kcmgtk.cpp
-===================================================================
---- gtk-qt-engine-1.1+svn5.orig/kcm_gtk/kcmgtk.cpp	2009-08-25 14:35:37.000000000 +0200
-+++ gtk-qt-engine-1.1+svn5/kcm_gtk/kcmgtk.cpp	2009-08-25 14:35:38.000000000 +0200
-@@ -59,7 +59,7 @@
+--- a/kcm_gtk/kcmgtk.cpp
++++ b/kcm_gtk/kcmgtk.cpp
+@@ -59,7 +59,7 @@ KcmGtk::KcmGtk(QWidget* parent, const QV
  	
  	m_searchPaths = new SearchPaths(this);
  	connect(m_searchPaths, SIGNAL(accepted()), SLOT(getInstalledThemes()));
@@ -54,7 +50,7 @@
  	
  	// Load icons
  	KIconLoader* loader = KIconLoader::global();
-@@ -173,7 +173,7 @@
+@@ -173,7 +173,7 @@ void KcmGtk::getInstalledThemes()
  	m_ui.styleKde->setEnabled(installed);
  	m_ui.warning1->setHidden(installed);
  	m_ui.warning2->setHidden(installed);

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/08_update_translations.patch
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/08_update_translations.patch	2010-03-18 11:41:14 UTC (rev 17458)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/08_update_translations.patch	2010-03-18 11:55:58 UTC (rev 17459)
@@ -2,10 +2,8 @@
 Origin:      vendor
 Author:      Didier Raboud <didier at raboud.com>
 Last-Update: 2009-08-25
-Index: gtk-qt-engine-1.1+svn5/po/fr.po
-===================================================================
---- gtk-qt-engine-1.1+svn5.orig/po/fr.po	2009-08-25 14:49:06.000000000 +0200
-+++ gtk-qt-engine-1.1+svn5/po/fr.po	2009-08-25 14:56:28.000000000 +0200
+--- a/po/fr.po
++++ b/po/fr.po
 @@ -3,15 +3,15 @@
  # This file is distributed under the same license as the PACKAGE package.
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
@@ -25,7 +23,7 @@
  "Language-Team:  <fr at li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
-@@ -19,118 +19,113 @@
+@@ -19,118 +19,113 @@ msgstr ""
  "ch>\n"
  "X-Generator: KBabel 1.9.1\n"
  
@@ -233,7 +231,7 @@
  msgid ""
  "Scrollbar buttons may sometimes be displayed incorrectly in Firefox and "
  "Thunderbird.  This can be fixed by installing some files into your Mozilla "
-@@ -140,20 +135,117 @@
+@@ -140,20 +135,117 @@ msgstr ""
  "affichés dans Firefox et Thunderbird. Cela peut être corrigé par "
  "l'installation de quelques fichiers dans votre profil Mozilla."
  

Modified: kde-extras/gtk-qt-engine/trunk/debian/rules
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/rules	2010-03-18 11:41:14 UTC (rev 17458)
+++ kde-extras/gtk-qt-engine/trunk/debian/rules	2010-03-18 11:55:58 UTC (rev 17459)
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 DEB_KDE_LINK_WITH_AS_NEEDED := yes
 
 PACKAGE := gtk-qt-engine
@@ -10,7 +13,7 @@
 TMPDIR := ../build-area/${PACKAGE}
 
 %:
-	dh --with kde $@
+	dh --parallel --with kde $@
 
 get-orig-source:
 	rm -rf ${TMPDIR} $(TARBALL)

More information about the pkg-kde-commits mailing list