Merge debian/ changes from Debian.

* New maintainer.
* Switch (back) to a minimal rules files; restores missing examples.
* Switch to source format 3.0 (quilt).
* Add debian/watch.
* Bump Standards-Version to 3.9.1, no changes needed.

10 files changed, 110 insertions, 93 deletions

diff --git a/debian/changelog b/debian/changelog
index 1a1d288..31775e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,70 @@
+metastore (1+20080623+debian-2) unstable; urgency=low
+
+  * New maintainer (closes: #540588).
+  * Fix getopt parsing of -f (closes: #594134).
+  * Remove prompting from example Git pre-commit hook (closes: #469250);
+    hooks now run with stdin closed (since Git version 1.5.4) and
+    prompting will not work when using a high-level interface such as
+    git-gui or Emacs anyway.
+  * Switch (back) to a minimal rules files; restores missing examples.
+  * Switch to source format 3.0 (quilt).
+  * Add debian/watch.
+  * Bump Standards-Version to 3.9.1, no changes needed.
+
+ -- Romain Francoise <rfrancoise@debian.org>  Sun, 12 Sep 2010 10:56:36 +0200
+
+metastore (1+20080623+debian-1) unstable; urgency=low
+
+  * Orphaning package.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 09 Aug 2009 01:16:56 +0200
+
+metastore (1+20080623+debian) unstable; urgency=low
+
+  * New maintainer (Closes: #486897).
+  * New upstream checkout, tarball built without debian directory.
+  * Replacing package descriptions with text from Davids homepage.
+  * Upgrading package to standards 3.8.0.
+  * Seting correct value for homepage field.
+  * Adding ${misc:depends} to depends.
+  * Adding/Updating vcs fields.
+  * Rewriting copyright in machine-interpretable format.
+  * Removing unused dirs debhelper.
+  * Rewriting rules file in traditional way.
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 19 Sep 2008 13:06:00 +0200
+
+metastore (1-4) unstable; urgency=low
+
+  * debhelper v7; rules file minimisation
+  * Orphaned the package.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 18 Jun 2008 16:16:15 -0400
+
+metastore (1-3) unstable; urgency=low
+
+  * detect nonexistant users/groups and print a warning message that
+    includes the pathname
+  * Merge upstream changes through ed7e4217e2eae466bab88cd425c71ac22a0340c5:
+    - First stab at supporting the option of automatically creating empty
+      directories which are missing. Closes: #460998
+    - Detect whether the underlying FS supports xattrs. Closes: #470184
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 20 Mar 2008 21:34:51 -0400
+
+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.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1008453..6be8f49 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,21 @@
 Source: metastore
 Section: misc
 Priority: optional
-Maintainer: 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
+Maintainer: Romain Francoise <rfrancoise@debian.org>
+Uploaders: David Härdeman <david@hardeman.nu>
+Build-Depends: debhelper (>= 7), libattr1-dev
+Standards-Version: 3.9.1
+Homepage: http://david.hardeman.nu/software.php
 
 Package: metastore
-Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: Store and restore metadata
- This package contains the metastore tool to store and restore metadata
- from a filesystem.
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Store and restore metadata from a filesystem
+ metastore is a tool to store the metadata of files/directories/links in a file
+ tree to a separate file and to later compare and apply the stored metadata to
+ said file tree.
+ .
+ The tool was written as a supplement to git which does not store all metadata,
+ making it unsuitable for e.g. storing /etc in a repo. metastore could also be
+ helpful if you want to create a tarball of a file tree and make sure that
+ "everything" (e.g. xattrs, mtime, owner, group) is stored along with the files.
diff --git a/debian/copyright b/debian/copyright
index ecc3020..aa716a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,22 @@
-Copyright (c) 2007 David Härdeman <david@hardeman.nu>
+Author: David Härdeman <david@hardeman.nu>
+Download: http://david.hardeman.nu/software.php
 
-License:
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License 
-can be found in `/usr/share/common-licenses/GPL'.
+Files: *
+Copyright: (C) 2007-2008 David Härdeman <david@hardeman.nu>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 98d1583..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff --git a/debian/metastore.docs b/debian/metastore.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/metastore.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/metastore.examples b/debian/metastore.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/metastore.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/rules b/debian/rules
index b424dfc..cbe925d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,3 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	-$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/metastore
-
-binary: binary-arch binary-indep
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples examples/git-metapull examples/pre-commit
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-# Nothing to do
-
-.PHONY: configure build clean install binary binary-arch binary-indep
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0fbb761
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1 @@
+# Upstream does not release tarballs.