diff -Nru /tmp/scyyivdjXN/devscripts-2.9.27ubuntu6/debchange.pl /tmp/G7p6JiCdcI/devscripts-2.9.27ubuntu7/debchange.pl
--- /tmp/scyyivdjXN/devscripts-2.9.27ubuntu6/debchange.pl	2007-01-26 23:10:21.000000000 +0100
+++ /tmp/G7p6JiCdcI/devscripts-2.9.27ubuntu7/debchange.pl	2007-01-31 01:57:54.000000000 +0100
@@ -814,7 +814,7 @@
 	if ($VERSION =~ /(.*?)([a-yA-Y][a-zA-Z]*|\d+)$/i) {
 	    my $end=$2;
 	    my $start=$1;
-	    if ($distributor ne 'Ubuntu' || $start =~ /(build|ubuntu)(\d+\.)*$/) {
+	    if ($distributor ne 'Ubuntu' || $start =~ /(build|ubuntu|prop(osed)?)(\d+\.)*$/) {
 		# If it's not already an NMU make it so
 		# otherwise we can be safe if we behave like dch -i
 		if ($opt_n and not $start =~ /\.$/) {
@@ -822,6 +822,8 @@
 		} else {
 		    $end++;
 		}
+		# keep distribution if it is a proposed package
+                $DISTRIBUTION=$changelog{'Distribution'} if $start =~ /prop(osed)?(\d+\.)*$/;
 	    } else {
 		$end .= "ubuntu1";
 	    }
diff -Nru /tmp/scyyivdjXN/devscripts-2.9.27ubuntu6/debian/changelog /tmp/G7p6JiCdcI/devscripts-2.9.27ubuntu7/debian/changelog
--- /tmp/scyyivdjXN/devscripts-2.9.27ubuntu6/debian/changelog	2007-01-26 23:11:56.000000000 +0100
+++ /tmp/G7p6JiCdcI/devscripts-2.9.27ubuntu7/debian/changelog	2007-01-31 02:04:08.000000000 +0100
@@ -1,3 +1,12 @@
+devscripts (2.9.27ubuntu7) feisty; urgency=low
+
+  * test/debchange.pl: Add test case for versions ending in ~prop1 or
+    ~proposed1
+  * debchanges.pl: Fix increment for those versions and keep the distribution
+    of the last changelog entry.
+
+ -- Michael Bienia <geser@ubuntu.com>  Wed, 31 Jan 2007 01:59:35 +0100
+
 devscripts (2.9.27ubuntu6) feisty; urgency=low
 
   * debchange.pl: Allow repeated decimals in trailing version.
diff -Nru /tmp/scyyivdjXN/devscripts-2.9.27ubuntu6/test/debchange.pl /tmp/G7p6JiCdcI/devscripts-2.9.27ubuntu7/test/debchange.pl
--- /tmp/scyyivdjXN/devscripts-2.9.27ubuntu6/test/debchange.pl	2007-01-26 23:09:46.000000000 +0100
+++ /tmp/G7p6JiCdcI/devscripts-2.9.27ubuntu7/test/debchange.pl	2007-01-31 01:49:43.000000000 +0100
@@ -47,6 +47,8 @@
     '0.45-2ubuntu3' => '0.45-2ubuntu4',
     '0.45-2ubuntu3.1' => '0.45-2ubuntu3.2',
     '0.45-2ubuntu3.1.0' => '0.45-2ubuntu3.1.1',
+    '1.2-3ubuntu0.1~prop1' => '1.2-3ubuntu0.1~prop2',
+    '1.2-3ubuntu0.1~proposed1' => '1.2-3ubuntu0.1~proposed2',
 );
 
 my $fail=0;