--- metastore-1.orig/metastore.c
+++ metastore-1/metastore.c
@@ -203,7 +203,7 @@
 usage(const char *arg0, const char *message)
 {
 	if (message)
-		msg(MSG_CRITICAL, "%s: %s\n\n", arg0, msg);
+		msg(MSG_CRITICAL, "%s: %s\n\n", arg0, message);
 	msg(MSG_CRITICAL, "Usage: %s ACTION [OPTION...] [PATH...]\n\n", arg0);
 	msg(MSG_CRITICAL, "Where ACTION is one of:\n"
 	    "  -c, --compare\tShow differences between stored and real metadata\n"
--- metastore-1.orig/metastore.1
+++ metastore-1/metastore.1
@@ -16,7 +16,7 @@
 .\"
 .SH ACTIONS
 .TP
-.B -d, --diff
+.B -c, --compare
 Shows the difference between the stored and real metadata.
 .TP
 .B -s, --save
@@ -39,7 +39,7 @@
 once for even less verbosity.
 .TP
 .B -m, --mtime
-Causes metastore to also take mtime into account for the diff or apply actions.
+Causes metastore to also take mtime into account for the compare or apply actions.
 .\"
 .SH PATHS
 If no path is specified, metastore will use the current directory as the basis
--- metastore-1.orig/debian/control
+++ metastore-1/debian/control
@@ -1,11 +1,12 @@
 Source: metastore
 Section: misc
 Priority: optional
-Maintainer: David Härdeman <david@hardeman.nu>
+Maintainer: Joey Hess <joeyh@debian.org>
+Uploaders: David Härdeman <david@hardeman.nu>
 Build-Depends: debhelper (>= 5.0.0), libattr1-dev
-Standards-Version: 3.7.2.2
-XS-Vcs-Git: git://git.hardeman.nu/metastore.git
-XS-Vcs-Browser: http://git.hardeman.nu/?p=metastore.git;a=summary
+Standards-Version: 3.7.2
+Vcs-Git: git://git.kitenet.net/joey/packages/metastore
+Homepage: http://david.hardeman.nu/software.php
 
 Package: metastore
 Section: misc
--- metastore-1.orig/debian/copyright
+++ metastore-1/debian/copyright
@@ -1,3 +1,6 @@
+metastore was downloaded from the git repository at
+git://git.hardeman.nu/metastore.git
+
 Copyright (c) 2007 David Härdeman <david@hardeman.nu>
 
 License:
--- metastore-1.orig/debian/rules
+++ metastore-1/debian/rules
@@ -29,8 +29,8 @@
 	touch build-stamp
 
 clean:
-	-$(MAKE) clean
-	dh_clean
+	$(MAKE) clean
+	dh_clean build-stamp configure-stamp
 
 install: build
 	dh_testdir
--- metastore-1.orig/debian/changelog
+++ metastore-1/debian/changelog
@@ -1,3 +1,22 @@
+metastore (1-2~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild against etch
+
+ -- Frank Lichtenheld <djpig@debian.org>  Tue, 27 Nov 2007 16:56:57 +0100
+
+metastore (1-2) unstable; urgency=low
+
+  * Fix man page to document --compare. Closes: #451313
+  * Correct display of usage message.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 15 Nov 2007 12:11:25 -0500
+
+metastore (1-1) unstable; urgency=low
+
+  * Initial upload to Debian.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Nov 2007 23:01:52 -0500
+
 metastore (1) unstable; urgency=low
 
   * Initial release.