[SCM] Debian packaging for bibutils branch, master, updated. upstream/4.5-81-g6fbbf2b

David Bremner bremner at unb.ca
Fri Dec 10 03:56:21 UTC 2010


The following commit has been merged in the master branch:
commit 6b863bbd7d08a56ece7b484705c3ed5515bac062
Author: David Bremner <bremner at unb.ca>
Date:   Thu Dec 2 08:46:27 2010 -0400

    remove topgit; last patch is obsolete, and topgit seems like overkill
    for one patch anyway. Switch to 3.0 (quilt) source format, remove build dep on quilt and libtool

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index cfcc72b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,21 +0,0 @@
-Building bibutils for Debian
---------------------------
-
-The bibutils source package uses quilt to apply and remove its patches. Please
-refer to /usr/share/doc/quilt/README.source for information about how to use
-quilt for source packages.
-
-The quilt series is generated from the Git repository,  using topgit.
-This process is documented in /usr/share/doc/topgit/HOWTO-tg2quilt.gz if
-the topgit package is installed.
-
-The bibutils package uses the branch layout described in HOWTO-tg2quilt.gz
-
-The original source tarballs are stored in the git repo using
-pristine-tar.  You can check out the current tarball by
-
-    git branch pristine-tar origin/pristine-tar
-    # UPSTREAM should be the current upstream version
-    pristine-tar checkout ../bibutils_$(UPSTREAM).orig.tar.gz
-
- -- David Bremner <bremner at unb.ca>, Sun, 29 Mar 2009 09:05:44 -0300
diff --git a/debian/control b/debian/control
index 33d31e5..8c8f912 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: text
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: David Bremner <bremner at unb.ca>
-Build-Depends: debhelper (>= 7.0.50),   xsltproc, docbook-xsl, docbook-xml, 
-	       quilt (>=0.46-7), libtool
+Build-Depends: debhelper (>= 7.0.50),   xsltproc, docbook-xsl, docbook-xml
 Standards-Version: 3.8.3
 Homepage: http://www.scripps.edu/~cdputnam/software/bibutils/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/bibutils/
diff --git a/debian/rules b/debian/rules
index fc8c4e6..02cd7fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/quilt/quilt.make
-
-TG_BRANCHES=debian/mkshlibs
-# wildcard is to avoid a warning from dh when topgit is not installed
-include $(wildcard /usr/share/topgit/tg2quilt.mk)
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -23,7 +17,7 @@ INSTALLDIR=$(CURDIR)/debian/tmp/bin
 DEVLIB=${CURDIR}/debian/libbibutils-dev/usr/lib
 
 %:
-	dh --with quilt  $@
+	dh $@
 
 override_dh_auto_configure:
 	# do the sed ourselves to avoid build dependency on csh
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)

-- 
Debian packaging for bibutils



More information about the debian-science-commits mailing list