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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 72e0e0e0fd74e04dd4799c8358a6715bc21c8e54
Author: Ralf Treinen <treinen at debian.org>
Date:   Tue May 14 15:49:12 2013 +0200

    use upstream's META file

diff --git a/debian/META.in b/debian/META.in
deleted file mode 100644
index 34bf1bd..0000000
--- a/debian/META.in
+++ /dev/null
@@ -1,4 +0,0 @@
-version="@VERSION@"
-requires="unix"
-archive(byte)="zip.cma"
-archive(native)="zip.cmxa"
diff --git a/debian/changelog b/debian/changelog
index ccd78ea..ca52715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ camlzip (1.05-1) unstable; urgency=low
 
   [ Ralf Treinen ]
   * New upstream version
+  * use upstream's META file instead our own
+  * Update debian/watch (ocamlforge)
   * Fix typo in long description of libzip-ocaml-dev.
   * Remove Sven Luther from Uploaders (closes:#677754)
-  * Update debian/watch (ocamlforge)
 
   [ Stéphane Glondu ]
   * Fix generation of documentation by dh_ocamldoc
@@ -15,7 +16,7 @@ camlzip (1.05-1) unstable; urgency=low
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 14 May 2013 15:38:34 +0200
+ -- Ralf Treinen <treinen at debian.org>  Tue, 14 May 2013 15:49:37 +0200
 
 camlzip (1.04-6) unstable; urgency=low
 
diff --git a/debian/libzip-ocaml.install.in b/debian/libzip-ocaml.install.in
index 48464aa..5c78167 100644
--- a/debian/libzip-ocaml.install.in
+++ b/debian/libzip-ocaml.install.in
@@ -1,4 +1,3 @@
- at OCamlStdlibDir@/zip/META
 @OCamlStdlibDir@/zip/zip.cma
 @OCamlDllDir@/dllcamlzip.so
 OPT: zip.cmxs @OCamlStdlibDir@/zip
diff --git a/debian/rules b/debian/rules
index 7bc0fc8..b5b10ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
-INSTALLDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)/zip
-VERSION := $(shell head -n1 debian/changelog | awk -F'[ ()-]+' '{print $$2}')
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -25,4 +22,3 @@ override_dh_auto_install:
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) installopt DESTDIR=$(CURDIR)/debian/tmp
 endif
-	sed 's/@VERSION@/$(VERSION)/' debian/META.in > $(INSTALLDIR)/META

-- 
camlzip packaging