* debian/copyright:

  - Update the postal address of the FSF.
  - Refer to /usr/share/common-licenses/GPL.
  - Add new download location.
* Makefile.am: Remove CVS directories from the generated tarball.
* schroot/schroot.conf.5.in: Correct .TH section from 1 to 5.
* Remove debian/conffiles, which is not required by debhelper.
* debian/control: Add buildd-tools developers to Uploaders,
  and remove unused ${misc:Depends}.
* debian/changelog: Update.

7 files changed, 48 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index fc76aded..0833c1c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2005-06-21  Roger Leigh  <rleigh@whinlatter.ukfsn.org>
+
+	* debian/copyright:
+	  - Update the postal address of the FSF.
+	  - Refer to /usr/share/common-licenses/GPL.
+	  - Add new download location. 
+
+	* Makefile.am: Remove CVS directories from the generated tarball.
+
+	* schroot/schroot.conf.5.in: Correct .TH section from 1 to 5.
+
+	* Remove debian/conffiles, which is not required by debhelper.
+
+	* debian/control: Add buildd-tools developers to
+	  Uploaders, and remove unused ${misc:Depends}.
+
+	* debian/changelog: Update.
+
 2005-06-21  Roger Leigh  <rleigh@debian.org>
 
 	* Add .cvsignore files to replace lost .arch-inventory files.
diff --git a/Makefile.am b/Makefile.am
index 8b1e3c13..a68adf6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,4 +21,8 @@
 
 SUBDIRS = schroot doc
 
+# Remove CVS directories from the generated tarball.
+dist-hook:
+	find $(distdir) -type d -name CVS -print0 | xargs -0 rm -rf
+
 EXTRA_DIST = debian
diff --git a/debian/changelog b/debian/changelog
index 6da1c037..f78c2250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
 schroot (0.1.1-1) unstable; urgency=low
 
   * New upstream release.
+  * Initial Debian release (Closes: #315104).
+  * debian/control:
+    - Add Add buildd-tools developers to Uploaders.
+    - Remove unused ${misc:Depends}.
+  * Remove debian/conffiles, which is redundant with current versions of
+    debhelper.
+  * debian/copyright:
+    - Update the postal address of the FSF.
+    - Refer to /usr/share/common-licenses/GPL.
+    - Add new download location.
 
- -- Roger Leigh <rleigh@debian.org>  Mon, 20 Jun 2005 23:47:36 +0100
+ -- Roger Leigh <rleigh@debian.org>  Tue, 21 Jun 2005 19:11:25 +0100
 
 schroot (0.1.0-1) unstable; urgency=low
 
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index 8c1f6d8b..00000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/schroot.conf
diff --git a/debian/control b/debian/control
index 54df293c..7dd8f818 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: schroot
 Section: admin
 Priority: optional
-Maintainer: Roger Leigh <rleigh@debian.org>
+Maintainer: Debian buildd-tools Developers <buildd-tools-devel@lists.alioth.debian.org>
+Uploaders: Michael Banck <mbanck@debian.org>, Roger Leigh <rleigh@debian.org>, Francesco Paolo Lovergine <frankie@debian.org>
 Build-Depends: debhelper (>= 4.0.0), autotools-dev, libpam0g-dev, libglib2.0-dev
 Standards-Version: 3.6.1
 
 Package: schroot
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Description: Execute commands in a chroot environment
  schroot allows users to execute commands or interactive shells
  in different chroots.  Any number of named chroots may be
diff --git a/debian/copyright b/debian/copyright
index 6ff2b8c4..045db171 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,11 @@
 This package was debianized by Roger Leigh <rleigh@debian.org> on
 Sun, 19 Jun 2005 15:11:58 +0100.
 
-It was downloaded from a local schroot arch repository.
+schroot is maintained by the Debian buildd-tools project.  It was
+downloaded from
+:pserver:anonymous@cvs.alioth.debian.org:/cvsroot/buildd-tools
+(module "schroot").  Full instructions are available here:
+https://alioth.debian.org/scm/?group_id=30471
 
 Copyright Holder: Roger Leigh <rleigh@debian.org>
 
@@ -19,4 +23,9 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+USA
+
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
diff --git a/schroot/schroot.conf.5.in b/schroot/schroot.conf.5.in
index 17ffbc45..9af46b5b 100644
--- a/schroot/schroot.conf.5.in
+++ b/schroot/schroot.conf.5.in
@@ -13,7 +13,7 @@
 .\" 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-.TH SCHROOT.CONF 1 "17 Jun 2005" "Version @VERSION@" "Debian sbuild"
+.TH SCHROOT.CONF 5 "17 Jun 2005" "Version @VERSION@" "Debian sbuild"
 .SH NAME
 schroot.conf \- chroot definition file for schroot
 .SH DESCRIPTION