[Python-modules-commits] r17011 - in packages/pyke/trunk/debian (6 files)

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

    Date: Monday, May 16, 2011 @ 02:23:53
  Author: eriol-guest
Revision: 17011

Used sed instead of ed to strip target links

Added:
  packages/pyke/trunk/debian/patches/03_use-sed-instead-of-ed.patch
Modified:
  packages/pyke/trunk/debian/changelog
  packages/pyke/trunk/debian/control
  packages/pyke/trunk/debian/patches/01_fix-hardcoded-path-in-doctest.patch
  packages/pyke/trunk/debian/patches/02_fix-insecure-temporary-file-use.patch
  packages/pyke/trunk/debian/patches/series

Modified: packages/pyke/trunk/debian/changelog
===================================================================
--- packages/pyke/trunk/debian/changelog	2011-05-15 23:31:32 UTC (rev 17010)
+++ packages/pyke/trunk/debian/changelog	2011-05-16 02:23:53 UTC (rev 17011)
@@ -25,9 +25,11 @@
     - Changed a hardcoded path in a doctest to a path that is guaranteed
       to exist on a POSIX system
   * debian/patches/02_fix-insecure-temporary-file-use.patch
-    - Use mktemp to create temporary file
+    - Used mktemp to create temporary file
+  * debian/patches/03_use-sed-instead-of-ed.patch
+    - Used sed instead of ed to strip target links 
 
- -- Daniele Tricoli <eriol at mornie.org>  Mon, 16 May 2011 01:18:31 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 16 May 2011 04:14:42 +0200
 
 pyke (1.1.1-1) unstable; urgency=low
 

Modified: packages/pyke/trunk/debian/control
===================================================================
--- packages/pyke/trunk/debian/control	2011-05-15 23:31:32 UTC (rev 17010)
+++ packages/pyke/trunk/debian/control	2011-05-16 02:23:53 UTC (rev 17011)
@@ -4,7 +4,7 @@
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50~), python-setuptools, python-support,
- rest2web, ed, python-nose, python-wxgtk2.6 | python-wxgtk2.8
+ rest2web, python-nose, python-wxgtk2.6 | python-wxgtk2.8
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyke/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyke/trunk/

Modified: packages/pyke/trunk/debian/patches/01_fix-hardcoded-path-in-doctest.patch
===================================================================
--- packages/pyke/trunk/debian/patches/01_fix-hardcoded-path-in-doctest.patch	2011-05-15 23:31:32 UTC (rev 17010)
+++ packages/pyke/trunk/debian/patches/01_fix-hardcoded-path-in-doctest.patch	2011-05-16 02:23:53 UTC (rev 17011)
@@ -1,4 +1,4 @@
-Changed a hardcoded path in a doctest to a path that is guaranteed to exist on a POSIX system
+Change a hardcoded path in a doctest to a path that is guaranteed to exist on a POSIX system
 --- a/pyke/special.py
 +++ b/pyke/special.py
 @@ -101,8 +101,8 @@

Modified: packages/pyke/trunk/debian/patches/02_fix-insecure-temporary-file-use.patch
===================================================================
--- packages/pyke/trunk/debian/patches/02_fix-insecure-temporary-file-use.patch	2011-05-15 23:31:32 UTC (rev 17010)
+++ packages/pyke/trunk/debian/patches/02_fix-insecure-temporary-file-use.patch	2011-05-16 02:23:53 UTC (rev 17011)
@@ -1,4 +1,4 @@
-Creating temporary file with mktemp
+Create temporary file with mktemp
 --- a/doc/source/bin/add_links
 +++ b/doc/source/bin/add_links
 @@ -5,7 +5,7 @@

Added: packages/pyke/trunk/debian/patches/03_use-sed-instead-of-ed.patch
===================================================================
--- packages/pyke/trunk/debian/patches/03_use-sed-instead-of-ed.patch	                        (rev 0)
+++ packages/pyke/trunk/debian/patches/03_use-sed-instead-of-ed.patch	2011-05-16 02:23:53 UTC (rev 17011)
@@ -0,0 +1,17 @@
+Use sed instead of ed to strip target links
+--- a/doc/source/bin/strip_links
++++ b/doc/source/bin/strip_links
+@@ -27,12 +27,7 @@
+         if true
+         then
+             mtime=`stat -c '%y' "$filename"`
+-            ed -s "$filename" <<-'!'
+-		H
+-                /^\.\. ADD_LINKS MARKER$/,$d
+-		w
+-		q
+-		!
++            sed -i '/^\.\. ADD_LINKS MARKER$/,$d' "$filename"
+ 	    #	$; # hush!
+ 	    #	?^[ 	]*$?; # hush!
+ 	    #	.,$d

Modified: packages/pyke/trunk/debian/patches/series
===================================================================
--- packages/pyke/trunk/debian/patches/series	2011-05-15 23:31:32 UTC (rev 17010)
+++ packages/pyke/trunk/debian/patches/series	2011-05-16 02:23:53 UTC (rev 17011)
@@ -1,2 +1,3 @@
 01_fix-hardcoded-path-in-doctest.patch
 02_fix-insecure-temporary-file-use.patch
+03_use-sed-instead-of-ed.patch