[Python-apps-commits] r382 - in packages/phatch/trunk/debian (6 files)

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

    Date: Thursday, December 6, 2007 @ 13:40:54
  Author: pochu-guest
Revision: 382

Add 01_setup.dpatch to fix build, add support for dpatch in rules and control
fix manpage lintian warning

Added:
  packages/phatch/trunk/debian/patches/
  packages/phatch/trunk/debian/patches/00list
  packages/phatch/trunk/debian/patches/01_setup.dpatch
Modified:
  packages/phatch/trunk/debian/control
  packages/phatch/trunk/debian/phatch.1
  packages/phatch/trunk/debian/rules

Modified: packages/phatch/trunk/debian/control
===================================================================
--- packages/phatch/trunk/debian/control	2007-12-06 02:02:24 UTC (rev 381)
+++ packages/phatch/trunk/debian/control	2007-12-06 13:40:54 UTC (rev 382)
@@ -7,8 +7,8 @@
 Homepage: http://launchpad.net/phatch/
 Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/phatch/trunk/?op=log
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/phatch/trunk/
-Build-Depends: debhelper (>= 5.0.38)
-Build-Depends-Indep: cdbs (>= 0.4.43), python (>= 2.3.5-11), python-support (>= 0.5.3)
+Build-Depends: debhelper (>= 5.0.38), dpatch, cdbs (>= 0.4.43), python (>= 2.3.5-11)
+Build-Depends-Indep: python-support (>= 0.5.3)
 
 Package: phatch
 Architecture: all

Added: packages/phatch/trunk/debian/patches/00list
===================================================================
--- packages/phatch/trunk/debian/patches/00list	                        (rev 0)
+++ packages/phatch/trunk/debian/patches/00list	2007-12-06 13:40:54 UTC (rev 382)
@@ -0,0 +1 @@
+01_setup

Added: packages/phatch/trunk/debian/patches/01_setup.dpatch
===================================================================
--- packages/phatch/trunk/debian/patches/01_setup.dpatch	                        (rev 0)
+++ packages/phatch/trunk/debian/patches/01_setup.dpatch	2007-12-06 13:40:54 UTC (rev 382)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_setup.dpatch by Emilio Pozuelo Monfort <pochu at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: We don't want to build-depend on python-imaging
+
+
+ at DPATCH@
+diff -ruN phatch-0.0.bzr165/setup.py phatch-0.0.bzr165.new/setup.py
+--- phatch-0.0.bzr165/setup.py	2007-12-05 20:25:31.000000000 +0100
++++ phatch-0.0.bzr165.new/setup.py	2007-12-06 13:29:20.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ import glob, os, sys
+ from distutils.core import setup
+-from phatch.data import info
++#from phatch.data import info
+ 
+ #centralised info generates README and AUTHORS
+ #info.write_readme_credits()
+@@ -45,8 +45,8 @@
+                                'phatch.data','phatch.pyWx','phatch.pyWx.lib',
+                                'phatch.pyWx.wxGlade','phatch.templates'],
+             scripts         = ['bin/phatch'],
+-            data_files      = data_files,
+-            **info.SETUP
++            data_files      = data_files
++#            **info.SETUP
+         )
+ 
+ if linux:
+@@ -62,4 +62,4 @@
+             error('Fail to update the .desktop file database.\n')
+ 
+ write(  "\nInstallation finished! You can now run Phatch by typing 'phatch' \n"
+-        "or through your applications menu.\n")
+\ No newline at end of file
++        "or through your applications menu.\n")

Modified: packages/phatch/trunk/debian/phatch.1
===================================================================
--- packages/phatch/trunk/debian/phatch.1	2007-12-06 02:02:24 UTC (rev 381)
+++ packages/phatch/trunk/debian/phatch.1	2007-12-06 13:40:54 UTC (rev 382)
@@ -1,6 +1,6 @@
 .TH PHATCH "1" "December 2007" "Phatch 0.0.bzr165" "User Commands"
 .SH NAME
-Phatch \- manual page for Phatch
+Phatch \- Photo Batch Processor
 .SH DESCRIPTION
 usage: Phatch [options] [actionlist] [image files/folders]
 .SS "options:"

Modified: packages/phatch/trunk/debian/rules
===================================================================
--- packages/phatch/trunk/debian/rules	2007-12-06 02:02:24 UTC (rev 381)
+++ packages/phatch/trunk/debian/rules	2007-12-06 13:40:54 UTC (rev 382)
@@ -2,9 +2,14 @@
 
 DEB_PYTHON_SYSTEM 		:= pysupport
 
+include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+#binary/phatch::
+#	rm -f debian/phatch/usr/share/python-support/phatch/phatch/phatch.py
+
 binary-install/phatch::
+	rm -f debian/phatch/usr/share/python-support/phatch/phatch/phatch.py
 	dh_desktop
 	dh_icons