diff -u dmg2img-1.6.1/debian/changelog dmg2img-1.6.1/debian/changelog
--- dmg2img-1.6.1/debian/changelog
+++ dmg2img-1.6.1/debian/changelog
@@ -1,3 +1,11 @@
+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.1/debian/rules dmg2img-1.6.1/debian/rules
--- dmg2img-1.6.1/debian/rules
+++ dmg2img-1.6.1/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.1.orig/debian/patches/01-process_TERM_blocks_correctly_and_flush_debug_log.patch
+++ dmg2img-1.6.1/debian/patches/01-process_TERM_blocks_correctly_and_flush_debug_log.patch
@@ -0,0 +1,30 @@
+--- dmg2img-1.6.1/dmg2img.c	2010-03-25 04:21:34.756497421 +0000
++++ dmg2img-1.6.2/dmg2img.c	2010-03-24 20:42:45.000000000 +0000
+@@ -16,7 +16,7 @@
+  */
+ 
+ #define _FILE_OFFSET_BITS 64
+-#define VERSION "dmg2img v1.6.1 is derived from dmg2iso by vu1tur (to@vu1tur.eu.org)"
++#define VERSION "dmg2img v1.6.2 is derived from dmg2iso by vu1tur (to@vu1tur.eu.org)"
+ #define USAGE "\
+ Usage: dmg2img [-s] [-v] [-V] [-d] <input.dmg> [<output.img>]\n\
+ or     dmg2img [-s] [-v] [-V] [-d] -i <input.dmg> -o <output.img>\n\n\
+@@ -395,6 +395,7 @@
+ 					(unsigned long long)in_size,
+ 					sztype
+ 					);
++				fflush(FDBG);
+ 				bi++;
+ 			}
+ 			if (verbose >= 3)
+@@ -556,8 +557,8 @@
+ 					       (unsigned long long)out_offs,
+ 					       (unsigned long long)out_size, reserved);
+ 			} else if (block_type == BT_TERM) {
+-				if (in_offs == 0 && partnum > 0) {
+-					if (convert_char8((unsigned char *)parts[1].Data + 24) != 0)
++				if (in_offs == 0 && partnum > i+1) {
++					if (convert_char8((unsigned char *)parts[i+1].Data + 24) != 0)
+ 						in_offs_add = 0;
+ 				} else
+ 					in_offs_add = 0;