rev 12816 - branches/kde4/packages/kdebindings/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2008-12-02 21:38:57 +0000 (Tue, 02 Dec 2008)
New Revision: 12816

Modified:
   branches/kde4/packages/kdebindings/debian/changelog
   branches/kde4/packages/kdebindings/debian/rules
Log:
Better handling of packages just built on some archs. hopefully fixes the
build failure on non-mono archs.

Modified: branches/kde4/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4/packages/kdebindings/debian/changelog	2008-12-02 16:02:22 UTC (rev 12815)
+++ branches/kde4/packages/kdebindings/debian/changelog	2008-12-02 21:38:57 UTC (rev 12816)
@@ -18,6 +18,8 @@
   [ Sune Vuorela ]
   * Merge in changes from ubuntu, mostly typofixes in important files. Shame
     on me. Thanks Riddell.
+  * Better handling of packages just built on some archs. hopefully fixes the
+    build failure on non-mono archs.
 
  -- Sune Vuorela <debian at pusling.com>  Sun, 30 Nov 2008 23:41:36 +0100
 

Modified: branches/kde4/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4/packages/kdebindings/debian/rules	2008-12-02 16:02:22 UTC (rev 12815)
+++ branches/kde4/packages/kdebindings/debian/rules	2008-12-02 21:38:57 UTC (rev 12816)
@@ -132,12 +132,15 @@
 $(patsubst %,install-python-%,$(pyversions)): install-pre
 	$(MAKE) -C $(objdir)/python/pykde4-$(subst install-python-,,$@) install DESTDIR=$(CURDIR)/debian/tmp; \
 
-install-generic:
+install-generic: $(patsubst %,install-python-%,$(pyversions))
 	$(MAKE) -C $(objdir) install DESTDIR=$(CURDIR)/debian/tmp
 
-install: dh_install $(MONOTARGET)
+install: $(MONOTARGET) install-generic
+	rmdir debian/tmp/usr/share/doc/kde4/HTML/en/pykde4/creative\ commons_files/
+	install -D -m 755 debian/tmp/usr/share/kde4/apps/pykde4/pykdeuic4.py \
+	    debian/python-kde4-dev/usr/bin/pykdeuic4
 
-monospecific:
+monospecific: install-generic install-pre 
 	#khtml
 	install -d debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0
 	install -D -m 644 $(DEST_USR_LIB)/mono/2.0/khtml.dll debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
@@ -185,21 +188,18 @@
 	dh_clideps -l debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/:debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/:debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
 	dh_clistrip
 
-dh_install: $(patsubst %,install-python-%,$(pyversions)) install-generic
 	
-	rmdir debian/tmp/usr/share/doc/kde4/HTML/en/pykde4/creative\ commons_files/
-	dh_install --sourcedir=debian/tmp
-	install -D -m 755 debian/tmp/usr/share/kde4/apps/pykde4/pykdeuic4.py \
-	    debian/python-kde4-dev/usr/bin/pykdeuic4
 
 ##
 
 binary: binary-arch binary-indep
 
 binary-arch: build install
+	dh_install -s --sourcedir=debian/tmp
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary-indep: build install
+	dh_install -i --sourcedir=debian/tmp
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 binary-common: