Minor changes for package building

* I'm the new Maintainer (Closes: #414621)
* build package with cdbs
* add XS-Vcs tags to git archive
* move python-dev and python-support to B-Depends (instead of B-D-I) to clam
  lintian

18 files changed, 58 insertions, 43 deletions

diff --git a/debian/changelog b/debian/changelog
index 271200c..a9204b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-mini-dinstall (0.6.21-0.3) unstable; urgency=low
+mini-dinstall (0.6.22) unstable; urgency=low
 
+  [ Guido Guenther ]
   * UNRELEASED
   * Create the release files in the correct subdirs with archive-style =
     simple-subdir so it works with secure-apt (Closes: #343371)
 
- -- Guido Guenther <agx@sigxcpu.org>  Sun, 23 Sep 2007 12:23:43 +0200
+  [ Christoph Goehre ]
+  * I'm the new Maintainer (Closes: #414621)
+  * build package with cdbs
+  * add XS-Vcs tags to git archive
+  * move python-dev and python-support to B-Depends (instead of B-D-I) to clam
+    lintian
+
+ -- Christoph Goehre <christoph.goehre@gmx.de>  Sun, 30 Sep 2007 17:51:10 +0200
 
 mini-dinstall (0.6.21-0.2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d17fe78..9643c4c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,12 @@
 Source: mini-dinstall
 Priority: optional
 Section: devel
-Maintainer: Thomas Viehmann <tv@beamnet.de>
-Build-Depends: debhelper (>= 4.1.25)
-Build-Depends-Indep: python-dev, python-support (>= 0.3)
+Maintainer: Christoph Goehre <christoph.goehre@gmx.de>
+Uploaders: Guido Guenther <agx@sigxcpu.org>
+Build-Depends: cdbs, debhelper (>= 4.1.25), python-dev, python-support (>= 0.3)
 Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/mini-dinstall/mini-dinstall.git
+XS-Vcs-Browser: http://git.debian.org/?p=mini-dinstall/mini-dinstall.git
 
 Package: mini-dinstall
 Architecture: all
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..846db09
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+doc/mini-dinstall.1
diff --git a/debian/rules b/debian/rules
index 71a1e53..3d6bcd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,44 +3,15 @@
 # Sample debian/rules that uses debhelper. 
 # This file is public domain software, originally written by Joey Hess.
 
-build:
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-lib/version.py: debian/changelog
-	echo "pkg_version = \"`dpkg-parsechangelog | awk '/^Version:/ { print $$2 }'`\"" > lib/version.py
+DEB_PYTHON_SYSTEM=pysupport
 
-clean: lib/version.py
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	dh_clean
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=debian/mini-dinstall
+update-version:
+	echo "pkg_version = \"$(DEB_UPSTREAM_VERSION)\"" > minidinstall/version.py
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	dh_python
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: update-version
diff --git a/lib/version.py b/lib/version.py
deleted file mode 100644
index 250e04b..0000000
--- a/lib/version.py
+++ /dev/null
@@ -1 +0,0 @@
-pkg_version = "0.6.21-0.2"
diff --git a/lib/ChangeFile.py b/minidinstall/ChangeFile.py
index b74e623..b74e623 100644
--- a/lib/ChangeFile.py
+++ b/minidinstall/ChangeFile.py
diff --git a/lib/DebianSigVerifier.py b/minidinstall/DebianSigVerifier.py
index d441a58..d441a58 100644
--- a/lib/DebianSigVerifier.py
+++ b/minidinstall/DebianSigVerifier.py
diff --git a/lib/Dnotify.py b/minidinstall/Dnotify.py
index 122e03c..122e03c 100644
--- a/lib/Dnotify.py
+++ b/minidinstall/Dnotify.py
diff --git a/lib/DpkgControl.py b/minidinstall/DpkgControl.py
index 38147c7..38147c7 100755
--- a/lib/DpkgControl.py
+++ b/minidinstall/DpkgControl.py
diff --git a/lib/DpkgDatalist.py b/minidinstall/DpkgDatalist.py
index 0c11612..0c11612 100644
--- a/lib/DpkgDatalist.py
+++ b/minidinstall/DpkgDatalist.py
diff --git a/lib/GPGSigVerifier.py b/minidinstall/GPGSigVerifier.py
index 78aeebb..78aeebb 100644
--- a/lib/GPGSigVerifier.py
+++ b/minidinstall/GPGSigVerifier.py
diff --git a/lib/OrderedDict.py b/minidinstall/OrderedDict.py
index fa3f276..fa3f276 100644
--- a/lib/OrderedDict.py
+++ b/minidinstall/OrderedDict.py
diff --git a/lib/SafeWriteFile.py b/minidinstall/SafeWriteFile.py
index 1777d36..1777d36 100755
--- a/lib/SafeWriteFile.py
+++ b/minidinstall/SafeWriteFile.py
diff --git a/lib/SignedFile.py b/minidinstall/SignedFile.py
index 648186e..648186e 100755
--- a/lib/SignedFile.py
+++ b/minidinstall/SignedFile.py
diff --git a/lib/__init__.py b/minidinstall/__init__.py
index 8b13789..8b13789 100644
--- a/lib/__init__.py
+++ b/minidinstall/__init__.py
diff --git a/lib/misc.py b/minidinstall/misc.py
index eb52d00..eb52d00 100644
--- a/lib/misc.py
+++ b/minidinstall/misc.py
diff --git a/minidinstall/version.py b/minidinstall/version.py
new file mode 100644
index 0000000..545a8ba
--- /dev/null
+++ b/minidinstall/version.py
@@ -0,0 +1 @@
+pkg_version = "0.6.22"
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..13d80a5
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+#
+#  setup.py - [ install script for mini-dinstall ]
+#  Copyright (c) 2007 Christoph Goehre <christoph.goehre@gmx.de>
+#
+#  This file is part of the mini-dinstall package.
+#
+#  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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+#
+
+from distutils.core import setup
+
+setup(name = 'mini-dinstall',
+      author = 'Colin Walters',
+      author_email = 'walters@debian.org',
+      maintainer = 'Christoph Goehre',
+      maintainer_email = 'christoph.goehre@gmx.de',
+      scripts = [ 'mini-dinstall' ],
+      packages = [ 'minidinstall' ],
+      url = 'http://alioth.debian.org/projects/mini-dinstall/',
+)