r11628 - in /desktop/experimental/gtk2-engines/debian: changelog gtk2-engines-udeb.install gtk2-engines-udeb.install.disabled gtk2-engines.install gtk2-engines.install.disabled rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Jun 19 12:11:24 2007
New Revision: 11628

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11628
Log:
* Stylistic cleanups to the way stuff gets dh_installed in gtk2-engines and
  the udeb.

Added:
    desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install
      - copied, changed from r11624, desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install.disabled
    desktop/experimental/gtk2-engines/debian/gtk2-engines.install
      - copied, changed from r11624, desktop/experimental/gtk2-engines/debian/gtk2-engines.install.disabled
Removed:
    desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install.disabled
    desktop/experimental/gtk2-engines/debian/gtk2-engines.install.disabled
Modified:
    desktop/experimental/gtk2-engines/debian/changelog
    desktop/experimental/gtk2-engines/debian/rules

Modified: desktop/experimental/gtk2-engines/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/changelog?rev=11628&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/changelog (original)
+++ desktop/experimental/gtk2-engines/debian/changelog Tue Jun 19 12:11:24 2007
@@ -1,3 +1,10 @@
+gtk2-engines (1:2.11.2-2) UNRELEASED; urgency=low
+
+  * Stylistic cleanups to the way stuff gets dh_installed in gtk2-engines and
+    the udeb.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 19 Jun 2007 14:00:54 +0200
+
 gtk2-engines (1:2.11.2-1) experimental; urgency=low
 
   * New upstream development release.

Copied: desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install (from r11624, desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install.disabled)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install?rev=11628&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install.disabled (original)
+++ desktop/experimental/gtk2-engines/debian/gtk2-engines-udeb.install Tue Jun 19 12:11:24 2007
@@ -1,3 +1,3 @@
 # from the directfb flavor
-/usr/lib/gtk-2.0/*/engines/libclearlooks.so
-/usr/lib/gtk-2.0/*/engines/libhcengine.so
+usr/lib/gtk-2.0/*/engines/libclearlooks.so
+usr/lib/gtk-2.0/*/engines/libhcengine.so

Copied: desktop/experimental/gtk2-engines/debian/gtk2-engines.install (from r11624, desktop/experimental/gtk2-engines/debian/gtk2-engines.install.disabled)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/gtk2-engines.install?rev=11628&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/gtk2-engines.install.disabled (original)
+++ desktop/experimental/gtk2-engines/debian/gtk2-engines.install Tue Jun 19 12:11:24 2007
@@ -1,5 +1,5 @@
 # from the x11 flavor
-/usr/lib/gtk-2.0/*/engines/*.so
-/usr/share/gtk-engines
-/usr/share/locale
-/usr/share/themes/*/gtk-2.0
+usr/lib/gtk-2.0/*/engines/*.so
+usr/share/gtk-engines
+usr/share/locale
+usr/share/themes/*/gtk-2.0

Modified: desktop/experimental/gtk2-engines/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk2-engines/debian/rules?rev=11628&op=diff
==============================================================================
--- desktop/experimental/gtk2-engines/debian/rules (original)
+++ desktop/experimental/gtk2-engines/debian/rules Tue Jun 19 12:11:24 2007
@@ -1,11 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_BUILDDIR := debian/build/x11
-DEB_BUILDDIR_gtk2-engines-udeb := debian/build/directfb
-
-# see cdbs #424636
-clean::
-	rm -rf $(DEB_BUILDDIR) $(DEB_BUILDDIR_gtk2-engines-udeb)
+buildbasedir := $(CURDIR)/debian/build
+DEB_BUILDDIR := $(buildbasedir)/x11
+DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/directfb
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -17,8 +14,10 @@
 
 GNOME_MODULE := gtk-engines
 
-DEB_DESTDIR := $(CURDIR)/debian/tmp/install/x11/
-DEB_DESTDIR_gtk2-engines-udeb := $(CURDIR)/debian/tmp/install/directfb/
+DEB_DESTDIR := $(CURDIR)/debian/tmp/x11
+DEB_DESTDIR_gtk2-engines-udeb := $(CURDIR)/debian/tmp/directfb
+
+DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring gtk2-engines-udeb,$(cdbs_curpkg)),$(DEB_DESTDIR_gtk2-engines-udeb),$(DEB_DESTDIR))
 
 # don't run dh_makeshlibs (we don't need shlibs for Gtk modules)
 DEB_DH_MAKESHLIBS_ARGS_ALL += -n
@@ -53,15 +52,15 @@
 	make -C $(DEB_BUILDDIR_gtk2-engines-udeb) install DESTDIR=$(DEB_DESTDIR_gtk2-engines-udeb)
 
 binary-install/gtk2-engines::
-	cp debian/gtk2-engines.install.disabled debian/gtk2-engines.install
 	dh_install -pgtk2-engines --sourcedir=$(DEB_DESTDIR)
-	rm -f debian/gtk2-engines.install
 	dh_gtkmodules -pgtk2-engines
 
 binary-install/gtk2-engines-udeb::
-	cp debian/gtk2-engines-udeb.install.disabled debian/gtk2-engines-udeb.install
 	dh_install -pgtk2-engines-udeb --sourcedir=$(DEB_DESTDIR_gtk2-engines-udeb)
-	rm -f debian/gtk2-engines-udeb.install
 	# remove the rpath
 	chrpath -d debian/gtk2-engines-udeb/usr/lib/gtk-2.0/*/engines/*.so
 	dh_gtkmodules -pgtk2-engines-udeb
+
+clean::
+	rm -rf $(buildbasedir)
+