[Pkg-ocaml-maint-commits] [SCM] xml-light packaging branch, master, updated. debian/2.2-12-6-gb100028

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 6980847cd8d3fccc95f71e262f3322a8da2eb1a4
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue May 29 14:38:03 2012 +0200

    Add new binary package libxml-light-ocaml
    
    ... and handle required move of files, needed metadata to properly
    handle upgrades, remove xml-light.cmxs on clean, etc...

diff --git a/debian/changelog b/debian/changelog
index 3aefac6..ce0b07b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ xml-light (2.2-13) UNRELEASE; urgency=low
     - Fixes build-depends-on-obsolete-package (dpatch)
     - Fixes debian-rules-uses-deprecated-makefile (dpatch.mk)
   * Bump Standards-Version to 3.9.2, no changes needed.
+  * Add libxml-light-ocaml, needed to ship .cmxs files.
+    - libxml-light-ocaml Breaks/Replaces the old binary package
+      libxml-light-ocaml-dev (<< 2.2-13).
 
  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 04 Jan 2012 17:57:31 +0100
 
diff --git a/debian/clean b/debian/clean
index 5fdb944..819342d 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 xml-light.a
+xml-light.cmxs
diff --git a/debian/control b/debian/control
index 2c19403..587971f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,28 @@ Depends:
  ${misc:Depends}
 Provides:
  ${ocaml:Provides}
-Description: mininal XML parser and printer for OCaml
+Description: mininal XML parser and printer for OCaml (development package)
+ This is a XML parser and printer, designed to help parsing basic XML document
+ into OCaml data structures and printing it back to a XML document.
+ .
+ It also supports DTD.
+ .
+ You can find more information about xml-light at
+ http://tech.motion-twin.com/xmllight.html
+
+Package: libxml-light-ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides:
+ ${ocaml:Provides}
+Breaks:
+ libxml-light-ocaml-dev (<< 2.2-13)
+Replaces:
+ libxml-light-ocaml-dev (<< 2.2-13)
+Description: mininal XML parser and printer for OCaml (runtime package)
  This is a XML parser and printer, designed to help parsing basic XML document
  into OCaml data structures and printing it back to a XML document.
  .
diff --git a/debian/libxml-light-ocaml-dev.dirs.in b/debian/libxml-light-ocaml.dirs.in
similarity index 100%
copy from debian/libxml-light-ocaml-dev.dirs.in
copy to debian/libxml-light-ocaml.dirs.in
diff --git a/debian/libxml-light-ocaml-dev.install.in b/debian/libxml-light-ocaml.install.in
similarity index 100%
rename from debian/libxml-light-ocaml-dev.install.in
rename to debian/libxml-light-ocaml.install.in
diff --git a/debian/rules b/debian/rules
index eed85db..5d2e3f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ include /usr/share/cdbs/1/rules/ocaml.mk
 
 PACKAGE_DEV := libxml-light-ocaml-dev
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+DESTDIR_RUN := $(CURDIR)/debian/libxml-light-ocaml
 
 DEB_MAKE_CLEAN_TARGET    := clean
 
@@ -40,7 +41,11 @@ DEB_MAKE_INSTALL_TARGET  += INSTALLDIR='$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-l
 clean::
 	-$(RM) -r '$(CURDIR)/doc'
               
-install/libxml-light-ocaml-dev::
+install/libxml-light-ocaml:: install/libxml-light-ocaml-dev
 	VERSION=$(DEB_NOEPOCH_VERSION); \
 	VERSION=$${VERSION%%-*}; \
 	sed -i "s/@VERSION@/$$VERSION/g" '$(CURDIR)/debian/META.xml-light'
+
+	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light/xml-light.cma \
+	   $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light/xml-light.cmxs \
+	$(DESTDIR_RUN)/$(OCAML_STDLIB_DIR)/xml-light

-- 
xml-light packaging