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

Fathi Boudra fabo at alioth.debian.org
Thu Jun 25 08:02:59 UTC 2009 

Author: fabo
Date: 2009-06-25 08:02:56 +0000 (Thu, 25 Jun 2009)
New Revision: 14991

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/01_fix_out_of_source_build.diff
   kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff
   kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff
   kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff
   kde-extras/gtk-qt-engine/trunk/debian/rules
Log:
* Bump Standard-Version to 3.8.2 (no changes needed).
* Update debian/control: drop cdbs build dependency.
* Update debian/copyright: update upstream url.


Modified: kde-extras/gtk-qt-engine/trunk/debian/changelog
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/changelog	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/changelog	2009-06-25 08:02:56 UTC (rev 14991)
@@ -1,22 +1,31 @@
-gtk-qt-engine (1:1.1+svn5-1) UNRELEASED; urgency=low
+gtk-qt-engine (1:1.1+svn5-1) unstable; urgency=low
 
-  * New svn repository un code.google.com
+  * New svn repository (http://code.google.com/p/gtk-qt-engine)
     - Update upstream package to revision 5
       "Updated Norwegian Nynorsk translation by Karl Ove Hufthammer"
+
+  [ Didier Raboud ]
+
   * Change source and binary name to gtk-qt-engine.
     - Bump epoch to 1 due to previous gtk-qt-engine being 1:0.8.
       (Closes: 480696)
     - Use the actual repository revision.
-  * debian/control
+  * Update debian/control:
     - Add myself to Uploaders field.
     - Add Vcs-{Svn,Browser} fields.
-  * Refactorize debian/rules
-    - Remove the custom debian/cdbs directory
-    - Add get-orig-source target
-  * Add 04_no_kde4_in_configfile.diff (Closes: 527340)
+  * Refactorize debian/rules:
+    - Remove the custom debian/cdbs directory.
+    - Add get-orig-source target.
+  * Add 04_no_kde4_in_configfile.diff patch (Closes: 527340).
 
- -- Didier Raboud <didier at raboud.com>  Thu, 14 May 2009 13:35:53 +0200
+  [ Fathi Boudra ]
 
+  * Bump Standard-Version to 3.8.2 (no changes needed).
+  * Update debian/control: drop cdbs build dependency.
+  * Update debian/copyright: update upstream url.
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 25 Jun 2009 09:35:02 +0200
+
 gtk-qt-engine-kde4 (1.1+svn145-2) unstable; urgency=low
 
   * Upload to Sid.

Modified: kde-extras/gtk-qt-engine/trunk/debian/control
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/control	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/control	2009-06-25 08:02:56 UTC (rev 14991)
@@ -3,9 +3,9 @@
 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: cdbs, debhelper (>= 7), cmake, quilt,
+Build-Depends: debhelper (>= 7), cmake, quilt,
  kdelibs5-dev, libgtk2.0-dev, libbonoboui2-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://code.google.com/p/gtk-qt-engine/
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/gtk-qt-engine/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/gtk-qt-engine/?op=log
@@ -13,8 +13,8 @@
 Package: gtk-qt-engine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: gtk-qt-engine-kde4
 Replaces: gtk-qt-engine-kde4
-Conflicts: gtk-qt-engine-kde4
 Description: theme engine using Qt 4 for GTK+ 2.x
  The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK+ 2 theme engine
  that calls Qt 4 to do the actual drawing. This makes your GTK+ 2 applications

Modified: kde-extras/gtk-qt-engine/trunk/debian/copyright
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/copyright	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/copyright	2009-06-25 08:02:56 UTC (rev 14991)
@@ -1,11 +1,11 @@
 This package was debianized by Fathi Boudra <fabo at debian.org> on
 Thu, 01 May 2008 12:47:20 +0200.
 
-It was downloaded from http://gtk-qt.ecs.soton.ac.uk/
+It was downloaded from http://code.google.com/p/gtk-qt-engine/
 
 Upstream Author: David Sansome <me at davidsansome.com>
 
-Copyright: © 2008 David Sansome <me at davidsansome.com>
+Copyright: © 2008-2009 David Sansome <me at davidsansome.com>
 
 License:
 

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/01_fix_out_of_source_build.diff	2009-06-25 08:02:56 UTC (rev 14991)
@@ -1,6 +1,6 @@
 --- a/kcm_gtk/CMakeLists.txt
 +++ b/kcm_gtk/CMakeLists.txt
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ KDE4_ADD_UI_FILES(kcm_gtk4_SOURCES ${kcm
  
  KDE4_ADD_PLUGIN(kcm_gtk4 ${kcm_gtk4_SOURCES})
  

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/02_change_desktop_file_installation.diff	2009-06-25 08:02:56 UTC (rev 14991)
@@ -1,6 +1,6 @@
 --- a/kcm_gtk/CMakeLists.txt
 +++ b/kcm_gtk/CMakeLists.txt
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ INSTALL(
  
  INSTALL(
  	FILES kcmgtk4.desktop

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/03_disable_engine_with_nspluginviewer.diff	2009-06-25 08:02:56 UTC (rev 14991)
@@ -1,6 +1,6 @@
 --- a/src/engine.cpp
 +++ b/src/engine.cpp
-@@ -110,7 +110,8 @@
+@@ -110,7 +110,8 @@ Engine::Engine()
  	    commandLine.contains("metacity") ||
  	    commandLine.contains("xfwm4") ||
  	    commandLine.contains("gnome-settings-daemon") ||

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff	2009-06-25 08:02:56 UTC (rev 14991)
@@ -1,7 +1,5 @@
-Index: gtk-qt-engine-1.1+svn5.orig/kcm_gtk/kcmgtk.cpp
-===================================================================
---- gtk-qt-engine-1.1+svn5.orig.orig/kcm_gtk/kcmgtk.cpp	2009-05-14 15:47:12.000000000 +0200
-+++ gtk-qt-engine-1.1+svn5.orig/kcm_gtk/kcmgtk.cpp	2009-05-14 15:47:39.000000000 +0200
+--- a/kcm_gtk/kcmgtk.cpp
++++ b/kcm_gtk/kcmgtk.cpp
 @@ -37,7 +37,7 @@
  #include <sys/stat.h>
  
@@ -11,7 +9,7 @@
  const QString KcmGtk::k_envFileName(KGlobal::dirs()->localkdedir() + "/env/gtk-qt-engine.rc.sh");
  const QString KcmGtk::k_qtThemeName("Qt4");
  
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ void KcmGtk::updateFontPreview()
  
  void KcmGtk::save()
  {

Modified: kde-extras/gtk-qt-engine/trunk/debian/rules
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/rules	2009-06-24 23:55:56 UTC (rev 14990)
+++ kde-extras/gtk-qt-engine/trunk/debian/rules	2009-06-25 08:02:56 UTC (rev 14991)
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/cmake.mk
+DEB_KDE_LINK_WITH_AS_NEEDED := yes
 
+include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+
 PACKAGE = gtk-qt-engine
 SVN_REPOS = http://gtk-qt-engine.googlecode.com/svn/trunk/gtk-qt-engine/
 SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
@@ -11,6 +11,30 @@
 TARBALL = ../tarballs/$(PACKAGE)_$(SRC_VERSION).orig.tar.gz
 
 TMPDIR = ../build-area/${PACKAGE}
+
+%:
+	dh --with quilt $@
+
+override_dh_auto_configure:
+	mkdir builddir
+	cd builddir && cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_C_FLAGS="$(CFLAGS)" \
+		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		$(DEB_CMAKE_KDE4_FLAGS)
+
+override_dh_auto_build:
+	$(MAKE) -C builddir
+
+override_dh_auto_clean:
+	rm -rf builddir
+
+override_dh_auto_install:
+	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/gtk-qt-engine install
+
 get-orig-source:
 	rm -rf ${TMPDIR} $(TARBALL)
 	mkdir ${TMPDIR}

More information about the pkg-kde-commits mailing list