diff -Nru devscripts-2.10.26ubuntu4/debian/changelog devscripts-2.10.26ubuntu5/debian/changelog
--- devscripts-2.10.26ubuntu4/debian/changelog	2008-05-02 11:13:17.000000000 +0200
+++ devscripts-2.10.26ubuntu5/debian/changelog	2008-06-01 18:36:13.000000000 +0200
@@ -1,3 +1,9 @@
+devscripts (2.10.26ubuntu5) intrepid; urgency=low
+
+  * uupdate: appends -0ubuntu1 instead of -1 on Ubuntu (LP: #236526)
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Sun, 01 Jun 2008 16:15:29 +0200
+
 devscripts (2.10.26ubuntu4) intrepid; urgency=low
 
   * Document rmadison -u ubuntu as the default (LP: #152424).
diff -Nru devscripts-2.10.26ubuntu4/scripts/uupdate.sh devscripts-2.10.26ubuntu5/scripts/uupdate.sh
--- devscripts-2.10.26ubuntu4/scripts/uupdate.sh	2007-06-21 19:01:07.000000000 +0200
+++ devscripts-2.10.26ubuntu5/scripts/uupdate.sh	2008-06-01 20:28:36.000000000 +0200
@@ -107,6 +107,11 @@
 DEFAULT_UUPDATE_PRISTINE=yes
 DEFAULT_UUPDATE_SYMLINK_ORIG=yes
 VARS="UUPDATE_ROOTCMD UUPDATE_PRISTINE UUPDATE_SYMLINK_ORIG"
+SUFFIX="1"
+
+case "$(test -x /usr/bin/lsb_release && lsb_release --short --id 2>/dev/null)" in
+    "Ubuntu") SUFFIX="0ubuntu1" ;;
+esac
 
 if [ "$1" = "--no-conf" -o "$1" = "--noconf" ]; then
     shift
@@ -303,9 +308,9 @@
 	fi
 
 	if [ -n "$EPOCH" ]; then
-	    echo "New Release will be $EPOCH:$NEW_VERSION-1."
+	    echo "New Release will be $EPOCH:$NEW_VERSION-$SUFFIX."
 	else
-	    echo "New Release will be $NEW_VERSION-1."
+	    echo "New Release will be $NEW_VERSION-$SUFFIX."
 	fi
     fi
 
@@ -316,8 +321,8 @@
     fi
 
     # Sanity check
-    if dpkg --compare-versions "$NEW_VERSION-1" le "$VERSION"; then
-	echo "$PROGNAME: new version $NEW_VERSION-1 <= current version $VERSION; aborting!" >&2
+    if dpkg --compare-versions "$NEW_VERSION-$SUFFIX" le "$VERSION"; then
+	echo "$PROGNAME: new version $NEW_VERSION-$SUFFIX <= current version $VERSION; aborting!" >&2
 	exit 1
     fi
 
@@ -421,7 +426,7 @@
 	    STATUS=1
 	fi
 	chmod a+x debian/rules
-	debchange -v "$NEW_VERSION-1" "New upstream release"
+	debchange -v "$NEW_VERSION-$SUFFIX" "New upstream release"
 	echo "Remember: Your current directory is the OLD sourcearchive!"
 	echo "Do a \"cd ../$PACKAGE-$SNEW_VERSION\" to see the new package"
 	exit
@@ -491,9 +496,9 @@
 	fi
     fi
     if [ -n "$EPOCH" ]; then
-	echo "New Release will be $EPOCH:$NEW_VERSION-1."
+	echo "New Release will be $EPOCH:$NEW_VERSION-$SUFFIX."
     else
-	echo "New Release will be $NEW_VERSION-1."
+	echo "New Release will be $NEW_VERSION-$SUFFIX."
     fi
 
     # Strip epoch number
@@ -503,8 +508,8 @@
     fi
 
     # Sanity check
-    if dpkg --compare-versions "$NEW_VERSION-1" le "$VERSION"; then
-	echo "$PROGNAME: new version $NEW_VERSION-1 <= current version $VERSION; aborting!" >&2
+    if dpkg --compare-versions "$NEW_VERSION-$SUFFIX" le "$VERSION"; then
+	echo "$PROGNAME: new version $NEW_VERSION-$SUFFIX <= current version $VERSION; aborting!" >&2
 	exit 1
     fi
 
@@ -719,7 +724,7 @@
 	exit 1
     fi
     chmod a+x debian/rules
-    debchange -v "$NEW_VERSION-1" New upstream release
+    debchange -v "$NEW_VERSION-$SUFFIX" New upstream release
     echo "Remember: Your current directory is the OLD sourcearchive!"
     echo "Do a \"cd ../$PACKAGE-$SNEW_VERSION\" to see the new package"
 fi