[Python-apps-commits] r2144 - in packages/wicd/trunk/debian (5 files)

[bzed at users.alioth.debian.org]

    Date: Friday, January 2, 2009 @ 16:47:20
  Author: bzed
Revision: 2144

* debian/default added.
  - call setup.py configure and install with appropriate options, so the
    modules are installed in the private module directory properly
    (Closes: #510462).
* debian/patches/04-fix-scripts.patch:
  - set PYTHONPATH while executing script so Python will find them
    in the private directory (Closes: #510308)

Added:
  packages/wicd/trunk/debian/patches/04-fix-scripts.patch
Modified:
  packages/wicd/trunk/debian/changelog
  packages/wicd/trunk/debian/patches/series
  packages/wicd/trunk/debian/rules
Deleted:
  packages/wicd/trunk/debian/patches/00-fix_installation.patch

Modified: packages/wicd/trunk/debian/changelog
===================================================================
--- packages/wicd/trunk/debian/changelog	2009-01-02 16:15:19 UTC (rev 2143)
+++ packages/wicd/trunk/debian/changelog	2009-01-02 16:47:20 UTC (rev 2144)
@@ -4,18 +4,13 @@
   * debian/rules:
     - passing --lib to configure, moving files in /usr/share/wicd
       (Closes: #510461)
-    - removing /usr/lib/python2.5/*, they're private modules
-      (Closes: #510462)
     - also removing other/55wicd in clean target
     - chmod -x files in /usr/share/wicd/
     - binary-arch target emptied, not using it
   * debian/{pre,post}rm removed:
     - fix double-{starting,stopping} of wicd, which stopped the daemon 
       from really starting
-  * debian/patches/:
-    - 00-fix_installation.patch added, some files were not being
-      installed (Closes: #510308)
-  * debian/default added:
+  * debian/default added.
   * debian/init updated:
     - allow to disable the daemon in /etc/default/wicd.
 
@@ -23,6 +18,12 @@
   * debian/rules:
     - run dh_pysupport before dh_installinit, so Python modules will be
       compiled before the daemon starts (Closes: #510457)
+    - call setup.py configure and install with appropriate options, so the
+      modules are installed in the private module directory properly
+      (Closes: #510462).
+  * debian/patches/04-fix-scripts.patch:
+    - set PYTHONPATH while executing script so Python will find them
+      in the private directory (Closes: #510308)
 
  -- David Paleino <d.paleino at gmail.com>  Fri, 02 Jan 2009 15:01:28 +0100
 

Deleted: packages/wicd/trunk/debian/patches/00-fix_installation.patch
===================================================================
--- packages/wicd/trunk/debian/patches/00-fix_installation.patch	2009-01-02 16:15:19 UTC (rev 2143)
+++ packages/wicd/trunk/debian/patches/00-fix_installation.patch	2009-01-02 16:47:20 UTC (rev 2144)
@@ -1,12 +0,0 @@
-Broken upstream installation, missing files added.
---- wicd-1.5.7.orig/setup.py
-+++ wicd-1.5.7/setup.py
-@@ -302,7 +302,7 @@
-     (wpath.bin, ['scripts/wicd-client', ]), 
-     (wpath.sbin,  ['scripts/wicd', ]),  
-     (wpath.share, ['data/wicd.glade', ]),
--    (wpath.lib, ['wicd/wicd-client.py', 'wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/configscript.py', 'wicd/suspend.py', 'wicd/autoconnect.py']), #'wicd/wicd-gui.py', 
-+    (wpath.lib, ['wicd/wicd-client.py', 'wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/configscript.py', 'wicd/suspend.py', 'wicd/autoconnect.py', 'wicd/gui.py', 'wicd/misc.py', 'wicd/networking.py', 'wpath.py']),
-     (wpath.autostart, ['other/wicd-tray.desktop', ]),
-     ]
-     piddir = os.path.dirname(wpath.pidfile)

Added: packages/wicd/trunk/debian/patches/04-fix-scripts.patch
===================================================================
--- packages/wicd/trunk/debian/patches/04-fix-scripts.patch	                        (rev 0)
+++ packages/wicd/trunk/debian/patches/04-fix-scripts.patch	2009-01-02 16:47:20 UTC (rev 2144)
@@ -0,0 +1,20 @@
+--- a/in/scripts=wicd-client.in
++++ b/in/scripts=wicd-client.in
+@@ -1,2 +1,6 @@
+ #!/bin/bash
+-exec python -O %LIB%wicd-client.py $@
++
++PYTHONPATH=%LIB%
++export PYTHONPATH
++
++exec python %LIB%wicd-client.py $@
+--- a/in/scripts=wicd.in
++++ b/in/scripts=wicd.in
+@@ -1,3 +1,6 @@
+ #!/bin/bash
+ 
+-exec python -O %LIB%wicd-daemon.py $@
++PYTHONPATH=%LIB%
++export PYTHONPATH
++
++exec python %LIB%wicd-daemon.py $@

Modified: packages/wicd/trunk/debian/patches/series
===================================================================
--- packages/wicd/trunk/debian/patches/series	2009-01-02 16:15:19 UTC (rev 2143)
+++ packages/wicd/trunk/debian/patches/series	2009-01-02 16:47:20 UTC (rev 2144)
@@ -1,4 +1,4 @@
-00-fix_installation.patch
+04-fix-scripts.patch
 01-fix_desktop_file.patch
 02-fix_logfile_perms.patch
 03-fix_lintian_manpage_warning.patch

Modified: packages/wicd/trunk/debian/rules
===================================================================
--- packages/wicd/trunk/debian/rules	2009-01-02 16:15:19 UTC (rev 2143)
+++ packages/wicd/trunk/debian/rules	2009-01-02 16:47:20 UTC (rev 2144)
@@ -9,7 +9,7 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh build --before dh_auto_configure
-	python setup.py configure --no-install-docs --lib=/usr/share/wicd
+	python setup.py configure --no-install-docs --lib=/usr/share/wicd --share=/usr/share/wicd
 	python setup.py build
 	dh build --after dh_auto_build
 	touch $@
@@ -29,7 +29,7 @@
 
 install: build
 	dh install --before dh_auto_install
-	python setup.py install --root=$(CURDIR)/debian/wicd
+	python setup.py install --root=$(CURDIR)/debian/wicd --install-lib=/usr/share/wicd 
 	install -m644 debian/wicd-client.xpm \
 		$(CURDIR)/debian/wicd/usr/share/pixmaps/wicd.xpm
 	
@@ -37,7 +37,6 @@
 	find $(CURDIR)/debian/wicd/etc/wicd/ -type f -exec chmod 644 {} \;
 	find $(CURDIR)/debian/wicd \( -name "*.glade" -o -name "*.conf" -o -name "*.desktop" \) -exec chmod 644 {} \;
 	find $(CURDIR)/debian/wicd/usr/share/wicd/ -type f -exec chmod 644 {} \;
-	rm -rf $(CURDIR)/debian/wicd/usr/lib/python*/
 	dh install --after dh_auto_install --before dh_installinit
 	dh_pysupport -i
 	dh_installinit -i