[Python-apps-commits] r5646 - in packages/openstv/trunk/debian (5 files)

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

    Date: Monday, June 21, 2010 @ 07:26:04
  Author: lantash-guest
Revision: 5646

* New upstream release.
* debian/rules: Remove MANIFEST.in created by setup.py in override_dh_auto_clean.
* debian/patches: Drop drop-setuptools.patch as it has been partially applied upstream. Move remaining changes to setup-package-data.patch.

Added:
  packages/openstv/trunk/debian/patches/setup-package-data.patch
Modified:
  packages/openstv/trunk/debian/changelog
  packages/openstv/trunk/debian/patches/series
  packages/openstv/trunk/debian/rules
Deleted:
  packages/openstv/trunk/debian/patches/drop-setuptools.patch

Modified: packages/openstv/trunk/debian/changelog
===================================================================
--- packages/openstv/trunk/debian/changelog	2010-06-20 12:49:31 UTC (rev 5645)
+++ packages/openstv/trunk/debian/changelog	2010-06-21 07:26:04 UTC (rev 5646)
@@ -1,3 +1,15 @@
+openstv (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+  * debian/rules:
+    + Remove MANIFEST.in created by setup.py in override_dh_auto_clean.
+  * debian/patches:
+    + Drop drop-setuptools.patch as it has been partially applied upstream.
+    + Move remaining changes to setup-package-data.patch.
+
+ -- Severin Heiniger <severinheiniger at gmail.com>  Mon, 21 Jun 2010 08:58:14 +0200
+
 openstv (1.6-1) unstable; urgency=low
 
   * Initial release (Closes: #405759)

Deleted: packages/openstv/trunk/debian/patches/drop-setuptools.patch
===================================================================
--- packages/openstv/trunk/debian/patches/drop-setuptools.patch	2010-06-20 12:49:31 UTC (rev 5645)
+++ packages/openstv/trunk/debian/patches/drop-setuptools.patch	2010-06-21 07:26:04 UTC (rev 5646)
@@ -1,19 +0,0 @@
-Use `distutils.core' instead of `setuptools'.
-Install icons, splash screen as well as HTML files used by the application.
---- a/setup.py
-+++ b/setup.py
-@@ -20,7 +20,7 @@
- elif sys.platform == "cygwin":
-     from distutils.core import setup
- else:
--    from setuptools import setup
-+    from distutils.core import setup
- 
- from openstv.version import v as OpenSTV_version
- 
-@@ -249,4 +249,5 @@
-           url = url,
-           license = license,
-           packages = packages,
-+          package_data = {'openstv': ['Icons/*.ico', 'Icons/*.png', '*.html']}
-           )

Modified: packages/openstv/trunk/debian/patches/series
===================================================================
--- packages/openstv/trunk/debian/patches/series	2010-06-20 12:49:31 UTC (rev 5645)
+++ packages/openstv/trunk/debian/patches/series	2010-06-21 07:26:04 UTC (rev 5646)
@@ -1 +1 @@
-drop-setuptools.patch
+setup-package-data.patch

Added: packages/openstv/trunk/debian/patches/setup-package-data.patch
===================================================================
--- packages/openstv/trunk/debian/patches/setup-package-data.patch	                        (rev 0)
+++ packages/openstv/trunk/debian/patches/setup-package-data.patch	2010-06-21 07:26:04 UTC (rev 5646)
@@ -0,0 +1,9 @@
+Install icons, splash screen as well as HTML files used by the application.
+--- a/setup.py
++++ b/setup.py
+@@ -249,4 +249,5 @@
+           url = url,
+           license = license,
+           packages = packages,
++          package_data = {'openstv': ['Icons/*.ico', 'Icons/*.png', '*.html']}
+           )

Modified: packages/openstv/trunk/debian/rules
===================================================================
--- packages/openstv/trunk/debian/rules	2010-06-20 12:49:31 UTC (rev 5645)
+++ packages/openstv/trunk/debian/rules	2010-06-21 07:26:04 UTC (rev 5646)
@@ -3,5 +3,9 @@
 %:
 	dh $@
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f MANIFEST.in
+
 override_dh_auto_install:
 	dh_auto_install -- --install-lib=/usr/share/openstv