[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 1662c6d2d60f75290d888d6c3cc3ad34bb408f3a
Author: Enrico Tassi 
Date:   Wed Nov 11 16:02:34 2009 +0100

chmod +x Makefile.dpatch

diff --git a/debian/patches/Makefile.dpatch b/debian/patches/Makefile.dpatch
old mode 100644
new mode 100755

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit b9113bd24d82bf317f2a0f49580ce9082494097d
Author: Enrico Tassi 
Date:   Wed Nov 11 16:14:08 2009 +0100

added README.source pointing to dpatch standard doc

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..1510b9b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1 @@
+Please refer to /usr/share/doc/dpatch/README.source.gz

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit eb12f50213f12edcc535e4599f2e50eb8d595e79
Author: Enrico Tassi 
Date:   Wed Nov 11 16:15:06 2009 +0100

debhelper compatibility level to 7

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 7f4acfc14acb9e161fdea258f840d5babbb1aae8
Author: Enrico Tassi 
Date:   Wed Nov 11 16:20:14 2009 +0100

moved packages to Section: ocaml

diff --git a/debian/control b/debian/control
index aa6398d..53d506d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: ocaml-expat
 Priority: optional
-Section: libdevel
+Section: ocaml
 Maintainer: Enrico Tassi 
 Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, ocaml-nox (>= 3.10.1), 
dpatch, ocaml-findlib (>= 1.1), cdbs, dh-ocaml
 Standards-Version: 3.8.0
@@ -9,7 +9,7 @@ Vcs-Browser: 
http://svn.debian.org/viewsvn/pkg-ocaml-maint/trunk/packages/ocaml-
 Homepage: http://www.xs4all.nl/~mmzeeman/ocaml/
 
 Package: libexpat-ocaml-dev
-Section: libdevel
+Section: ocaml
 Architecture: any
 Depends: libexpat-ocaml (= ${binary:Version}), libexpat1-dev, 
ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), ${misc:Depends}
 Description: OCaml expat bindings

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 548f4c128331069daa9fa733890389759b72331a
Author: Enrico Tassi 
Date:   Wed Nov 11 16:21:57 2009 +0100

depbhelper >= 7 and standards-version=3.8.3

diff --git a/debian/control b/debian/control
index 53d506d..00be864 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ocaml-expat
 Priority: optional
 Section: ocaml
 Maintainer: Enrico Tassi 
-Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, ocaml-nox (>= 3.10.1), 
dpatch, ocaml-findlib (>= 1.1), cdbs, dh-ocaml
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), libexpat1-dev, ocaml-nox (>= 3.10.1), dpatch, 
ocaml-findlib (>= 1.1), cdbs, dh-ocaml
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-expat.git
 Vcs-Browser: 
http://svn.debian.org/viewsvn/pkg-ocaml-maint/trunk/packages/ocaml-expat/trunk/
 Homepage: http://www.xs4all.nl/~mmzeeman/ocaml/

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 948dbc240350dd0a864f46b2d7f800c02406bbd5
Author: Enrico Tassi 
Date:   Wed Nov 11 16:22:22 2009 +0100

fixed VCS-Browse fields

diff --git a/debian/control b/debian/control
index 00be864..f58d3c3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Enrico Tassi 
 Build-Depends: debhelper (>= 7), libexpat1-dev, ocaml-nox (>= 3.10.1), dpatch, 
ocaml-findlib (>= 1.1), cdbs, dh-ocaml
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-expat.git
-Vcs-Browser: 
http://svn.debian.org/viewsvn/pkg-ocaml-maint/trunk/packages/ocaml-expat/trunk/
+Vcs-Browser: 
http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-expat.git;a=summary
 Homepage: http://www.xs4all.nl/~mmzeeman/ocaml/
 
 Package: libexpat-ocaml-dev

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit bf6941f649a5d4bc38839e2c5be32f74f7a0f870
Author: Enrico Tassi 
Date:   Wed Nov 11 16:50:00 2009 +0100

dh_ocamldoc

diff --git a/debian/libexpat-ocaml-dev.ocamldoc 
b/debian/libexpat-ocaml-dev.ocamldoc
new file mode 100644
index 000..1bfdd46
--- /dev/null
+++ b/debian/libexpat-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# This file must not be empty to be represented in .diff.gz!

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 31d4553ffac0f418821f2ef93870da4455b3a578
Author: Enrico Tassi 
Date:   Wed Nov 11 16:51:12 2009 +0100

fixed copyright file adding years of copyright holding

diff --git a/debian/copyright b/debian/copyright
index bd971bd..c3cb713 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
-This package was debianized by Enrico Tassi 
 on
+This package was debianized by Enrico Tassi  on
 Sun, 23 Jan 2005 16:33:21 +0100.
 
 It was downloaded from http://www.xs4all.nl/~mmzeeman/ocaml/
 
-Copyright: Maas-Maarten Zeeman
+Copyright (C) 2002-2003 Maas-Maarten Zeeman
 
 Upstream Author: Maas-Maarten Zeeman
 

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit cc25f6d4b3c15cf378e65a812acac94c2200a577
Author: Enrico Tassi 
Date:   Wed Nov 11 16:52:35 2009 +0100

updated with my last changes and added FTBFS bugno

diff --git a/debian/changelog b/debian/changelog
index ef7d2e6..cde8da9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,18 @@
-ocaml-expat (0.9.1+debian1-6) UNRELEASED; urgency=low
-
-  [ Enrico Tassi ]
-  * NOT RELEASED YET
+ocaml-expat (0.9.1+debian1-6) unstable; urgency=low
 
   [ Stephane Glondu ]
-  * Use ocaml.mk as a CDBS "rules" file
+  * Use ocaml.mk as a CDBS "rules" file (Closes: #549715)
 
   [ Enrico Tassi ]
   * Switch packaging to git
-
- -- Enrico Tassi   Wed, 11 Nov 2009 15:57:34 +0100
+  * Fixed VCS-Browse field in control file
+  * Bumped standards-version to 3.8.3, no changes
+  * Section: ocaml
+  * debian/compat set to 7, fixed build dependency accordingly
+  * added debian/libexpat-ocaml-dev.ocamldoc 
+  * fixed copyright file adding years of copyright holding 
+
+ -- Enrico Tassi   Wed, 11 Nov 2009 16:51:29 +0100
 
 ocaml-expat (0.9.1+debian1-5) unstable; urgency=low
 

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 829efa8be6e318822e6df32fb6c0d904d89db52b
Author: Enrico Tassi 
Date:   Wed Nov 11 17:01:32 2009 +0100

add file for doc-base

diff --git a/debian/libexpat-ocaml-dev.doc-base.ocamldoc-apiref 
b/debian/libexpat-ocaml-dev.doc-base.ocamldoc-apiref
new file mode 100644
index 000..1796ed1
--- /dev/null
+++ b/debian/libexpat-ocaml-dev.doc-base.ocamldoc-apiref
@@ -0,0 +1,8 @@
+Document: libexpat-ocaml-dev-ocamldoc-api-reference
+Title: libexpat-ocaml-dev OCamldoc API Reference
+Abstract: API reference manual for libexpat-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libexpat-ocaml-dev/html/api/index.html
+Files: /usr/share/doc/libexpat-ocaml-dev/html/api/*

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit fec0ee3db173ed75a15d198b617c4f4190f161be
Author: Enrico Tassi 
Date:   Wed Nov 11 17:17:38 2009 +0100

ported to dh-ocaml >= 0.9

diff --git a/debian/changelog b/debian/changelog
index cde8da9..0adc7f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ ocaml-expat (0.9.1+debian1-6) unstable; urgency=low
   * debian/compat set to 7, fixed build dependency accordingly
   * added debian/libexpat-ocaml-dev.ocamldoc 
   * fixed copyright file adding years of copyright holding 
+  * ported to new dh-ocaml 
 
- -- Enrico Tassi   Wed, 11 Nov 2009 16:51:29 +0100
+ -- Enrico Tassi   Wed, 11 Nov 2009 16:59:45 +0100
 
 ocaml-expat (0.9.1+debian1-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f58d3c3..1d69ae3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ocaml-expat
 Priority: optional
 Section: ocaml
 Maintainer: Enrico Tassi 
-Build-Depends: debhelper (>= 7), libexpat1-dev, ocaml-nox (>= 3.10.1), dpatch, 
ocaml-findlib (>= 1.1), cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7), libexpat1-dev, ocaml-nox (>= 3.10.1), dpatch, 
ocaml-findlib (>= 1.1), cdbs, dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-expat.git
 Vcs-Browser: 
http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-expat.git;a=summary
@@ -11,7 +11,8 @@ Homepage: http://www.xs4all.nl/~mmzeeman/ocaml/
 Package: libexpat-ocaml-dev
 Section: ocaml
 Architecture: any
-Depends: libexpat-ocaml (= ${binary:Version}), libexpat1-dev, 
ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), ${misc:Depends}
+Depends: libexpat1-dev, ocaml-findlib (>= 1.1), ${misc:Depends}, 
${shlibs:Depends}, ${ocaml:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml expat bindings
  This Objective Caml library provides XML parsing facilities based on the expat
  library.
@@ -21,7 +22,8 @@ Description: OCaml expat bindings
 Package: libexpat-ocaml
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${ocaml:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml expat bindings
  This Objective Caml library provides XML parsing facilities based on the expat
  library.
diff --git a/debian/rules b/debian/rules
index f051b2e..52189fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
 
 DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DESTDIR)
@@ -13,3 +13,4 @@ ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 else
DEB_MAKE_BUILD_TARGET = all NO_CUSTOM=y
 endif
+

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 51595b0e1e1bc64a4abd7330722b9c675641db8f
Author: Enrico Tassi 
Date:   Wed Nov 11 17:26:01 2009 +0100

added --include flags to find .mli files

diff --git a/debian/libexpat-ocaml-dev.ocamldoc 
b/debian/libexpat-ocaml-dev.ocamldoc
index 1bfdd46..daeb31f 100644
--- a/debian/libexpat-ocaml-dev.ocamldoc
+++ b/debian/libexpat-ocaml-dev.ocamldoc
@@ -1 +1 @@
-# This file must not be empty to be represented in .diff.gz!
+--include debian/tmp/usr/lib/ocaml/expat

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 9f2a2df2c01158c5a6bfdacf2060c96d19a61f45
Author: Enrico Tassi 
Date:   Wed Nov 11 17:33:32 2009 +0100

removed useless ocamldoc-apiref

diff --git a/debian/libexpat-ocaml-dev.doc-base.ocamldoc-apiref 
b/debian/libexpat-ocaml-dev.doc-base.ocamldoc-apiref
deleted file mode 100644
index 1796ed1..000
--- a/debian/libexpat-ocaml-dev.doc-base.ocamldoc-apiref
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: libexpat-ocaml-dev-ocamldoc-api-reference
-Title: libexpat-ocaml-dev OCamldoc API Reference
-Abstract: API reference manual for libexpat-ocaml-dev (generated via OCamldoc)
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libexpat-ocaml-dev/html/api/index.html
-Files: /usr/share/doc/libexpat-ocaml-dev/html/api/*

-- 
ocaml-expat packaging

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


[Pkg-ocaml-maint-commits] [SCM] ocaml-expat packaging branch, master, updated. debian/0.9.1+debian1-5-17-g40805d9

2009-11-11 Thread Enrico Tassi
The following commit has been merged in the master branch:
commit 40805d9a1112f8066c5ef7076d1ec76a659f109c
Author: Enrico Tassi 
Date:   Wed Nov 11 17:33:54 2009 +0100

updated changelog

diff --git a/debian/changelog b/debian/changelog
index 0adc7f6..52092fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,15 +5,15 @@ ocaml-expat (0.9.1+debian1-6) unstable; urgency=low
 
   [ Enrico Tassi ]
   * Switch packaging to git
+  * ported to new dh-ocaml 
+  * added debian/libexpat-ocaml-dev.ocamldoc 
+  * Section: ocaml
   * Fixed VCS-Browse field in control file
   * Bumped standards-version to 3.8.3, no changes
-  * Section: ocaml
   * debian/compat set to 7, fixed build dependency accordingly
-  * added debian/libexpat-ocaml-dev.ocamldoc 
   * fixed copyright file adding years of copyright holding 
-  * ported to new dh-ocaml 
 
- -- Enrico Tassi   Wed, 11 Nov 2009 16:59:45 +0100
+ -- Enrico Tassi   Wed, 11 Nov 2009 17:33:24 +0100
 
 ocaml-expat (0.9.1+debian1-5) unstable; urgency=low
 

-- 
ocaml-expat packaging

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