diff -u binutils-2.23.1/debian/changelog binutils-2.23.1/debian/changelog
--- binutils-2.23.1/debian/changelog
+++ binutils-2.23.1/debian/changelog
@@ -1,3 +1,14 @@
+binutils (2.23.1-0ubuntu3) raring; urgency=low
+
+  * debian/control.in: Drop Vcs-*, that branch hasn't been updated since
+    natty.
+  * Add simple rebuild autopkgtest. (LP: #1081500)
+  * Add a simple test to compile, link, and run a program against libc6 and
+    build/use a shared library with the system-installed binutils, to ensure
+    basic binutils functionality.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 22 Nov 2012 07:49:25 +0100
+
 binutils (2.23.1-0ubuntu2) raring; urgency=low
 
   * Update from the 2.23 branch (20121121).
diff -u binutils-2.23.1/debian/control binutils-2.23.1/debian/control
--- binutils-2.23.1/debian/control
+++ binutils-2.23.1/debian/control
@@ -6,8 +6,7 @@
 Uploaders: James Troup <james@nocrew.org>, Daniel Jacobowitz <dan@debian.org>
 Standards-Version: 3.9.4
 Build-Depends: dpkg-dev (>= 1.13.9), autoconf (>= 2.64), bison, flex, gettext:any, texinfo, dejagnu (>= 1.4.2-1.1), quilt, file, xz-utils, lsb-release, zlib1g-dev, g++
-Vcs-Browser: https://code.launchpad.net/~ubuntu-core-dev/binutils/pkg-ubuntu
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/binutils/pkg-ubuntu
+XS-Testsuite: autopkgtest
 
 Package: binutils
 Architecture: any
diff -u binutils-2.23.1/debian/control.in binutils-2.23.1/debian/control.in
--- binutils-2.23.1/debian/control.in
+++ binutils-2.23.1/debian/control.in
@@ -6,8 +6,7 @@
 Uploaders: James Troup <james@nocrew.org>, Daniel Jacobowitz <dan@debian.org>
 Standards-Version: 3.9.4
 Build-Depends: dpkg-dev (>= 1.13.9), autoconf (>= 2.64), bison, flex, gettext:any, texinfo, dejagnu (>= 1.4.2-1.1), quilt, file, xz-utils, lsb-release, zlib1g-dev, g++
-Vcs-Browser: https://code.launchpad.net/~ubuntu-core-dev/binutils/pkg-ubuntu
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/binutils/pkg-ubuntu
+XS-Testsuite: autopkgtest
 
 Package: binutils
 Architecture: any
only in patch2:
unchanged:
--- binutils-2.23.1.orig/debian/tests/build
+++ binutils-2.23.1/debian/tests/build
@@ -0,0 +1 @@
+#!/bin/true
only in patch2:
unchanged:
--- binutils-2.23.1.orig/debian/tests/libc-link
+++ binutils-2.23.1/debian/tests/libc-link
@@ -0,0 +1,29 @@
+#!/bin/sh
+# autopkgtest check: Build and run a simple program against libc, to verify
+# basic binutils compile-time and run-time linking functionality.
+#
+# (C) 2012 Canonical Ltd.
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+
+set -e
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > libctest.c
+#include <string.h>
+#include <assert.h>
+
+int main()
+{
+    assert (1 > 0);
+    assert (strcmp ("hello", "hello") == 0);
+    return 0;
+}
+EOF
+
+gcc -o libctest libctest.c
+echo "build: OK"
+[ -x libctest ]
+./libctest
+echo "run: OK"
only in patch2:
unchanged:
--- binutils-2.23.1.orig/debian/tests/shlib-build
+++ binutils-2.23.1/debian/tests/shlib-build
@@ -0,0 +1,44 @@
+#!/bin/sh
+# autopkgtest check: Build and link against a simple shared library, to test
+# basic binutils compile-time and run-time linking functionality.
+#
+# (C) 2012 Canonical Ltd.
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+
+set -e
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > testlib.c
+
+int ultimate_answer()
+{
+    return 42;
+}
+EOF
+
+gcc -Wall -Werror -shared -o libultimate.so testlib.c
+echo "library build: OK"
+
+# should export the symbol
+nm -D libultimate.so | grep -q 'T ultimate_answer'
+
+# link it against a program
+cat <<EOF > testprog.c
+#include <assert.h>
+
+int ultimate_answer();
+
+int main()
+{
+    assert (ultimate_answer() == 42);
+    return 0;
+}
+EOF
+
+gcc -Wall -Werror -L . -o testprog testprog.c -lultimate
+echo "program build: OK"
+[ -x testprog ]
+LD_LIBRARY_PATH=. ./testprog
+echo "run: OK"
only in patch2:
unchanged:
--- binutils-2.23.1.orig/debian/tests/control
+++ binutils-2.23.1/debian/tests/control
@@ -0,0 +1,9 @@
+Tests: build
+Depends:
+Restrictions: build-needed
+
+Tests: libc-link
+Depends: build-essential
+
+Tests: shlib-build
+Depends: build-essential