rev 14997 - kde-extras/gtk2-engines-qtcurve/trunk/debian

[Fathi Boudra]

Author: fabo
Date: 2009-06-25 09:34:59 +0000 (Thu, 25 Jun 2009)
New Revision: 14997

Modified:
   kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog
   kde-extras/gtk2-engines-qtcurve/trunk/debian/control
   kde-extras/gtk2-engines-qtcurve/trunk/debian/rules
Log:
- Use uppercase GNOME in description.
- Rewrite to use dh.
- Build with -DQTC_MODIFY_MOZILLA=true for enhanced Firefox integration.


Modified: kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog
===================================================================
--- kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog	2009-06-25 09:19:18 UTC (rev 14996)
+++ kde-extras/gtk2-engines-qtcurve/trunk/debian/changelog	2009-06-25 09:34:59 UTC (rev 14997)
@@ -1,4 +1,4 @@
-gtk2-engines-qtcurve (0.65.0-1) UNRELEASED; urgency=low
+gtk2-engines-qtcurve (0.65.0-1) unstable; urgency=low
 
   * New upstream release.
   * Set KDE Extras team in Maintainer field and myself in Uploaders field.
@@ -7,6 +7,10 @@
   * Update debian/control:
     - Bump Standard-Version to 3.8.2 (no changes needed).
     - Add Vcs-Browser and Vcs-Svn fields.
+    - Use uppercase GNOME in description.
+  * Update debian/rules:
+    - Rewrite to use dh.
+    - Build with -DQTC_MODIFY_MOZILLA=true for enhanced Firefox integration.
 
  -- Fathi Boudra <fabo at debian.org>  Thu, 25 Jun 2009 10:29:52 +0200
 

Modified: kde-extras/gtk2-engines-qtcurve/trunk/debian/control
===================================================================
--- kde-extras/gtk2-engines-qtcurve/trunk/debian/control	2009-06-25 09:19:18 UTC (rev 14996)
+++ kde-extras/gtk2-engines-qtcurve/trunk/debian/control	2009-06-25 09:34:59 UTC (rev 14997)
@@ -15,6 +15,6 @@
 Recommends: kde-style-qtcurve
 Description: This is a set of widget styles for Gtk2 based apps
  This package together with kde-style-qtcurve aim to provide a unified look
- and feel on the desktop when using KDE and Gnome applications.
+ and feel on the desktop when using KDE and GNOME applications.
  .
  This package is most useful when installed together with kde-style-qtcurve.

Modified: kde-extras/gtk2-engines-qtcurve/trunk/debian/rules
===================================================================
--- kde-extras/gtk2-engines-qtcurve/trunk/debian/rules	2009-06-25 09:19:18 UTC (rev 14996)
+++ kde-extras/gtk2-engines-qtcurve/trunk/debian/rules	2009-06-25 09:34:59 UTC (rev 14997)
@@ -1,106 +1,24 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@
 
+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 \
+		-DQTC_MODIFY_MOZILLA=true
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_auto_build:
+	$(MAKE) -C builddir
 
+override_dh_auto_clean:
+	rm -rf builddir
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: CMakeLists.txt config.h.cmake
-	dh_testdir
-	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	cmake .
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/gtk2-engines-qtcurve.sgml > gtk2-engines-qtcurve.1
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/gtk2-engines-qtcurve.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/gtk2-engines-qtcurve install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_auto_install:
+	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/gtk2-engines-qtcurve install