From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 4 May 2008 13:03:48 +0000 (+0100)
Subject: cdb-*: Fixing for Python 2.5.
X-Git-Tag: 1.2.1^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/misc/commitdiff_plain/329f8eb8a105d31994e46ae74f5d11f107047715

cdb-*: Fixing for Python 2.5.

The new Python warns about the old `sre' module being deprecated.
Unfortunately, the scripts get used in cron files, and the warnings are
very annoying, so fix this.

Also put Emacs mode markers in.
---

diff --git a/cdb-assign.in b/cdb-assign.in
index 0012e49..026fd63 100644
--- a/cdb-assign.in
+++ b/cdb-assign.in
@@ -1,7 +1,8 @@
 #! @PYTHON@
+### -*-python-*-
 
 from cdb import cdbmake
-from sre import compile as r_compile, sub as r_sub
+from re import compile as r_compile, sub as r_sub
 from sys import argv, stdin, stderr, exit
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
diff --git a/cdb-list.in b/cdb-list.in
index 9ccba09..88745da 100644
--- a/cdb-list.in
+++ b/cdb-list.in
@@ -1,7 +1,8 @@
 #! @PYTHON@
+### -*-python-*-
 
 from cdb import cdbmake
-from sre import compile as r_compile, sub as r_sub
+from re import compile as r_compile, sub as r_sub
 from sys import argv, stdin, stderr, exit
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
diff --git a/cdb-map.in b/cdb-map.in
index d478092..2bb5d5d 100644
--- a/cdb-map.in
+++ b/cdb-map.in
@@ -1,7 +1,8 @@
 #! @PYTHON@
+### -*-python-*-
 
 from cdb import cdbmake
-from sre import sub as r_sub
+from re import sub as r_sub
 from sys import argv, stdin, stderr, exit
 
 ego = r_sub(r'^.*[/\\]', '', argv[0])
diff --git a/debian/changelog b/debian/changelog
index 71e342b..e60f35c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nsict-utils (1.2.1) experimental; urgency=low
+
+  * Fix Python stuff for Python 2.5.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Sun, 04 May 2008 14:04:24 +0100
+
 nsict-utils (1.2.0) experimental; urgency=low
 
   * Build system overhaul.