rev 16075 - in kde-extras: gtk2-engines-qtcurve/trunk/debian kde-style-qtcurve/trunk/debian kde-style-qtcurve/trunk/debian/patches

[Fathi Boudra]

Author: fabo
Date: 2009-10-07 12:46:33 +0000 (Wed, 07 Oct 2009)
New Revision: 16075

Modified:
   kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog
   kde-extras/gtk2-engines-qtcurve/trunk/debian/control
   kde-extras/kde-style-qtcurve/trunk/debian/changelog
   kde-extras/kde-style-qtcurve/trunk/debian/control
   kde-extras/kde-style-qtcurve/trunk/debian/patches/01_ftbfs_missing_terminating_characher_bug541667.diff
   kde-extras/kde-style-qtcurve/trunk/debian/rules
Log:
Update QtCurve packages - new upstream release 0.68.1


Modified: kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog
===================================================================
--- kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog	2009-10-06 22:29:02 UTC (rev 16074)
+++ kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog	2009-10-07 12:46:33 UTC (rev 16075)
@@ -1,3 +1,11 @@
+gtk2-engines-qtcurve (0.68.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update debian/control:
+    - Bump Standard-Version to 3.8.3 (no changes needed).
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 07 Oct 2009 14:06:28 +0200
+
 gtk2-engines-qtcurve (0.67.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/gtk2-engines-qtcurve/trunk/debian/control
===================================================================
--- kde-extras/gtk2-engines-qtcurve/trunk/debian/control	2009-10-06 22:29:02 UTC (rev 16074)
+++ kde-extras/gtk2-engines-qtcurve/trunk/debian/control	2009-10-07 12:46:33 UTC (rev 16075)
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 7.3.12), cmake, libgtk2.0-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.kde-look.org/content/show.php?content=40492
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/gtk2-engines-qtcurve/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/gtk2-engines-qtcurve/?op=log

Modified: kde-extras/kde-style-qtcurve/trunk/debian/changelog
===================================================================
--- kde-extras/kde-style-qtcurve/trunk/debian/changelog	2009-10-06 22:29:02 UTC (rev 16074)
+++ kde-extras/kde-style-qtcurve/trunk/debian/changelog	2009-10-07 12:46:33 UTC (rev 16075)
@@ -1,3 +1,10 @@
+kde-style-qtcurve (0.68.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Cleanup debian/rules: dh supports kde.
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 07 Oct 2009 14:22:16 +0200
+
 kde-style-qtcurve (0.67.5-2) unstable; urgency=low
 
   * Add 01_ftbfs_missing_terminating_characher_bug541667.diff

Modified: kde-extras/kde-style-qtcurve/trunk/debian/control
===================================================================
--- kde-extras/kde-style-qtcurve/trunk/debian/control	2009-10-06 22:29:02 UTC (rev 16074)
+++ kde-extras/kde-style-qtcurve/trunk/debian/control	2009-10-07 12:46:33 UTC (rev 16075)
@@ -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>
-Build-Depends: debhelper (>= 7.3.12), quilt (>= 0.46-7), cmake, pkg-kde-tools (>= 0.4.11),
+Build-Depends: debhelper (>= 7.4), quilt (>= 0.46-7), cmake, pkg-kde-tools (>= 0.5),
  kdelibs5-dev (>= 4:4.3.0), kdebase-workspace-dev(>= 4:4.3.0), libx11-dev
 Standards-Version: 3.8.3
 Homepage: http://www.kde-look.org/content/show.php?content=40492

Modified: kde-extras/kde-style-qtcurve/trunk/debian/patches/01_ftbfs_missing_terminating_characher_bug541667.diff
===================================================================
--- kde-extras/kde-style-qtcurve/trunk/debian/patches/01_ftbfs_missing_terminating_characher_bug541667.diff	2009-10-06 22:29:02 UTC (rev 16074)
+++ kde-extras/kde-style-qtcurve/trunk/debian/patches/01_ftbfs_missing_terminating_characher_bug541667.diff	2009-10-07 12:46:33 UTC (rev 16075)
@@ -4,25 +4,14 @@
 see Debian bug #541667
 http://bugs.debian.org/541667
 
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -1,12 +1,14 @@
-+/* config.h. Generated by cmake from config.h.cmake */
-+
- #ifndef __CONFIG_H__
- #define __CONFIG_H__
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,7 +73,7 @@ if (NOT QTC_QT_ONLY)
+ endif (NOT QTC_QT_ONLY)
+ find_package(Qt4 REQUIRED)
  
- #define VERSION "@QTCURVE_VERSION_FULL@"
--#define KDE3PREFIX        "@KDE3PREFIX@"
--#define KDE4PREFIX        "@KDE4PREFIX@"
-+#define KDE3PREFIX "${KDE3PREFIX}"
-+#define KDE4PREFIX "${KDE4PREFIX}"
+-configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
++configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h @ONLY)
  
--#cmakedefine QTC_DISABLE_KDEFILEDIALOG_CALLS
--#cmakedefine QTC_XBAR_SUPPORT
--#cmakedefine QTC_QT_ONLY
-+#cmakedefine QTC_DISABLE_KDEFILEDIALOG_CALLS 1
-+#cmakedefine QTC_XBAR_SUPPORT 1
-+#cmakedefine QTC_QT_ONLY 1
- 
- #endif
+ if (NOT QTC_QT_ONLY)
+     find_package(KDE4 REQUIRED)

Modified: kde-extras/kde-style-qtcurve/trunk/debian/rules
===================================================================
--- kde-extras/kde-style-qtcurve/trunk/debian/rules	2009-10-06 22:29:02 UTC (rev 16074)
+++ kde-extras/kde-style-qtcurve/trunk/debian/rules	2009-10-07 12:46:33 UTC (rev 16075)
@@ -2,10 +2,8 @@
 
 DEB_KDE_LINK_WITH_AS_NEEDED := yes
 
-include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
-
 %:
-	dh --with quilt $@
+	dh --with quilt,kde $@
 
 get-orig-source:
 	uscan --verbose --force-download --no-symlink