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

2013-05-16 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit ddfb765efc62cab57859189ec85b7a0acf3e464c
Author: Ralf Treinen trei...@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 glo...@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 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
camlzip packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

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

2013-05-16 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 51dee5e15c9fc1dc84f572217cb24f4d4f10f78a
Author: Ralf Treinen trei...@debian.org
Date:   Tue May 14 16:05:37 2013 +0200

debian/copyright: format 1.0, fix year and holder

diff --git a/debian/changelog b/debian/changelog
index ca52715..b12aae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ camlzip (1.05-1) unstable; urgency=low
   * Update debian/watch (ocamlforge)
   * Fix typo in long description of libzip-ocaml-dev.
   * Remove Sven Luther from Uploaders (closes:#677754)
+  * debian/copyright: machine-readable format 1.0. Fix year, and
+copyright holder.
 
   [ Stéphane Glondu ]
   * Fix generation of documentation by dh_ocamldoc
@@ -16,7 +18,7 @@ camlzip (1.05-1) unstable; urgency=low
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Ralf Treinen trei...@debian.org  Tue, 14 May 2013 15:49:37 +0200
+ -- Ralf Treinen trei...@debian.org  Tue, 14 May 2013 16:05:24 +0200
 
 camlzip (1.04-6) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index d55b3ef..430a8d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,24 @@
-This package was debianized by Sven Luther lut...@debian.org on
-Thu, 30 Aug 2001 10:45:01 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: camlzip
+Upstream-Contact: Xavier Leroy xavier.le...@inria.fr
+Source: http://forge.ocamlcore.org/frs/?group_id=13
 
-It was downloaded from http://caml.inria.fr/distrib/bazar-ocaml/
-
-Upstream Author: Xavier Leroy xavier.le...@inria.fr
-
-Copyright (c) 2001-2007 Xavier Leroy.
-
-Camlzip is distributed under the terms the LGPL 2.1 (or above) licence,
-which can be found in the /usr/share/common-licenses/LGPL-2.1 file on Debian
-systems.
-
-As a special exception to the GNU Library General Public License, you may link,
-statically or dynamically, a work that uses the Library with a publicly
-distributed version of the Library to produce an executable file containing
-portions of the Library, and distribute that executable file under terms of
-your choice, without any of the additional requirements listed in clause 6 of
-the GNU Library General Public License.  By a publicly distributed version of
-the Library, we mean either the unmodified Library as distributed by INRIA, or
-a modified version of the Library that is distributed under the conditions
-defined in clause 3 of the GNU Library General Public License.  This exception
-does not however invalidate any other reasons why the executable file might be
-covered by the GNU Library General Public License.
+Files: *
+Copyright: (c) 2001 Institut National de Recherche en Informatique et en
+ Automatique.
+License: LGPL-2.1-with-linking-exception
+ Camlzip is distributed under the terms the LGPL 2.1 (or above) licence,
+ which can be found in the /usr/share/common-licenses/LGPL-2.1 file on Debian
+ systems.
+ .
+ As a special exception to the GNU Library General Public License, you may 
link,
+ statically or dynamically, a work that uses the Library with a publicly
+ distributed version of the Library to produce an executable file containing
+ portions of the Library, and distribute that executable file under terms of
+ your choice, without any of the additional requirements listed in clause 6 of
+ the GNU Library General Public License.  By a publicly distributed version of
+ the Library, we mean either the unmodified Library as distributed by INRIA, 
or
+ a modified version of the Library that is distributed under the conditions
+ defined in clause 3 of the GNU Library General Public License.  This exception
+ does not however invalidate any other reasons why the executable file might be
+ covered by the GNU Library General Public License.

-- 
camlzip packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits