[Python-apps-commits] r9781 - in packages/series60-remote/trunk/debian (5 files)

[nijel at users.alioth.debian.org]

    Date: Monday, June 17, 2013 @ 08:50:09
  Author: nijel
Revision: 9781

Patch setup.py rather than manually delete some installed files.

Added:
  packages/series60-remote/trunk/debian/patches/
  packages/series60-remote/trunk/debian/patches/no-text-files.patch
  packages/series60-remote/trunk/debian/patches/series
Modified:
  packages/series60-remote/trunk/debian/changelog
  packages/series60-remote/trunk/debian/rules

Modified: packages/series60-remote/trunk/debian/changelog
===================================================================
--- packages/series60-remote/trunk/debian/changelog	2013-06-17 08:46:18 UTC (rev 9780)
+++ packages/series60-remote/trunk/debian/changelog	2013-06-17 08:50:09 UTC (rev 9781)
@@ -7,6 +7,7 @@
   * Bump standards to 3.9.4.
   * Update debian/copyright to match current copyright format.
   * Use debhelper 9 and dh_python2.
+  * Patch setup.py rather than manually delete some installed files.
 
  -- Michal ÄŒihaÅ™ <nijel at debian.org>  Mon, 17 Jun 2013 10:37:33 +0200
 

Added: packages/series60-remote/trunk/debian/patches/no-text-files.patch
===================================================================
--- packages/series60-remote/trunk/debian/patches/no-text-files.patch	                        (rev 0)
+++ packages/series60-remote/trunk/debian/patches/no-text-files.patch	2013-06-17 08:50:09 UTC (rev 9781)
@@ -0,0 +1,24 @@
+From: Michal ÄŒihaÅ™ <nijel at debian.org>
+Subject: Do not install text files into python dirs
+Forwarded: no
+--- a/setup.py
++++ b/setup.py
+@@ -15,8 +15,7 @@
+ pythonSis_Py20 = "Python_2.0.0.sis"
+ 
+ 
+-textfiles = ['Changelog', 'HACKING', 'INSTALL', 'LICENSE', 'LICENSE.icons-oxygen',
+-         'README.icons-oxygen', 'TODO']
++textfiles = []
+ pys60 = 'PythonForS60_1_4_5_3rdEd.sis'
+ sisfiles = ['mobile/' + applicationSis_Py14, 'mobile/' + applicationSis_Py20, 'mobile/' + pythonSis_Py14, 'mobile/' + pythonSis_Py20]
+ desktopfile = 'pc/series60-remote.desktop'
+@@ -91,7 +90,7 @@
+    for file in textfiles:
+       install.copy_file(file, os.path.join(install.install_lib, app_dir))
+ 
+-   # Copy .sis files on Unix-like systems to /usr/share/series60-remote, on Windows systems 
++   # Copy .sis files on Unix-like systems to /usr/share/series60-remote, on Windows systems
+    # to PREFIX/site-packages/series60_remote/mobile
+    if os.name == 'posix':
+       dest = os.path.join(install.install_data, 'share', install.config_vars['dist_name'])

Added: packages/series60-remote/trunk/debian/patches/series
===================================================================
--- packages/series60-remote/trunk/debian/patches/series	                        (rev 0)
+++ packages/series60-remote/trunk/debian/patches/series	2013-06-17 08:50:09 UTC (rev 9781)
@@ -0,0 +1 @@
+no-text-files.patch

Modified: packages/series60-remote/trunk/debian/rules
===================================================================
--- packages/series60-remote/trunk/debian/rules	2013-06-17 08:46:18 UTC (rev 9780)
+++ packages/series60-remote/trunk/debian/rules	2013-06-17 08:50:09 UTC (rev 9781)
@@ -11,10 +11,6 @@
 
 override_dh_fixperms:
 	dh_fixperms
-	for f in INSTALL LICENSE HACKING Changelog LICENSE.icons-oxygen TODO README.icons-oxygen ; do \
-		rm debian/series60-remote/usr/lib/python*/dist-packages/series60_remote/$$f; \
-		rm debian/series60-remote/usr/share/pyshared/series60_remote/$$f; \
-	done
 	find debian/series60-remote/usr/share/series60-remote -type f -print0 | xargs -r -0 chmod 644
 
 get-orig-source: