[Pkg-ocaml-maint-commits] [SCM] camlzip packaging branch, master, updated. debian/1.04-6-16-gddfb765

[Ralf Treinen]

The following commit has been merged in the master branch:
commit ddfb765efc62cab57859189ec85b7a0acf3e464c
Author: Ralf Treinen <treinen at debian.org>
Date:   Tue May 14 17:58:24 2013 +0200

    source format 3.0
    
    drop quilt addon

diff --git a/debian/changelog b/debian/changelog
index b12aae3..d19e7fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ camlzip (1.05-1) unstable; urgency=low
   * Remove Sven Luther from Uploaders (closes:#677754)
   * debian/copyright: machine-readable format 1.0. Fix year, and
     copyright holder.
+  * source format 3.0 (quilt):
+    - add debian/source/format
+    - drop build-dependency on quilt
+    - drop quilt addon from dh invocation
 
   [ Stéphane Glondu ]
   * Fix generation of documentation by dh_ocamldoc
diff --git a/debian/control b/debian/control
index fff2375..a46f0aa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
- quilt (>= 0.46-7~),
  zlib1g-dev (>> 1.1.4),
  ocaml-nox (>= 3.11.1-3~),
  dpkg-dev (>= 1.13.19),
diff --git a/debian/libzip-ocaml.install.in b/debian/libzip-ocaml.install.in
index 5c78167..ea57e37 100644
--- a/debian/libzip-ocaml.install.in
+++ b/debian/libzip-ocaml.install.in
@@ -1,3 +1,4 @@
 @OCamlStdlibDir@/zip/zip.cma
+META @OCamlStdlibDir@/zip/
 @OCamlDllDir@/dllcamlzip.so
 OPT: zip.cmxs @OCamlStdlibDir@/zip
diff --git a/debian/rules b/debian/rules
index b5b10ba..ba6f66f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/ocaml/ocamlvars.mk
 #export DH_VERBOSE=1
 
 %:
-	dh --with ocaml --with quilt $@
+	dh --with ocaml $@
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
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)

-- 
camlzip packaging