[Python-apps-commits] r8610 - in packages/pype/trunk/debian (6 files)

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

    Date: Thursday, May 3, 2012 @ 16:43:01
  Author: anoteng-guest
Revision: 8610

Make the shebang work by stripping utf-8 BOM charachter and DOS style line endings
Add DEP-3 header to move_help_file.patch

Added:
  packages/pype/trunk/debian/links
Modified:
  packages/pype/trunk/debian/changelog
  packages/pype/trunk/debian/control
  packages/pype/trunk/debian/patches/move_help_file.patch
  packages/pype/trunk/debian/rules
Deleted:
  packages/pype/trunk/debian/pype.sh

Modified: packages/pype/trunk/debian/changelog
===================================================================
--- packages/pype/trunk/debian/changelog	2012-05-03 13:43:00 UTC (rev 8609)
+++ packages/pype/trunk/debian/changelog	2012-05-03 16:43:01 UTC (rev 8610)
@@ -11,11 +11,13 @@
   * Don't include two copies of readme.html
   * Bump compatibility level to 7, to make dh_installchangelogs automatically
     find and install the upstream changelog
+  * Drop the /usr/bin shell script and use a link instead
+  * Make the shebang work by stripping the UTF8 BOM character and DOS line endings.
 
   [Jakub Wilk]
   * Add Vcs-* fields.
 
- -- Andreas Noteng <andreas at noteng.no>  Wed, 02 May 2012 23:30:13 +0200
+ -- Andreas Noteng <andreas at noteng.no>  Thu, 03 May 2012 18:36:59 +0200
 
 pype (2.9.1-3) unstable; urgency=low
 

Modified: packages/pype/trunk/debian/control
===================================================================
--- packages/pype/trunk/debian/control	2012-05-03 13:43:00 UTC (rev 8609)
+++ packages/pype/trunk/debian/control	2012-05-03 16:43:01 UTC (rev 8610)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Andreas Noteng <andreas at noteng.no>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~), dos2unix, bomstrip
 Standards-Version: 3.9.3
 Homepage: http://pype.sourceforge.net/index.shtml
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/pype/trunk/

Added: packages/pype/trunk/debian/links
===================================================================
--- packages/pype/trunk/debian/links	                        (rev 0)
+++ packages/pype/trunk/debian/links	2012-05-03 16:43:01 UTC (rev 8610)
@@ -0,0 +1 @@
+/usr/share/pype/pype.py /usr/bin/pype

Modified: packages/pype/trunk/debian/patches/move_help_file.patch
===================================================================
--- packages/pype/trunk/debian/patches/move_help_file.patch	2012-05-03 13:43:00 UTC (rev 8609)
+++ packages/pype/trunk/debian/patches/move_help_file.patch	2012-05-03 16:43:01 UTC (rev 8610)
@@ -1,3 +1,7 @@
+Description: Use the readme.html we installed in /usr/share/doc/pype
+Author: Andreas Noteng <andreas at noteng.no>
+Forwarded: not-needed
+Last-Update: 2012-05-03
 --- a/plugins/help.py
 +++ b/plugins/help.py
 @@ -12,7 +12,7 @@

Deleted: packages/pype/trunk/debian/pype.sh
===================================================================
--- packages/pype/trunk/debian/pype.sh	2012-05-03 13:43:00 UTC (rev 8609)
+++ packages/pype/trunk/debian/pype.sh	2012-05-03 16:43:01 UTC (rev 8610)
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/pype
-python /usr/share/pype/pype.py $@

Modified: packages/pype/trunk/debian/rules
===================================================================
--- packages/pype/trunk/debian/rules	2012-05-03 13:43:00 UTC (rev 8609)
+++ packages/pype/trunk/debian/rules	2012-05-03 16:43:01 UTC (rev 8610)
@@ -4,11 +4,14 @@
 # Deleting the upstream setup.py, because it is windows only, 
 # and breaks the build
 	rm -f setup.py
+	rm -f pype.py.bom
 	find ./ -name '*.pyc' -delete
 	dh_clean
 
-override_dh_auto_install:
-	install -m 755 debian/pype.sh debian/pype/usr/bin/pype
+override_dh_auto_build:
+	dos2unix * plugins/*
+	bomstrip-files pype.py
+	chmod 755 pype.py
 
 %:
 	dh $@ --with python2