[Python-modules-commits] r4297 - in packages/paste/trunk/debian (8 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sat Jan 5 21:25:27 UTC 2008 

    Date: Saturday, January 5, 2008 @ 21:25:26
  Author: piotr
Revision: 4297

* Add remove_shebang and remove_link_to_wareweb patches
  (second one partially fixes #456554). dpatch added to build depends

Added:
  packages/paste/trunk/debian/patches/
  packages/paste/trunk/debian/patches/00dpatch.conf
  packages/paste/trunk/debian/patches/00list
  packages/paste/trunk/debian/patches/remove_link_to_wareweb.dpatch
  packages/paste/trunk/debian/patches/remove_shebang.dpatch
Modified:
  packages/paste/trunk/debian/changelog
  packages/paste/trunk/debian/control
  packages/paste/trunk/debian/rules

Modified: packages/paste/trunk/debian/changelog
===================================================================
--- packages/paste/trunk/debian/changelog	2008-01-05 21:08:54 UTC (rev 4296)
+++ packages/paste/trunk/debian/changelog	2008-01-05 21:25:26 UTC (rev 4297)
@@ -8,6 +8,8 @@
   * Switch to python-support. All paste packages will now depend on
     paste-common (>= 1.6-1) to make sure all use pysupport
   * Compress binary package with bzip2
+  * Add remove_shebang and remove_link_to_wareweb patches
+    (second one partially fixes #456554). dpatch added to build depends
   * Bump Standards-Version to 3.7.3 (no changes needed)
 
  -- Piotr Ożarowski <piotr at debian.org>  Sat, 05 Jan 2008 18:48:35 +0100

Modified: packages/paste/trunk/debian/control
===================================================================
--- packages/paste/trunk/debian/control	2008-01-05 21:08:54 UTC (rev 4296)
+++ packages/paste/trunk/debian/control	2008-01-05 21:25:26 UTC (rev 4297)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4),
  python-setuptools (>= 0.6b3-1), python-docutils
 Standards-Version: 3.7.3

Added: packages/paste/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/paste/trunk/debian/patches/00dpatch.conf	                        (rev 0)
+++ packages/paste/trunk/debian/patches/00dpatch.conf	2008-01-05 21:25:26 UTC (rev 4297)
@@ -0,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Added: packages/paste/trunk/debian/patches/00list
===================================================================
--- packages/paste/trunk/debian/patches/00list	                        (rev 0)
+++ packages/paste/trunk/debian/patches/00list	2008-01-05 21:25:26 UTC (rev 4297)
@@ -0,0 +1,2 @@
+remove_link_to_wareweb
+remove_shebang.dpatch

Added: packages/paste/trunk/debian/patches/remove_link_to_wareweb.dpatch
===================================================================
--- packages/paste/trunk/debian/patches/remove_link_to_wareweb.dpatch	                        (rev 0)
+++ packages/paste/trunk/debian/patches/remove_link_to_wareweb.dpatch	2008-01-05 21:25:26 UTC (rev 4297)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_link_to_wareweb.dpatch by Piotr Ożarowski <piotr at debian.org>
+##
+## DP: Wareweb is not in Debian (I'm not interested in packaging it)
+## DP: so I'm removing link to this part of docs
+
+ at DPATCH@
+diff -urNad paste-1.6~/docs/index.txt paste-1.6/docs/index.txt
+--- paste-1.6~/docs/index.txt	2008-01-04 07:52:12.000000000 +0100
++++ paste-1.6/docs/index.txt	2008-01-05 22:11:38.000000000 +0100
+@@ -102,8 +102,6 @@
+ 
+ * `Paste WebKit <./webkit/>`_
+ 
+-* `Wareweb <./wareweb/>`_
+-
+ * `WSGI specification <http://www.python.org/peps/pep-0333.html>`_
+ 
+ * `Example application: to-do


Property changes on: packages/paste/trunk/debian/patches/remove_link_to_wareweb.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/paste/trunk/debian/patches/remove_shebang.dpatch
===================================================================
--- packages/paste/trunk/debian/patches/remove_shebang.dpatch	                        (rev 0)
+++ packages/paste/trunk/debian/patches/remove_shebang.dpatch	2008-01-05 21:25:26 UTC (rev 4297)
@@ -0,0 +1,14 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_shebang.dpatch by Piotr Ożarowski <piotr at debian.org>
+##
+## DP: removes not needed shebang
+
+ at DPATCH@
+diff -urNad paste-1.6~/paste/util/scgiserver.py paste-1.6/paste/util/scgiserver.py
+--- paste-1.6~/paste/util/scgiserver.py	2008-01-04 07:52:18.000000000 +0100
++++ paste-1.6/paste/util/scgiserver.py	2008-01-05 22:13:55.000000000 +0100
+@@ -1,4 +1,3 @@
+-#! /usr/bin/env python
+ """
+ SCGI-->WSGI application proxy, "SWAP".
+ 


Property changes on: packages/paste/trunk/debian/patches/remove_shebang.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/paste/trunk/debian/rules
===================================================================
--- packages/paste/trunk/debian/rules	2008-01-05 21:08:54 UTC (rev 4296)
+++ packages/paste/trunk/debian/rules	2008-01-05 21:25:26 UTC (rev 4297)
@@ -6,14 +6,17 @@
 PYVERS=$(shell pyversions -vr)
 DOCS=$(shell find docs/ -name "*.txt" -not -path "*/include/*" -printf "%p "| sed "s/.txt//g")
 
-clean:
+include /usr/share/dpatch/dpatch.make 
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf dist build
 	find . -name *\.py[co] -exec rm {} \;
 	dh_clean docs/reference.txt build-docs* $(PYVERS:%=install-python%)
 
-build: build-docs
+build: patch build-docs
+
 build-docs:
 	dh_installdirs
 	for NAME in $(DOCS); do \
@@ -43,9 +46,6 @@
 	# in paste-common package:
 	mkdir -p debian/paste-common/usr/lib/python$*/site-packages/paste/
 	cp paste/__init__.py debian/paste-common/usr/lib/python$*/site-packages/paste/
-	# fix file permissions
-	#chmod +x debian/python-paste/usr/lib/python$*/site-packages/paste/debug/doctest_webapp.py
-	chmod +x debian/python-paste/usr/lib/python$*/site-packages/paste/util/scgiserver.py
 	touch $@
 
 binary-indep: build install

More information about the Python-modules-commits mailing list