Merge lp:~xnox/oneconf/scripts-and-shebangs into lp:oneconf

[Dimitri John Ledkov]

[Didier Roche-Tolomelli (didrocks)]

Hey Dmitrijs!

It seems that Barry didn't get 0.3.3 merged into trunk, do you mind bundling that or coordinate with him?http://launchpadlibrarian.net/129243831/oneconf_0.3.2_0.3.3.diff.gz

Thanks :)

[Didier Roche-Tolomelli (didrocks)]

setting as WIP meanwhile :)

review: Needs Fixing

Unmerged revisions

270. By Dimitri John Ledkov on 2013-01-23

* debian/rules: skip installing python2 scripts.
* debian/rules: build with python3 first to get correct shebang.
* setup.py: revert 0.3.2 changes.

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-22 19:02:50 +0000
+++ debian/changelog	2013-01-23 19:37:22 +0000
@@ -1,3 +1,11 @@
+oneconf (0.3.3) UNRELEASED; urgency=low
+
+  * debian/rules: skip installing python2 scripts.
+  * debian/rules: build with python3 first to get correct shebang.
+  * setup.py: revert 0.3.2 changes.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 23 Jan 2013 19:28:42 +0000
+
 oneconf (0.3.2) raring; urgency=low
 
   * setup.py: Only install the command line scripts for Python 3.
 
=== modified file 'debian/rules'
--- debian/rules	2013-01-16 03:04:46 +0000
+++ debian/rules	2013-01-23 19:37:22 +0000
@@ -7,7 +7,7 @@
 export http_proxy = http://127.0.9.1:9
 
 PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+PYTHON3=3 $(shell py3versions -vr)
 
 %:
 	dh $@ --with python2,python3
@@ -36,7 +36,7 @@
 	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 
 override_dh_auto_install: $(PYTHON3:%=install-python%)
-	dh_auto_install
+	dh_auto_install -- --install-scripts skip && rm -rf debian/tmp/skip
 	# Move the scripts to $(SHARE) and relink some again later.  The
 	# scripts will be included in the "oneconf" binary package
 	mkdir -p debian/oneconf/$(share)
 
=== modified file 'setup.py'
--- setup.py	2013-01-22 19:02:50 +0000
+++ setup.py	2013-01-23 19:37:22 +0000
@@ -42,15 +42,12 @@
 Exec=%s
 """ % oneconf_service_path)
 
-# The scripts only work with Python 3.
-if sys.version_info[0] == 3:
-    scripts = ['oneconf-query', 'oneconf-service', 'misc/oneconf-update']
-else:
-    scripts = []
-
 # real setup
 setup(name="oneconf", version=VERSION,
-      scripts=scripts,
+      scripts=["oneconf-query",
+               "oneconf-service",
+               "misc/oneconf-update",
+               ],
       packages = ['oneconf',
                   'oneconf.distributor',
                   'oneconf.networksync',