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 0012e49ec3037208442ca96e011fe60425992588..026fd633539e41b32801b19751a2e2cb73f96b55 100644 (file)
--- 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 9ccba09c17cf0265e41143302a0a1cee8539071d..88745da92e9b430d01c489791ef7be5f106cc13d 100644 (file)
--- 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 d478092536e90c5f0d10e1e0550aa0d987132e75..2bb5d5d9595bc6d967ee294af8ca6921f44713bd 100644 (file)
--- 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 71e342b10c653ab6bfbded063e937ebdbba849bb..e60f35cf07fbedbcc1498932e657e290ce6fa8af 100644 (file)
--- 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.