[Python-modules-commits] r407 - in /packages/python-dsv/trunk/debian: ./ changelog patches/ patches/01-leave-env-alone.patch rules

[ucko at users.alioth.debian.org]

Author: ucko
Date: Fri May  5 00:51:44 2006
New Revision: 407

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=407
Log:
Patch DSV.py indirectly, via CDBS's simple patch system, in preparation
for switching to pure merge-with-upstream mode per DPMT conventions.

Added:
    packages/python-dsv/trunk/debian/patches/   (with props)
    packages/python-dsv/trunk/debian/patches/01-leave-env-alone.patch
Modified:
    packages/python-dsv/trunk/debian/   (props changed)
    packages/python-dsv/trunk/debian/changelog
    packages/python-dsv/trunk/debian/rules

Propchange: packages/python-dsv/trunk/debian/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May  5 00:51:44 2006
@@ -1,3 +1,4 @@
 files
 *.substvars
 python-dsv
+stamp-patch*

Modified: packages/python-dsv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-dsv/trunk/debian/changelog?rev=407&op=diff
==============================================================================
--- packages/python-dsv/trunk/debian/changelog (original)
+++ packages/python-dsv/trunk/debian/changelog Fri May  5 00:51:44 2006
@@ -1,8 +1,10 @@
 python-dsv (1.4.0-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Patch DSV.py indirectly, via CDBS's simple patch system, in preparation
+    for switching to pure merge-with-upstream mode per DPMT conventions.
 
- -- Aaron M. Ucko <ucko at debian.org>  Sat, 22 Apr 2006 15:13:23 -0400
+ -- Aaron M. Ucko <ucko at debian.org>  Thu,  4 May 2006 20:51:09 -0400
 
 python-dsv (1.4.0-2) unstable; urgency=low
 

Propchange: packages/python-dsv/trunk/debian/patches/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri May  5 00:51:44 2006
@@ -1,0 +1,1 @@
+*.log

Added: packages/python-dsv/trunk/debian/patches/01-leave-env-alone.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-dsv/trunk/debian/patches/01-leave-env-alone.patch?rev=407&op=file
==============================================================================
--- packages/python-dsv/trunk/debian/patches/01-leave-env-alone.patch (added)
+++ packages/python-dsv/trunk/debian/patches/01-leave-env-alone.patch Fri May  5 00:51:44 2006
@@ -1,0 +1,20 @@
+diff -Nur python-dsv-TRUNK/DSV/DSV.py python-dsv-TRUNK.new/DSV/DSV.py
+--- python-dsv-TRUNK/DSV/DSV.py	2003-01-22 17:50:40.000000000 -0500
++++ python-dsv-TRUNK.new/DSV/DSV.py	2006-04-18 09:47:32.000000000 -0400
+@@ -117,11 +117,11 @@
+ import copy
+ import exceptions
+ import string
+-# RedHat 8.0 (or rather GTK2?) sets LANG = en_us.UTF-8 and apparently some
+-# older apps (including wxGTK) can't handle this.  The fix is to set LANG=C
+-# before running the app.  Thanks to Ahmad Baitalmal for supplying this info.
+-import os
+-os.putenv('LANG', 'C')
++## RedHat 8.0 (or rather GTK2?) sets LANG = en_us.UTF-8 and apparently some
++## older apps (including wxGTK) can't handle this.  The fix is to set LANG=C
++## before running the app.  Thanks to Ahmad Baitalmal for supplying this info.
++# import os
++# os.putenv('LANG', 'C')
+ 
+ try:
+     from wxPython import wx, grid

Modified: packages/python-dsv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-dsv/trunk/debian/rules?rev=407&op=diff
==============================================================================
--- packages/python-dsv/trunk/debian/rules (original)
+++ packages/python-dsv/trunk/debian/rules Fri May  5 00:51:44 2006
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 install_lib = /usr/share/python-support/python-dsv