[Python-modules-commits] r4908 - in packages/pyro/trunk/debian (4 files)

[morph-guest at users.alioth.debian.org]

    Date: Sunday, March 23, 2008 @ 11:51:24
  Author: morph-guest
Revision: 4908

dh_install + .install files revisited

Modified:
  packages/pyro/trunk/debian/changelog
  packages/pyro/trunk/debian/pyro-gui.install
  packages/pyro/trunk/debian/pyro.install
  packages/pyro/trunk/debian/rules

Modified: packages/pyro/trunk/debian/changelog
===================================================================
--- packages/pyro/trunk/debian/changelog	2008-03-23 06:20:53 UTC (rev 4907)
+++ packages/pyro/trunk/debian/changelog	2008-03-23 11:51:24 UTC (rev 4908)
@@ -20,12 +20,14 @@
     - updated section
     - removed empty tailing lines
   * debian/pyro-gui.install
-    - updated due to new python-central directories structure
+    - removed python-central directory (moved to debian/rules)
   * debian/pyro.install
-    - updated due to new python-central directories structure
+    - removed python-central directory (moved to debian/rules)
   * debian/rules
     - updated due to new python-central directories structure (Closes:
       #472039)
+    - integrate files under python-central directory into dh_install call
+    - moved dh_install calls to install target
 
  -- Bernd Zeimetz <bzed at debian.org>  Sun, 02 Mar 2008 22:22:16 +0100
 

Modified: packages/pyro/trunk/debian/pyro-gui.install
===================================================================
--- packages/pyro/trunk/debian/pyro-gui.install	2008-03-23 06:20:53 UTC (rev 4907)
+++ packages/pyro/trunk/debian/pyro-gui.install	2008-03-23 11:51:24 UTC (rev 4908)
@@ -1,4 +1,2 @@
 usr/bin/pyro-wxnsc
 usr/bin/pyro-xnsc
-usr/share/pyshared/Pyro/xnsc.py
-usr/share/pyshared/Pyro/wxnsc.py

Modified: packages/pyro/trunk/debian/pyro.install
===================================================================
--- packages/pyro/trunk/debian/pyro.install	2008-03-23 06:20:53 UTC (rev 4907)
+++ packages/pyro/trunk/debian/pyro.install	2008-03-23 11:51:24 UTC (rev 4908)
@@ -1,4 +1,3 @@
-usr/share/pyshared
 usr/bin/pyro-es
 usr/bin/pyro-genguid
 usr/bin/pyro-ns

Modified: packages/pyro/trunk/debian/rules
===================================================================
--- packages/pyro/trunk/debian/rules	2008-03-23 06:20:53 UTC (rev 4907)
+++ packages/pyro/trunk/debian/rules	2008-03-23 11:51:24 UTC (rev 4908)
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-
 # This debian/rules file is based on a
 # sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
@@ -7,7 +6,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 include /usr/share/dpatch/dpatch.make
 
 PYTHON = /usr/bin/python
@@ -19,7 +17,6 @@
 	$(XP) -o $@ $(DB2MAN) $< 
 
 build: build-stamp
-
 build-stamp: patch-stamp debian/pyro-gui.1
 	dh_testdir
 	[ -r setup.cfg.upstream ] || cp setup.cfg setup.cfg.upstream
@@ -52,16 +49,17 @@
 		--install-scripts /usr/bin
 	# Move what belongs to pyro-gui
 	install -d debian/tmp/`pycentral pycentraldir pyro-gui`/Pyro
+	dh_install --sourcedir=debian/tmp -ppyro $(shell pycentral pycentraldir pyro) -Xwxnsc.py -Xxnsc.py
+	dh_install --sourcedir=debian/tmp -ppyro-gui $(shell pycentral pycentraldir pyro)/Pyro/xnsc.py
+	dh_install --sourcedir=debian/tmp -ppyro-gui $(shell pycentral pycentraldir pyro)/Pyro/wxnsc.py
+	dh_install -ppyro-examples
+	dh_install -ppyro-doc -X docs/LICENSE docs/* usr/share/doc/pyro/html
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-	dh_install --sourcedir=debian/tmp -ppyro -Xwxnsc.py -Xxnsc.py
-	dh_install --sourcedir=debian/tmp -ppyro-gui
-	dh_install -ppyro-examples
-	dh_install -ppyro-doc -X docs/LICENSE docs/* usr/share/doc/pyro/html
 	dh_installdocs
 	dh_installman -ppyro debian/pyro.1
 	dh_installman -ppyro-gui debian/pyro-gui.1