[Pkg-ocaml-maint-commits] [SCM] xml-light packaging branch, master, updated. debian/2.2-11-1-gd014b39

Mon Mar 2 22:54:43 UTC 2009

The following commit has been merged in the master branch:
commit 71b89c2cba7d4309e56c67d0fc2b07a6614a2fe1
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Mon Mar 2 23:53:47 2009 +0100

    Add homepage field and refrmat Copyright
    
    * Remove useless doc/variable for generating debian/control from
      control.in
    * Use debian/clean
    * Update debian/copyright using CopyrightFormat
    * Add Homepage field

diff --git a/debian/changelog b/debian/changelog
index ee736ad..9cea1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-xml-light (2.2-11) UNRELEASED; urgency=low
+xml-light (2.2-11) unstable; urgency=low
 
+  [ Samuel Mimram ]
   * Rebuild with OCaml 3.11.
   * Switch packaging to git.
   * Update compat to 7.
 
- -- Samuel Mimram <smimram at debian.org>  Fri, 27 Feb 2009 00:01:10 +0100
+  [ Sylvain Le Gall ]
+  * Remove useless doc/variable for generating debian/control from
+    control.in
+  * Use debian/clean
+  * Update debian/copyright using CopyrightFormat 
+  * Add Homepage field
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 02 Mar 2009 22:54:48 +0100
 
 xml-light (2.2-10) experimental; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..5fdb944
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+xml-light.a
diff --git a/debian/control b/debian/control
index 159b68b..ef78564 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,11 @@ Source: xml-light
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), dpatch, ocaml-nox (>= 3.11), debhelper (>= 7), dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), dpatch, ocaml-nox (>= 3.11), debhelper (>= 7), dh-ocaml (>= 0.4.1)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xml-light.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xml-light.git
+Homepage: http://tech.motion-twin.com/xmllight.html
 
 Package: libxml-light-ocaml-dev
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 6a062a5..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: xml-light
-Section: libdevel
-Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, debhelper (>= 7), dh-ocaml
-Standards-Version: 3.8.0
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xml-light.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xml-light.git
-
-Package: libxml-light-ocaml-dev
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}
-Description: mininal XML parser and printer for OCaml
- 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
diff --git a/debian/copyright b/debian/copyright
index 75f883b..7fb274d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,23 @@
-This package was debianized by Sylvain Le Gall
-<gildor at debian.org>  Mon, 10 Oct 2005 23:45:16 +02005.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Nicolas Cannasse <ncannasse at motion-twin.com>
+Packaged-By: Sylvain Le Gall <gildor at debian.org>
+Packaged-Date: Mon, 10 Oct 2005 23:45:16 +02005
+Original-Source-Location: http://tech.motion-twin.com/zip/
 
-It was downloaded from :
-http://tech.motion-twin.com/xmllight.html
-http://tech.motion-twin.com/zip/
+Files: *
+Copyright: © 2003-2005 Nicolas Cannasse <ncannasse at motion-twin.com>
+           © 2003-2005 Motion-Twin
+License: LGPL-2.1+
 
-Upstream Author: 
-Nicolas Cannasse (ncannasse at motion-twin.com)
+Xml-light is distributed under the terms the LGPL v2.1 licence, which can be
+found in the /usr/share/common-licenses/LGPL-2.1 file on debian systems.
 
-Copyright:
-(c)2003-2005 Nicolas Cannasse (ncannasse at motion-twin.com)
-(c)2003-2005 Motion-Twin
-Some parts of this code source has an additionnal copyright to Jacques Garrigue
+Files: xmlParser.ml
+Copyright: © 2003 Nicolas Cannasse <ncannasse at motion-twin.com>
+           © 2003 Jacques Garrigue
+License: LGPL-2.1+
 
-Xml-light is distributed under the terms the LGPL licence, which can be
-found in the /usr/share/common-licenses/LGPL file on debian systems.
+Files: debian/*
+Copyright: © 2005-2008 Sylvain Le Gall <gildor at debian.org>
+License: GPL-2+
 
diff --git a/debian/rules b/debian/rules
index e8c33e7..efa6324 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
@@ -39,19 +36,14 @@ DEB_MAKE_INSTALL_TARGET  := install
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_INSTALL_TARGET  += installopt
 endif
-DEB_MAKE_INSTALL_TARGET  += INSTALLDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light"
-
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+DEB_MAKE_INSTALL_TARGET  += INSTALLDIR='$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light'
 
 OCAML_OCAMLDOC_PACKAGES := libxml-light-ocaml-dev
 
 clean::
-	-$(RM) $(CURDIR)/xml-light.a
-	-$(RM) $(CURDIR)/debian/META.xml-light
-	-$(RM) $(CURDIR)/debian/libxml-light-ocaml-dev.dirs
-	-$(RM) $(CURDIR)/debian/libxml-light-ocaml-dev.install
+	-$(RM) -r '$(CURDIR)/doc'
               
 install/libxml-light-ocaml-dev::
 	VERSION=$(DEB_NOEPOCH_VERSION); \
 	VERSION=$${VERSION%%-*}; \
-	sed -i "s/@VERSION@/$$VERSION/g" $(CURDIR)/debian/META.xml-light
+	sed -i "s/@VERSION@/$$VERSION/g" '$(CURDIR)/debian/META.xml-light'

-- 
xml-light packaging

