[Python-apps-commits] r5231 - in packages/openstv/trunk/debian (7 files)

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

    Date: Monday, May 17, 2010 @ 10:28:53
  Author: lantash-guest
Revision: 5231

- Set Priority to optional.
- Fix capitalization in Description.
- Install in private directory /usr/share/openstv, which
  resulted in major simplification of debian/rules and drop-setuptools.patch.
- Use dh_link for scripts in /usr/bin.
- Drop debian/pyversions.
- Drop debian/pycompat.
- Remove CHANGELOG.txt from debian/docs.

Added:
  packages/openstv/trunk/debian/openstv.links
Modified:
  packages/openstv/trunk/debian/control
  packages/openstv/trunk/debian/docs
  packages/openstv/trunk/debian/patches/drop-setuptools.patch
  packages/openstv/trunk/debian/rules
Deleted:
  packages/openstv/trunk/debian/pycompat
  packages/openstv/trunk/debian/pyversions

Modified: packages/openstv/trunk/debian/control
===================================================================
--- packages/openstv/trunk/debian/control	2010-05-15 23:27:09 UTC (rev 5230)
+++ packages/openstv/trunk/debian/control	2010-05-17 10:28:53 UTC (rev 5231)
@@ -1,6 +1,6 @@
 Source: openstv
 Section: misc
-Priority: extra
+Priority: optional
 Maintainer: Severin Heiniger <severinheiniger at gmail.com>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~), python-support, python
@@ -16,7 +16,7 @@
 Suggests: python-profiler
 Description: single transferable vote and instant runoff voting software
  OpenSTV is an open-source software for implementing the single transferable
- vote and other voting methods such as instant runoff voting, condorcet voting,
+ vote and other voting methods such as instant runoff voting, Condorcet voting,
  and approval voting. OpenSTV is the only open-source software that implements
  the single transferable vote exactly as used by governments, including Scotland
  and the City of Cambridge, Massachusetts. These methods have been extensively

Modified: packages/openstv/trunk/debian/docs
===================================================================
--- packages/openstv/trunk/debian/docs	2010-05-15 23:27:09 UTC (rev 5230)
+++ packages/openstv/trunk/debian/docs	2010-05-17 10:28:53 UTC (rev 5231)
@@ -1,2 +1 @@
-CHANGELOG.txt
 README.txt

Added: packages/openstv/trunk/debian/openstv.links
===================================================================
--- packages/openstv/trunk/debian/openstv.links	                        (rev 0)
+++ packages/openstv/trunk/debian/openstv.links	2010-05-17 10:28:53 UTC (rev 5231)
@@ -0,0 +1,2 @@
+usr/share/openstv/openstv/OpenSTV.py usr/bin/openstv
+usr/share/openstv/openstv/runElection.py usr/bin/openstv-run-election 

Modified: packages/openstv/trunk/debian/patches/drop-setuptools.patch
===================================================================
--- packages/openstv/trunk/debian/patches/drop-setuptools.patch	2010-05-15 23:27:09 UTC (rev 5230)
+++ packages/openstv/trunk/debian/patches/drop-setuptools.patch	2010-05-17 10:28:53 UTC (rev 5231)
@@ -1,28 +1,19 @@
 Use `distutils.core' instead of `setuptools'.
-Install two executables `openstv' and `openstv-run-election'.
 Install icons, splash screen as well as HTML files used by the application.
 --- a/setup.py
 +++ b/setup.py
-@@ -19,8 +19,10 @@
-     import py2exe
+@@ -20,7 +20,7 @@
  elif sys.platform == "cygwin":
      from distutils.core import setup
--else:
-+elif sys.platform == "darwin":
-     from setuptools import setup
-+else:
+ else:
+-    from setuptools import setup
 +    from distutils.core import setup
  
  from openstv.version import v as OpenSTV_version
  
-@@ -249,4 +251,6 @@
+@@ -249,4 +249,5 @@
            url = url,
            license = license,
            packages = packages,
-+          scripts = ['bin/openstv', 'bin/openstv-run-election'],
 +          package_data = {'openstv': ['Icons/*.ico', 'Icons/*.png', '*.html']}
            )
---- /dev/null
-+++ b/drop-setuptools.patch
-@@ -0,0 +1 @@
-+q

Deleted: packages/openstv/trunk/debian/pycompat
===================================================================
--- packages/openstv/trunk/debian/pycompat	2010-05-15 23:27:09 UTC (rev 5230)
+++ packages/openstv/trunk/debian/pycompat	2010-05-17 10:28:53 UTC (rev 5231)
@@ -1 +0,0 @@
-2

Deleted: packages/openstv/trunk/debian/pyversions
===================================================================
--- packages/openstv/trunk/debian/pyversions	2010-05-15 23:27:09 UTC (rev 5230)
+++ packages/openstv/trunk/debian/pyversions	2010-05-17 10:28:53 UTC (rev 5231)
@@ -1 +0,0 @@
-2.5-

Modified: packages/openstv/trunk/debian/rules
===================================================================
--- packages/openstv/trunk/debian/rules	2010-05-15 23:27:09 UTC (rev 5230)
+++ packages/openstv/trunk/debian/rules	2010-05-17 10:28:53 UTC (rev 5231)
@@ -3,19 +3,5 @@
 %:
 	dh --with quilt $@
 
-override_dh_auto_clean:
-	# `drop-setuptools.patch' needs to be applied for `setup.py clean' to work
-	dh_quilt_patch
-	dh_auto_clean
-
-override_dh_quilt_patch:
-	dh_quilt_patch
-	mkdir -p bin
-	[ -f bin/openstv ] || mv openstv/OpenSTV.py bin/openstv
-	[ -f bin/openstv-run-election ] || mv openstv/runElection.py bin/openstv-run-election
-
-override_dh_quilt_unpatch:
-	[ -f openstv/OpenSTV.py ] || mv bin/openstv openstv/OpenSTV.py
-	[ -f openstv/runElection.py ] || mv bin/openstv-run-election openstv/runElection.py
-	rm -rf bin
-	dh_quilt_unpatch
+override_dh_auto_install:
+	dh_auto_install -- --install-lib=/usr/share/openstv