Merge lp:~logan/ubuntu/raring/tandem-mass/20121001-2ubuntu1 into lp:ubuntu/raring/tandem-mass

[Logan Rosen]

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-16 16:39:31 +0000
+++ debian/changelog	2013-02-21 20:01:20 +0000
@@ -1,3 +1,20 @@
+tandem-mass (20121001-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/rules: Remove bin/*.exe at clean time to ensure Windows binaries
+      don't get shipped in any form.
+
+ -- Logan Rosen <[e-mail]>  Thu, 21 Feb 2013 14:54:41 -0500
+
+tandem-mass (20121001-2) unstable; urgency=low
+
+  * Fix the target build-stamp by adding the $(QUILT_STAMPFN)
+    dependency. This missing dependency seemingly caused problems in
+    Ubuntu (as reported by Tim Gardner <[e-mail]>;
+    Closes: #695553). Thanks Tim.
+
+ -- Filippo Rusconi <[e-mail]>  Wed, 16 Jan 2013 21:26:08 +0100
+
 tandem-mass (20121001-1ubuntu2) raring; urgency=low
 
   * Revert previous change to debian/tandem-mass.install.

=== modified file 'debian/control'
--- debian/control	2013-01-09 20:32:51 +0000
+++ debian/control	2013-02-21 20:01:20 +0000
@@ -10,6 +10,8 @@
                quilt (>= 0.60-2),
                libexpat1-dev (>= 2.0.1)
 Homepage: http://www.thegpm.org/TANDEM/
+Vcs-Git: git://git.debian.org/git/debichem/packages/tandem-mass.git
+Vcs-Browser: http://git.debian.org/?p=debichem/packages/tandem-mass.git
 
 Package: tandem-mass
 Architecture: any

=== modified file 'debian/rules'
--- debian/rules	2013-01-16 16:39:31 +0000
+++ debian/rules	2013-02-21 20:01:20 +0000
@@ -20,7 +20,7 @@
 build: build-stamp
 
 
-build-stamp: patch
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	dh_prep