diff -u dmg2img-1.6.2/debian/control dmg2img-1.6.2/debian/control
--- dmg2img-1.6.2/debian/control
+++ dmg2img-1.6.2/debian/control
@@ -1,12 +1,13 @@
 Source: dmg2img
 Section: utils
 Priority: optional
-Maintainer: Soeren Sonnenburg <sonne@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Soeren Sonnenburg <sonne@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), libssl-dev, zlib1g-dev, libbz2-dev
 Standards-Version: 3.8.4
 Homepage:  http://advancemame.sourceforge.net/boot-readme.html
-Vcs-Svn: https://bollin.googlecode.com/svn/dmg2img/trunk/
-Vcs-Browser: http://vu1tur.eu.org/tools/
+XS-Debian-Vcs-Svn: https://bollin.googlecode.com/svn/dmg2img/trunk/
+XS-Debian-Vcs-Browser: http://vu1tur.eu.org/tools/
 
 Package: dmg2img
 Architecture: any
diff -u dmg2img-1.6.2/debian/changelog dmg2img-1.6.2/debian/changelog
--- dmg2img-1.6.2/debian/changelog
+++ dmg2img-1.6.2/debian/changelog
@@ -1,3 +1,10 @@
+dmg2img (1.6.2-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian, remaining changes:
+    - Enable debug symbols to be included in -dbgsym package
+
+ -- Stefano Rivera <stefano@rivera.za.net>  Mon, 24 May 2010 11:43:41 +0200
+
 dmg2img (1.6.2-1) unstable; urgency=low
 
   * New upstream version.
@@ -6,6 +13,20 @@
 
  -- Soeren Sonnenburg <sonne@debian.org>  Sun, 28 Mar 2010 21:45:36 +0200
 
+dmg2img (1.6.1-1ubuntu2) lucid; urgency=low
+
+  * Enable debug symbols to be included in -dbgsym package (LP: #546108)
+
+ -- TJ <ubuntu@tjworld.net>  Thu, 25 Mar 2010 07:00:00 +0000
+
+dmg2img (1.6.1-1ubuntu1) lucid; urgency=low
+
+  * debian/rules: Add simple patchsys to CDBS packaging
+  * Fix segmentation fault caused by incorrect terminator block handling
+     - backported from upstream 1.6.2 (LP: #546154)
+
+ -- TJ <ubuntu@tjworld.net>  Thu, 25 Mar 2010 05:00:00 +0000
+
 dmg2img (1.6.1-1) unstable; urgency=low
 
   * Initial Release (Closes: #552246)
diff -u dmg2img-1.6.2/debian/rules dmg2img-1.6.2/debian/rules
--- dmg2img-1.6.2/debian/rules
+++ dmg2img-1.6.2/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 build-arch: debian/build-stamp
 debian/build-stamp:
only in patch2:
unchanged:
--- dmg2img-1.6.2.orig/debian/patches/01-retain-debug-symbols-for-packaging-dbgsym.patch
+++ dmg2img-1.6.2/debian/patches/01-retain-debug-symbols-for-packaging-dbgsym.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile b/Makefile
+index 501e046..e7ab0ef 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,11 @@
+ #CC = gcc
+-CFLAGS = -O2 -Wall
++CFLAGS = -O2 -Wall -g
+ BIN_DIR = ${DESTDIR}/usr/bin
+ 
+ all: dmg2img vfdecrypt 
+ 
+ dmg2img: dmg2img.c dmg2img.h mntcmd.h gpt.h dmg2img.o base64.o adc.o 
+-	$(CC) -s -o dmg2img dmg2img.o base64.o adc.o -L. -lz -lbz2
++	$(CC) -o dmg2img dmg2img.o base64.o adc.o -L. -lz -lbz2
+ 
+ dmg2img.o: dmg2img.c dmg2img.h
+ 	$(CC) $(CFLAGS) -c dmg2img.c
+@@ -17,7 +17,7 @@
+ 	$(CC) $(CFLAGS) -c adc.c
+ 
+ vfdecrypt: vfdecrypt.c
+-	$(CC) $(CFLAGS) -s -o vfdecrypt vfdecrypt.c -lcrypto
++	$(CC) $(CFLAGS) -o vfdecrypt vfdecrypt.c -lcrypto
+ 
+ install: dmg2img vfdecrypt
+ 	mkdir -p ${BIN_DIR}