diff -u htmlgen-2.2.2/debian/changelog htmlgen-2.2.2/debian/changelog
--- htmlgen-2.2.2/debian/changelog
+++ htmlgen-2.2.2/debian/changelog
@@ -1,3 +1,16 @@
+htmlgen (2.2.2-12ubuntu1) hardy; urgency=low
+
+  * Patched to make Input and Select classes support the 'ID' tag
+    (LP: #157373).
+  * Patched to replace use of whrandom, which is not in Python2.5, 
+    with the random module (LP: #172800).
+  * debian/control:
+    - build depend on quilt.
+    - Ubuntu maintainer munge
+  * debian/rules: introduce quilt.
+  
+ -- Morten Kjeldgaard <mok@bioxray.au.dk>  Tue, 08 Apr 2008 17:34:36 +0200
+
 htmlgen (2.2.2-12) unstable; urgency=low
 
   * Added debian/compat file and removed DH_COMPAT environment variable from
diff -u htmlgen-2.2.2/debian/control htmlgen-2.2.2/debian/control
--- htmlgen-2.2.2/debian/control
+++ htmlgen-2.2.2/debian/control
@@ -1,8 +1,9 @@
 Source: htmlgen
 Section: python
 Priority: optional
-Maintainer: Kevin Coyner <kcoyner@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2)
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Kevin Coyner <kcoyner@debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), quilt
 Build-Depends-Indep: python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
 XS-Python-Version: all
 Standards-Version: 3.7.2
diff -u htmlgen-2.2.2/debian/rules htmlgen-2.2.2/debian/rules
--- htmlgen-2.2.2/debian/rules
+++ htmlgen-2.2.2/debian/rules
@@ -2,16 +2,18 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
+include /usr/share/quilt/quilt.make
+
 exe_scripts = HTMLcalendar.py HTMLutil.py barchart.py colorcube.py
 
 PYVERS := $(shell pyversions -r)
 
-build:
+build: patch
 	dh_testdir
 	chmod -x *H.py
 	touch build
 
-clean:
+clean: unpatch
 	dh_testdir
 	-rm -f build
 	-find . -name '*.py[co]' | xargs rm -f
