diff -u aptoncd-0.1.98/debian/changelog aptoncd-0.1.98/debian/changelog
--- aptoncd-0.1.98/debian/changelog
+++ aptoncd-0.1.98/debian/changelog
@@ -1,3 +1,17 @@
+aptoncd (0.1.98-0ubuntu3) intrepid; urgency=low
+
+  * APTonCD/core/scanpkgs.py: fix creation of package index by reading
+    everything apt-ftparchive tells us (LP: #159721)
+  * debian/rules: remove some more temporary stuff
+  * debian/control: fix a lintian warning by only depending on genisoimage
+    instead of genisoimage | mkisofs. Tighten the debhelper build-dep because
+    of dh_icons
+  * setup.py: don't add the debian revision number to the application version
+  * data/aptoncd.desktop.in: updated to match the latest desktop entry spec
+  * added watch file
+
+ -- Kjell Braden <fnord@pentabarf.de>  Mon, 30 Jun 2008 16:36:55 +0200
+
 aptoncd (0.1.98-0ubuntu2) intrepid; urgency=low
 
   * APTonCD/core/dbus_helper.py: fix dbus 1.1.20 interface requirements
diff -u aptoncd-0.1.98/debian/rules aptoncd-0.1.98/debian/rules
--- aptoncd-0.1.98/debian/rules
+++ aptoncd-0.1.98/debian/rules
@@ -29,13 +29,19 @@
 clean: 
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp $(PYVERS:%=build-python%)
 
 	#python ./setup.py clean --all
 	find . -name ".svn" -exec rm -fr {} \;
 	find . -name ".bzr" -exec rm -fr {} \;
 	find . -name "*.pyc" -exec rm {} \;
 
+	# remove binary translation files
+	find . -name "*.mo" -delete
+
+	# remove temporary build files
+	rm -rf build
+
 	dh_clean 
 
 install: build
diff -u aptoncd-0.1.98/debian/control aptoncd-0.1.98/debian/control
--- aptoncd-0.1.98/debian/control
+++ aptoncd-0.1.98/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 XS-Python-Version: all
 Maintainer: Rafael Proença <cypherbios@ubuntu.com>
-Build-Depends: debhelper (>= 5.0.38), python-distutils-extra, python-central (>= 0.5.6), python-all-dev
+Build-Depends: debhelper (>= 5.0.51~), python-distutils-extra, python-central (>= 0.5.6), python-all-dev
 Standards-Version: 3.7.3
 
 Package: aptoncd
@@ -11,7 +11,7 @@
 XB-Python-Version: ${python:Versions}
 Recommends: nautilus-cd-burner | k3b, yelp
 Suggests: update-notifier
-Depends: ${python:Depends}, libgnomevfs2-0, genisoimage | mkisofs, apt-utils, synaptic (>= 0.57.7), python-gnome2, python-apt, python-glade2, python-dbus, lsb-release, gksu, python-gtk2, gnome-icon-theme
+Depends: ${python:Depends}, libgnomevfs2-0, genisoimage, apt-utils, synaptic (>= 0.57.7), python-gnome2, python-apt, python-glade2, python-dbus, lsb-release, gksu, python-gtk2, gnome-icon-theme
 Description: Installation disc creator for packages downloaded via APT
  APT removable repository creator and package backup tool for Debian based
  systems.
only in patch2:
unchanged:
--- aptoncd-0.1.98.orig/setup.py
+++ aptoncd-0.1.98/setup.py
@@ -13,7 +13,7 @@
 changelog = "debian/changelog"
 if os.path.exists(changelog):
     head=open(changelog).readline()
-    match = re.compile(".*\((.*)\).*").match(head)
+    match = re.compile(".*\((.*?)(-.*)\).*").match(head)
     if match:
         version = match.group(1)
         f=open("APTonCD/core/version.py","w")
only in patch2:
unchanged:
--- aptoncd-0.1.98.orig/APTonCD/core/scanpkgs.py
+++ aptoncd-0.1.98/APTonCD/core/scanpkgs.py
@@ -43,12 +43,10 @@
         is written to the isofile path. mkisofs is called with option -r.
         See the mkisofs manual for details"""
         args = command
-        process = Popen(args, 1, stdout=PIPE, stderr=PIPE, cwd = path, shell = True )
-        self.retval = process.poll()
         inFile = open(destination,'w')
+        process = Popen(args, 1, stdout=inFile, stderr=PIPE, cwd = path, shell = True )
+        self.retval = process.poll()
         while (self.retval is None):
-            output = process.stdout.readline()
-            inFile.write(output)
             self._set_progress(-1)
             self.report_progress()
             self.retval = process.poll()
only in patch2:
unchanged:
--- aptoncd-0.1.98.orig/data/aptoncd.desktop.in
+++ aptoncd-0.1.98/data/aptoncd.desktop.in
@@ -3,11 +3,10 @@
 _GenericName=Package Backup Tool
 _Comment=Create a Installation Disc
 Version=1.0
-Encoding=UTF-8
 Icon=aptoncd
 Exec=/usr/bin/aptoncd
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Application;System;Settings
+Categories=System;Settings;
 X-Ubuntu-Gettext-Domain=aptoncd
only in patch2:
unchanged:
--- aptoncd-0.1.98.orig/debian/watch
+++ aptoncd-0.1.98/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/aptoncd/aptoncd-(.*)\.tar\.gz