[Pkg-ocaml-maint-commits] [SCM] camlbz2 packaging branch, master, updated. debian/0.6.0-6-5-gd6ea1a6

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 1dce5cdeed92f6ca2576f93e44fb8e57e41168e4
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Nov 2 11:00:39 2010 +0100

    Switch to 3.0 (quilt), get rid of TopGit stuff

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c11dee7..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,14 +0,0 @@
-Building camlbz2 Debian package
--------------------------------
-
-This 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
-(from the `topgit' Debian package). This process is documented in
-`/usr/share/doc/topgit/HOWTO-tg2quilt.gz'.
-
-The branch layout is those described in the aforementioned document.
-
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 10 Feb 2009 13:09:42 +0100
diff --git a/debian/control b/debian/control
index 9bdcaaa..5f30474 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
  ocaml-findlib (>= 1.2.4),
  libbz2-dev,
  dh-ocaml (>= 0.9.1),
- quilt,
  cdbs
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlbz2.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0cdb520..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = build
diff --git a/debian/rules b/debian/rules
index d387bcd..feb3760 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,12 @@
 include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
--include /usr/share/topgit/tg2quilt.mk
 
 LIB_NAME = bz2
 DLL_PKG_NAME = lib$(LIB_NAME)-ocaml
 DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
 DEST_DIR = $(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
 DLL_DEST_DIR = $(CURDIR)/debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR)
-QUILT_PATCH_DIR ?= debian/patches	# can be removed once #513952 gets fixed
 
 DEB_MAKE_BUILD_TARGET = all
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEST_DIR)
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/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
camlbz2 packaging