only in patch2:
unchanged:
--- htmlgen-2.2.2.orig/debian/patches/get-rid-of-whrandom
+++ htmlgen-2.2.2/debian/patches/get-rid-of-whrandom
@@ -0,0 +1,22 @@
+--- htmlgen-2.2.2.orig/HTMLgen.py
++++ htmlgen-2.2.2/HTMLgen.py
+@@ -924,7 +924,7 @@
+     def antispam(self, address):
+         """Process a string with HTML encodings to defeat address spiders.
+         """
+-        from whrandom import choice
++        from random import choice
+         buffer = map(None, address)
+         for i in range(0, len(address), choice((2,3,4))):
+             buffer[i] = '&#%d;' % ord(buffer[i])
+--- htmlgen-2.2.2.orig/ImagePaletteH.py
++++ htmlgen-2.2.2/ImagePaletteH.py
+@@ -70,7 +70,7 @@
+     return ImagePalette(mode, palette * len(mode))
+ 
+ def random(mode = "RGB"):
+-#    from whrandom import randint
++    from random import randint
+     palette = map(lambda a: randint(0, 255), [0]*256*len(mode))
+     return ImagePalette(mode, palette)
+ 
only in patch2:
unchanged:
--- htmlgen-2.2.2.orig/debian/patches/series
+++ htmlgen-2.2.2/debian/patches/series
@@ -0,0 +1,2 @@
+fix-missing-ids
+get-rid-of-whrandom
only in patch2:
unchanged:
--- htmlgen-2.2.2.orig/debian/patches/fix-missing-ids
+++ htmlgen-2.2.2/debian/patches/fix-missing-ids
@@ -0,0 +1,50 @@
+--- htmlgen-2.2.2.orig/HTMLgen.py
++++ htmlgen-2.2.2/HTMLgen.py
+@@ -1262,6 +1262,7 @@
+         type -- 'TEXT' (default) Supported types include password, checkbox,
+                       radio, file, submit, reset, hidden.
+         name -- provides the datum name
++        id -- global identifier
+         value -- the initial value of the input item
+         checked --  flag indicating if the item is checked initially
+         size -- size of the widget (e.g. size=10 for a text widget is it's width)
+@@ -1286,6 +1287,7 @@
+     def __init__(self, **kw):
+         self.type = 'TEXT'
+         self.name = 'Default_Name'
++        self.id = None
+         self.value = None
+         self.checked = ''
+         self.size = 0
+@@ -1313,6 +1315,7 @@
+         s.append('\n<INPUT')
+         if self.type: s.append(' TYPE="%s"' % self.type)
+         if self.name: s.append(' NAME="%s"' % self.name)
++        if self.id is not None: s.append(' ID="%s"' % self.id)
+         if self.value is not None: s.append(' VALUE="%s"' % self.value)
+         if self.checked: s.append(' CHECKED')
+         if self.size: s.append(' SIZE=%s' % self.size)
+@@ -1340,6 +1343,7 @@
+     Keyword Arguments:
+     
+         name -- provides the datum name
++        id -- global identifier
+         size -- the visual size. 1 means use an option popup widget. 
+                                >=2 means use a list widget with that many lines.
+         multiple -- flag to indicate whether multiple selections are supported.
+@@ -1351,6 +1355,7 @@
+     def __init__(self, data=None, **kw):
+         UserList.UserList.__init__(self, data)
+         self.name = ''
++        self.id = None
+         self.size = 1
+         self.multiple = None
+         self.selected = []
+@@ -1366,6 +1371,7 @@
+     def __str__(self):
+         s = ['<SELECT NAME="%s"' % self.name]
+         if self.size: s.append(' SIZE=%s' % self.size)
++        if self.id is not None: s.append(' ID="%s"' % self.id)
+         if self.multiple: s.append(' MULTIPLE')
+         if self.onBlur: s.append(' onBlur="%s"' % self.onBlur)
+         if self.onChange: s.append(' onChange="%s"' % self.onChange)
only in patch2:
unchanged:
--- htmlgen-2.2.2.orig/htmlgen_patch
+++ htmlgen-2.2.2/htmlgen_patch
@@ -0,0 +1,62 @@
+*** HTMLgen.py.orig	2007-10-26 11:26:53.000000000 +0200
+--- HTMLgen.py	2007-10-26 11:26:49.000000000 +0200
+***************
+*** 1262,1267 ****
+--- 1262,1268 ----
+          type -- 'TEXT' (default) Supported types include password, checkbox,
+                        radio, file, submit, reset, hidden.
+          name -- provides the datum name
++         id -- global identifier
+          value -- the initial value of the input item
+          checked --  flag indicating if the item is checked initially
+          size -- size of the widget (e.g. size=10 for a text widget is it's width)
+***************
+*** 1286,1291 ****
+--- 1287,1293 ----
+      def __init__(self, **kw):
+          self.type = 'TEXT'
+          self.name = 'Default_Name'
++         self.id = None
+          self.value = None
+          self.checked = ''
+          self.size = 0
+***************
+*** 1313,1318 ****
+--- 1315,1321 ----
+          s.append('\n<INPUT')
+          if self.type: s.append(' TYPE="%s"' % self.type)
+          if self.name: s.append(' NAME="%s"' % self.name)
++         if self.id is not None: s.append(' ID="%s"' % self.id)
+          if self.value is not None: s.append(' VALUE="%s"' % self.value)
+          if self.checked: s.append(' CHECKED')
+          if self.size: s.append(' SIZE=%s' % self.size)
+***************
+*** 1340,1345 ****
+--- 1343,1349 ----
+      Keyword Arguments:
+      
+          name -- provides the datum name
++         id -- global identifier
+          size -- the visual size. 1 means use an option popup widget. 
+                                 >=2 means use a list widget with that many lines.
+          multiple -- flag to indicate whether multiple selections are supported.
+***************
+*** 1351,1356 ****
+--- 1355,1361 ----
+      def __init__(self, data=None, **kw):
+          UserList.UserList.__init__(self, data)
+          self.name = ''
++         self.id = None
+          self.size = 1
+          self.multiple = None
+          self.selected = []
+***************
+*** 1366,1371 ****
+--- 1371,1377 ----
+      def __str__(self):
+          s = ['<SELECT NAME="%s"' % self.name]
+          if self.size: s.append(' SIZE=%s' % self.size)
++         if self.id is not None: s.append(' ID="%s"' % self.id)
+          if self.multiple: s.append(' MULTIPLE')
+          if self.onBlur: s.append(' onBlur="%s"' % self.onBlur)
+          if self.onChange: s.append(' onChange="%s"' % self.onChange)