[Pkg-ocaml-maint-commits] [planets] branch master updated (2352f26 -> 3d8ff70)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository planets.

  from  2352f26   Prepare upload to unstable
   new  8b9ec90   Fix installability on bytecode architectures
   new  3d8ff70   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 7 +++
 debian/control   | 2 +-
 debian/rules | 7 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/planets.git

___
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] [planets] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository planets.

commit 3d8ff70964eb36ea130ccdbe3203cd85b4855327
Author: Mehdi Dogguy 
Date:   Fri Oct 16 21:20:22 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf5766a..f5cbe68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-planets (0.1.13-16) UNRELEASED; urgency=medium
+planets (0.1.13-16) unstable; urgency=medium
 
   * Team upload.
   * Fix installability on bytecode architectures.
 
- -- Mehdi Dogguy   Fri, 16 Oct 2015 21:17:57 +0200
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 21:20:22 +0200
 
 planets (0.1.13-15) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/planets.git

___
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] [ocaml-reins] branch master updated (47b622b -> 1fbb24d)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository ocaml-reins.

  from  47b622b   Update changelog and prepare upload to unstable
   new  d32180a   Fix FTBFS with OCaml 4.02.3
   new  1fbb24d   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  7 +++
 .../patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch | 22 ++
 debian/patches/series  |  1 +
 3 files changed, 30 insertions(+)
 create mode 100644 debian/patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git

___
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] [ocaml-reins] 01/02: Fix FTBFS with OCaml 4.02.3

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocaml-reins.

commit d32180a57c5f87142881fba0ea3ca1b269c5d7fc
Author: Mehdi Dogguy 
Date:   Fri Oct 16 22:48:19 2015 +0200

Fix FTBFS with OCaml 4.02.3
---
 debian/changelog   |  7 +++
 .../patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch | 22 ++
 debian/patches/series  |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b780f64..2766615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-reins (0.1a-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with OCaml 4.02.3
+
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 22:47:35 +0200
+
 ocaml-reins (0.1a-5) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch 
b/debian/patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch
new file mode 100644
index 000..9bea545
--- /dev/null
+++ b/debian/patches/0005-Fix-FTBFS-with-OCaml-4.02.3.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy 
+Date: Fri, 16 Oct 2015 22:45:57 +0200
+Subject: Fix FTBFS with OCaml 4.02.3
+
+---
+ OMakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/OMakefile b/OMakefile
+index b741412..c5b6a4e 100644
+--- a/OMakefile
 b/OMakefile
+@@ -1,7 +1,7 @@
+ 
+ include config.omake
+ 
+-OCAMLFLAGS += -dtypes
++OCAMLFLAGS += -dtypes -w +a-3-4-27-50-k
+ 
+ .SUBDIRS: src doc
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a995e85..4be3bdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Install-cmi.patch
 0003-Fix-test-suite-with-new-oUnit.patch
 0004-Fix-version-in-META.patch
+0005-Fix-FTBFS-with-OCaml-4.02.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git

___
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] [ocaml-reins] annotated tag debian/0.1a-6 created (now 51f8085)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/0.1a-6
in repository ocaml-reins.

at  51f8085   (tag)
   tagging  1fbb24dd185035060081802880c9b4a81147ffe7 (commit)
  replaces  debian/0.1a-5
 tagged by  Mehdi Dogguy
on  Fri Oct 16 23:08:35 2015 +0200

- Log -
ocaml-reins Debian release 0.1a-6

Mehdi Dogguy (2):
  Fix FTBFS with OCaml 4.02.3
  Release to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git

___
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] [cmigrep] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository cmigrep.

commit 9835f4d6d1f6c4d66d10291fb29bfced18a0401c
Author: Mehdi Dogguy 
Date:   Fri Oct 16 22:12:25 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a14439..f7f6d4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-cmigrep (1.5-13) UNRELEASED; urgency=medium
+cmigrep (1.5-13) unstable; urgency=medium
 
   * Recompile with OCaml 4.02.3
 - Add 0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch
 
- -- Mehdi Dogguy   Sat, 10 Oct 2015 19:33:05 +0200
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 22:12:25 +0200
 
 cmigrep (1.5-12) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git

___
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] [otags] annotated tag debian/4.01.1-2 created (now f1cbc7f)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/4.01.1-2
in repository otags.

at  f1cbc7f   (tag)
   tagging  5a4d6bf26e2ab250905e0723d89b31265b0237dc (commit)
  replaces  debian/4.01.1-1
 tagged by  Mehdi Dogguy
on  Fri Oct 16 23:09:17 2015 +0200

- Log -
otags Debian release 4.01.1-2

Mehdi Dogguy (2):
  Fix FTBFS with OCaml 4.02.3
  Release to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/otags.git

___
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] [otags] branch master updated (b72eb8b -> 5a4d6bf)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository otags.

  from  b72eb8b   Update changelog and prepare upload to unstable
   new  a9a545b   Fix FTBFS with OCaml 4.02.3
   new  5a4d6bf   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  7 +++
 debian/control |  3 +--
 .../0001-Set-required-version-to-4.02.patch| 22 ++
 debian/patches/series  |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/0001-Set-required-version-to-4.02.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/otags.git

___
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] [otags] 01/02: Fix FTBFS with OCaml 4.02.3

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository otags.

commit a9a545be3891a20ef331f730003b3ec35102e8e2
Author: Mehdi Dogguy 
Date:   Fri Oct 16 23:05:29 2015 +0200

Fix FTBFS with OCaml 4.02.3
---
 debian/changelog   |  7 +++
 debian/control |  3 +--
 .../0001-Set-required-version-to-4.02.patch| 22 ++
 debian/patches/series  |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c58933..9de52d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+otags (4.01.1-2) UNRELEASED; urgency=medium
+
+  * Set OCaml 4.02 as required version
+  * Use camlp4 (>= 4.02) instead of camlp4-extra
+
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 23:04:18 +0200
+
 otags (4.01.1-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index e434df4..7e3ed9c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends:
  ocaml-best-compilers,
  debhelper (>= 9),
  dh-ocaml (>= 0.9~),
- camlp4-extra (>= 4.01),
- camlp4-extra (<< 4.02),
+ camlp4 (>= 4.02),
  libsexplib-camlp4-dev
 Standards-Version: 3.9.5
 Homepage: http://askra.de/software/otags/
diff --git a/debian/patches/0001-Set-required-version-to-4.02.patch 
b/debian/patches/0001-Set-required-version-to-4.02.patch
new file mode 100644
index 000..6797ebf
--- /dev/null
+++ b/debian/patches/0001-Set-required-version-to-4.02.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy 
+Date: Fri, 16 Oct 2015 23:03:47 +0200
+Subject: Set required version to 4.02
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index d0e1bd3..e9e0c60 100755
+--- a/configure
 b/configure
+@@ -29,7 +29,7 @@
+ 
+ set -e
+ 
+-REQUIRED_OCAML_VERSION=4.01
++REQUIRED_OCAML_VERSION=4.02
+ OTAGS_VERSION=1
+ 
+ root=/usr/local
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 1bb8bf6..1f71c49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# empty
+0001-Set-required-version-to-4.02.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/otags.git

___
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] [otags] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository otags.

commit 5a4d6bf26e2ab250905e0723d89b31265b0237dc
Author: Mehdi Dogguy 
Date:   Fri Oct 16 23:05:32 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9de52d5..e5c64a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-otags (4.01.1-2) UNRELEASED; urgency=medium
+otags (4.01.1-2) unstable; urgency=medium
 
   * Set OCaml 4.02 as required version
   * Use camlp4 (>= 4.02) instead of camlp4-extra
 
- -- Mehdi Dogguy   Fri, 16 Oct 2015 23:04:18 +0200
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 23:05:32 +0200
 
 otags (4.01.1-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/otags.git

___
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] [ocaml-reins] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocaml-reins.

commit 1fbb24dd185035060081802880c9b4a81147ffe7
Author: Mehdi Dogguy 
Date:   Fri Oct 16 22:48:32 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2766615..267889d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-ocaml-reins (0.1a-6) UNRELEASED; urgency=medium
+ocaml-reins (0.1a-6) unstable; urgency=medium
 
   * Team upload.
   * Fix FTBFS with OCaml 4.02.3
 
- -- Mehdi Dogguy   Fri, 16 Oct 2015 22:47:35 +0200
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 22:48:32 +0200
 
 ocaml-reins (0.1a-5) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git

___
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] [planets] annotated tag debian/0.1.13-16 created (now a669499)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/0.1.13-16
in repository planets.

at  a669499   (tag)
   tagging  3d8ff70964eb36ea130ccdbe3203cd85b4855327 (commit)
  replaces  debian/0.1.13-15
 tagged by  Mehdi Dogguy
on  Fri Oct 16 22:24:19 2015 +0200

- Log -
planets Debian release 0.1.13-16

Mehdi Dogguy (2):
  Fix installability on bytecode architectures
  Release to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/planets.git

___
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] [planets] 01/02: Fix installability on bytecode architectures

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository planets.

commit 8b9ec90850701b0ba52260bb7712f5c173910bb2
Author: Mehdi Dogguy 
Date:   Fri Oct 16 21:18:59 2015 +0200

Fix installability on bytecode architectures
---
 debian/changelog | 7 +++
 debian/control   | 2 +-
 debian/rules | 7 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bfe53f..bf5766a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+planets (0.1.13-16) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix installability on bytecode architectures.
+
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 21:17:57 +0200
+
 planets (0.1.13-15) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index 5bef03b..8ed252b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Homepage: http://planets.homedns.org/
 
 Package: planets
 Architecture: all
-Depends: tk8.5, ${ocaml:Depends}, ${misc:Depends}
+Depends: tk8.5, ocaml-base-nox-${F:OCamlABI}, liblabltk-ocaml, ${misc:Depends}
 Suggests: doc-base
 Description: Gravitation simulation of planetary bodies
  Planets is a simple interactive program for playing with simulations
diff --git a/debian/rules b/debian/rules
index 84abca8..21b1ef0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
 
+include /usr/share/ocaml/ocamlvars.mk
+
 DEB_DESTDIR := $(CURDIR)/debian/planets
 
 %:
-   dh $@ --with ocaml
+   dh $@
 
 override_dh_auto_build:
$(MAKE) planets.bc
@@ -14,3 +16,6 @@ override_dh_auto_install:
$(DEB_DESTDIR)/usr/share/doc/planets/examples/README
install -D -m 644 CHANGES \
$(DEB_DESTDIR)/usr/share/doc/planets/changelog
+
+override_dh_gencontrol:
+   dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/planets.git

___
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] [cmigrep] branch master updated (f661903 -> 9835f4d)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository cmigrep.

  from  f661903   Release to unstable
   new  fb7a21b   Port to OCaml >= 4.02.3
   new  9835f4d   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  7 +++
 ...0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch | 70 ++
 debian/patches/series  |  1 +
 3 files changed, 78 insertions(+)
 create mode 100644 
debian/patches/0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git

___
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] [cmigrep] 01/02: Port to OCaml >= 4.02.3

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository cmigrep.

commit fb7a21b14e0760aa3e9429dece601b00f8c8cb40
Author: Mehdi Dogguy 
Date:   Sat Oct 10 19:33:05 2015 +0200

Port to OCaml >= 4.02.3
---
 debian/changelog   |  7 +++
 ...0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch | 70 ++
 debian/patches/series  |  1 +
 3 files changed, 78 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index de6b9cd..0a14439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cmigrep (1.5-13) UNRELEASED; urgency=medium
+
+  * Recompile with OCaml 4.02.3
+- Add 0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch
+
+ -- Mehdi Dogguy   Sat, 10 Oct 2015 19:33:05 +0200
+
 cmigrep (1.5-12) unstable; urgency=medium
 
   * Remove broken Homepage
diff --git a/debian/patches/0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch 
b/debian/patches/0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch
new file mode 100644
index 000..8ef6b12
--- /dev/null
+++ b/debian/patches/0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch
@@ -0,0 +1,70 @@
+From: Mehdi Dogguy 
+Date: Fri, 16 Oct 2015 22:10:37 +0200
+Subject: Adapt to Types types of OCaml >= 4.02.3
+
+---
+ cmigrep.ml | 16 
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/cmigrep.ml b/cmigrep.ml
+index dd162fa..595369b 100755
+--- a/cmigrep.ml
 b/cmigrep.ml
+@@ -306,7 +306,7 @@ let print_constructor print_path path s exp =
+begin match type_decl.type_kind with
+| Type_variant (constructors) ->
+List.iter
+- (fun (name, type_exprs, _) ->
++ (fun {cd_id=name ; cd_args = type_exprs} ->
+let name = Ident.name name in
+ if Pcre.pmatch ~rex:exp name then begin
+   Format.print_string name;
+@@ -385,7 +385,7 @@ let print_record_label print_path path s exp =
+begin match type_decl.type_kind with
+| Type_record (labels, _) ->
+List.iter
+- (fun (name, mutable_flag, type_expr) ->
++ (fun {ld_id = name; ld_mutable = mutable_flag; ld_type = 
type_expr} ->
+ let name = Ident.name name in
+ if Pcre.pmatch ~rex:exp name then begin
+   begin match mutable_flag with
+@@ -448,7 +448,7 @@ let print_all print_path path s exp =
+   (function
+  | Sig_value (id, _)
+  | Sig_type (id, _, _)
+- | Sig_exception (id, _)
++ | Sig_typext (id, _, _)
+  | Sig_module (id, _, _)
+  | Sig_modtype (id, _)
+  | Sig_class (id, _, _)
+@@ -464,9 +464,9 @@ let print_all print_path path s exp =
+ let print_exception print_path path s exp = 
+   List.iter
+ (function 
+-   | Sig_exception (id, exn) ->
++   | Sig_typext (id, ext, Types.Text_exception) ->
+if match_ident exp id then begin
+- Printtyp.exception_declaration id Format.std_formatter exn;
++ Printtyp.extension_constructor id Format.std_formatter ext;
+  if print_path then
+Format.print_string (Printf.sprintf " (* %s *)" path);
+  Format.print_newline ()
+@@ -529,14 +529,14 @@ let cmi_files args mod_expr =
+ let rec matching_submods mod_expr s =
+   match s with
+   | Sig_module (id, mt, _) :: tl when match_mod_expr mod_expr (Ident.name id) 
->
+-  begin match mt with
++  begin match mt.Types.md_type with
+   | Mty_signature sg -> (Ident.name id, sg) :: matching_submods mod_expr 
tl
+   | Mty_functor (_, mt, _) ->
+   begin match mt with
+-  | Mty_signature sg -> (Ident.name id, sg) :: matching_submods 
mod_expr tl
++  | Some (Mty_signature sg) -> (Ident.name id, sg) :: 
matching_submods mod_expr tl
+   | _ -> matching_submods mod_expr tl
+   end
+-  | Mty_ident _ -> matching_submods mod_expr tl
++  | Mty_ident _ | Mty_alias _ -> matching_submods mod_expr tl
+   end
+   | _ :: tl -> matching_submods mod_expr tl
+   | [] -> []
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 22ad952..3f53651 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-No-private-flag.patch
 0002-Adapt-to-Types-types-of-OCaml-4.patch
 0003-Adapt-build-system-to-OCaml-4.patch
+0004-Adapt-to-Types-types-of-OCaml-4.02.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git

___
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] [cmigrep] annotated tag debian/1.5-13 created (now f250f87)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/1.5-13
in repository cmigrep.

at  f250f87   (tag)
   tagging  9835f4d6d1f6c4d66d10291fb29bfced18a0401c (commit)
  replaces  debian/1.5-12
 tagged by  Mehdi Dogguy
on  Fri Oct 16 22:22:00 2015 +0200

- Log -
cmigrep Debian release 1.5-13

Mehdi Dogguy (2):
  Port to OCaml >= 4.02.3
  Release to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git

___
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] [xmlrpc-light] 01/02: Port to ocamlnet 4.0.4

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository xmlrpc-light.

commit de3ae34283914fc2b13f389cbb7c01cd28d63451
Author: Mehdi Dogguy 
Date:   Fri Oct 16 23:39:52 2015 +0200

Port to ocamlnet 4.0.4
---
 debian/changelog   |  11 +++
 debian/control |   2 +-
 debian/libxmlrpc-light-ocaml-dev.ocamldoc  |   2 +-
 .../patches/0003-Compile-with-ocamlnet-4.0.4.patch | 104 +
 debian/patches/series  |   1 +
 5 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5521e7f..879750b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xmlrpc-light (0.6.1-4) UNRELEASED; urgency=medium
+
+  * Port to ocamlnet 4.0.4
+- Bump minimum version requirement on ocamlnet to 4.0.4~
+- Replace uses of Http_client by Nethttp_client
+- Use package nethttpd instead of nethttpd-for-netcgi2 when building
+  the library and its ocamldoc documentation, in the META file as well
+  as in example and test files.
+
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 23:37:49 +0200
+
 xmlrpc-light (0.6.1-3) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index a1f9eb5..78c7f80 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  cdbs,
  debhelper (>= 7),
  ocaml-nox,
- libocamlnet-ocaml-dev (>= 3.3.5),
+ libocamlnet-ocaml-dev (>= 4.0.4),
  libxml-light-ocaml-dev,
  libnethttpd-ocaml-dev,
  ocaml-findlib,
diff --git a/debian/libxmlrpc-light-ocaml-dev.ocamldoc 
b/debian/libxmlrpc-light-ocaml-dev.ocamldoc
index 64fcfc3..db2c80e 100644
--- a/debian/libxmlrpc-light-ocaml-dev.ocamldoc
+++ b/debian/libxmlrpc-light-ocaml-dev.ocamldoc
@@ -1 +1 @@
- -package xml-light,nethttpd-for-netcgi2
+ -package xml-light,nethttpd
diff --git a/debian/patches/0003-Compile-with-ocamlnet-4.0.4.patch 
b/debian/patches/0003-Compile-with-ocamlnet-4.0.4.patch
new file mode 100644
index 000..fb485b5
--- /dev/null
+++ b/debian/patches/0003-Compile-with-ocamlnet-4.0.4.patch
@@ -0,0 +1,104 @@
+From: Mehdi Dogguy 
+Date: Fri, 16 Oct 2015 23:36:37 +0200
+Subject: Compile with ocamlnet 4.0.4
+
+---
+ META| 2 +-
+ Makefile| 4 ++--
+ XmlRpc.ml   | 8 
+ examples/adder/Makefile | 2 +-
+ test/test.ml| 2 +-
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/META b/META
+index 9e153c9..befe597 100644
+--- a/META
 b/META
+@@ -1,6 +1,6 @@
+ name = "xmlrpc-light"
+ version = "0.6.1"
+ description = "XML-RPC client based on Xml-Light"
+-requires = "xml-light,netclient,nethttpd-for-netcgi2"
++requires = "xml-light,netclient,nethttpd"
+ archive(byte) = "xmlrpc-light.cma"
+ archive(native) = "xmlrpc-light.cmxa"
+diff --git a/Makefile b/Makefile
+index e7dee0b..5540de5 100644
+--- a/Makefile
 b/Makefile
+@@ -2,9 +2,9 @@ OCAMLMAKEFILE = OCamlMakefile
+ 
+ RESULT = xmlrpc-light
+ SOURCES = XmlRpcBase64.mli XmlRpcBase64.ml XmlRpcDateTime.mli 
XmlRpcDateTime.ml XmlRpc.mli XmlRpc.ml XmlRpcServer.mli XmlRpcServer.ml
+-PACKS = xml-light,netclient,nethttpd-for-netcgi2
++PACKS = xml-light,netclient,nethttpd
+ LIBINSTALL_FILES = XmlRpcBase64.mli XmlRpcBase64.cmi XmlRpcDateTime.mli 
XmlRpcDateTime.cmi XmlRpc.mli XmlRpc.cmi XmlRpcServer.mli XmlRpcServer.cmi 
xmlrpc-light.cma xmlrpc-light.cmxa xmlrpc-light.a
+-OCAMLDOC = ocamlfind ocamldoc -package xml-light,nethttpd-for-netcgi2
++OCAMLDOC = ocamlfind ocamldoc -package xml-light,nethttpd
+ DOC_FILES = XmlRpcBase64.mli XmlRpcDateTime.mli XmlRpc.mli XmlRpcServer.mli
+ 
+ all: native-code-library byte-code-library
+diff --git a/XmlRpc.ml b/XmlRpc.ml
+index b398318..9d81a79 100644
+--- a/XmlRpc.ml
 b/XmlRpc.ml
+@@ -414,7 +414,7 @@ object (self)
+   Neturl.string_of_url
+ (Neturl.remove_from_url ~user:true ~password:true parsed_url) in
+ 
+-let call = new Http_client.post_raw url xml in
++let call = new Nethttp_client.post_raw url xml in
+ call#set_req_header "User-Agent" useragent;
+ call#set_req_header "Content-Type" "text/xml";
+ List.iter (fun (n, v) -> call#set_req_header n v) headers;
+@@ -428,12 +428,12 @@ object (self)
+ | None -> ()
+ end;
+ 
+-let pipeline = new Http_client.pipeline in
++let pipeline = new Nethttp_client.pipeline in
+ pipeline#set_proxy_from_environment ();
+ 
+ let opt = pipeline#get_options in
+ pipeline#set_options
+-  {opt with Http_client.
++  {opt with Nethttp_client.
+  connection_timeout = timeout;
+   };
+ 
+@@ -441,7 +441,7 @@ object (self)
+   begin
+ let opt = pipeline#get_options in
+ pipeline#set_options
+-  {opt with Http_client.
++

[Pkg-ocaml-maint-commits] [xmlrpc-light] branch master updated (ea29c81 -> 97acd1a)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository xmlrpc-light.

  from  ea29c81   Update changelog and prepare upload to unstable
   new  de3ae34   Port to ocamlnet 4.0.4
   new  97acd1a   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  11 +++
 debian/control |   2 +-
 debian/libxmlrpc-light-ocaml-dev.ocamldoc  |   2 +-
 .../patches/0003-Compile-with-ocamlnet-4.0.4.patch | 104 +
 debian/patches/series  |   1 +
 5 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/0003-Compile-with-ocamlnet-4.0.4.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/xmlrpc-light.git

___
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] [xmlrpc-light] annotated tag debian/0.6.1-4 created (now c5b6bc6)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/0.6.1-4
in repository xmlrpc-light.

at  c5b6bc6   (tag)
   tagging  97acd1a9ee8d47ed9b03116016c4bfa9b55be545 (commit)
  replaces  debian/0.6.1-3
 tagged by  Mehdi Dogguy
on  Fri Oct 16 23:53:05 2015 +0200

- Log -
xmlrpc-light Debian release 0.6.1-4

Mehdi Dogguy (2):
  Port to ocamlnet 4.0.4
  Release to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/xmlrpc-light.git

___
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] [xmlrpc-light] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository xmlrpc-light.

commit 97acd1a9ee8d47ed9b03116016c4bfa9b55be545
Author: Mehdi Dogguy 
Date:   Fri Oct 16 23:50:43 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 879750b..f4ce2df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xmlrpc-light (0.6.1-4) UNRELEASED; urgency=medium
+xmlrpc-light (0.6.1-4) unstable; urgency=medium
 
   * Port to ocamlnet 4.0.4
 - Bump minimum version requirement on ocamlnet to 4.0.4~
@@ -7,7 +7,7 @@ xmlrpc-light (0.6.1-4) UNRELEASED; urgency=medium
   the library and its ocamldoc documentation, in the META file as well
   as in example and test files.
 
- -- Mehdi Dogguy   Fri, 16 Oct 2015 23:37:49 +0200
+ -- Mehdi Dogguy   Fri, 16 Oct 2015 23:50:43 +0200
 
 xmlrpc-light (0.6.1-3) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/xmlrpc-light.git

___
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] [ocamlnet] 08/13: Fix compilation of Apache module

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit 6c124cb22d62e525b35b052ca5abf723b96dce55
Author: Stephane Glondu 
Date:   Thu Oct 15 13:47:55 2015 +0200

Fix compilation of Apache module
---
 .../0006-Fix-compilation-of-Apache-module.patch| 26 ++
 debian/patches/series  |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0006-Fix-compilation-of-Apache-module.patch 
b/debian/patches/0006-Fix-compilation-of-Apache-module.patch
new file mode 100644
index 000..3788560
--- /dev/null
+++ b/debian/patches/0006-Fix-compilation-of-Apache-module.patch
@@ -0,0 +1,26 @@
+From: Stephane Glondu 
+Date: Thu, 15 Oct 2015 13:42:46 +0200
+Subject: Fix compilation of Apache module
+
+When ocamlc is called with -g option, it calls the C compiler with this
+option, which does not work when the compiler is apxs2.
+---
+ src/netcgi2-apache/Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/netcgi2-apache/Makefile b/src/netcgi2-apache/Makefile
+index 218fa7c..f5a782f 100644
+--- a/src/netcgi2-apache/Makefile
 b/src/netcgi2-apache/Makefile
+@@ -55,7 +55,9 @@ mod_netcgi_apache.so: $(MOD_OBJECTS)
+ 
+ netcgi_apache_mod.lo: netcgi_apache_mod.o
+   echo "$@ generated by the rule for $^"
+-netcgi_apache_mod.o: netcgi_apache_mod.ml
++netcgi_apache_mod.o: netcgi_apache_mod.c
++  $(APXS) -c -o $@ $^
++netcgi_apache_mod.c: netcgi_apache_mod.ml
+   $(OCAMLC) -verbose -output-obj -linkall -o $@ -cc $(APXS) \
+ dynlink.cma unix.cma findlib.cma $^
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index fe242fa..81c90fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Do-not-install-apache.info-file.patch
 0004-Force-major-version-for-apache-to-2.patch
 0005-Fix-upstream-cleaning-rules.patch
+0006-Fix-compilation-of-Apache-module.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 07/13: Refresh patches

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit c59f6c1b795de8801c279db6ddbd0a71bc8f74af
Author: Stephane Glondu 
Date:   Thu Oct 15 09:55:40 2015 +0200

Refresh patches
---
 .../patches/0001-Avoid-shipping-GPL-license-text.patch  | 17 ++---
 .../patches/0002-Create-installation-directories.patch  |  4 ++--
 .../patches/0003-Do-not-install-apache.info-file.patch  | 10 +-
 .../0004-Force-major-version-for-apache-to-2.patch  |  4 ++--
 debian/patches/0005-Fix-upstream-cleaning-rules.patch   |  4 ++--
 5 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch 
b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
index 0256d53..a2e9611 100644
--- a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
+++ b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
@@ -6,22 +6,9 @@ We have it in Debian!
 
 Signed-off-by: Stefano Zacchiroli 
 ---
- src/nethttpd-for-netcgi2/Makefile.pre | 2 +-
- src/nethttpd/Makefile.pre | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/nethttpd/Makefile.pre | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/nethttpd-for-netcgi2/Makefile.pre 
b/src/nethttpd-for-netcgi2/Makefile.pre
-index d1c93f6..16d6c54 100644
 a/src/nethttpd-for-netcgi2/Makefile.pre
-+++ b/src/nethttpd-for-netcgi2/Makefile.pre
-@@ -4,6 +4,6 @@ PRE = 1
- PKGNAME = nethttpd-for-netcgi2
- GENERATE = META 
- 
--INSTALL_EXTRA += LICENSE
-+INSTALL_EXTRA +=
- 
- include $(TOP_DIR)/Makefile.rules
 diff --git a/src/nethttpd/Makefile.pre b/src/nethttpd/Makefile.pre
 index 9d370c0..2f2ae8f 100644
 --- a/src/nethttpd/Makefile.pre
diff --git a/debian/patches/0002-Create-installation-directories.patch 
b/debian/patches/0002-Create-installation-directories.patch
index e33ea4c..61865aa 100644
--- a/debian/patches/0002-Create-installation-directories.patch
+++ b/debian/patches/0002-Create-installation-directories.patch
@@ -10,10 +10,10 @@ Signed-off-by: Stefano Zacchiroli 
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index a0f4228..b8b5efc 100644
+index e5255c4..504d0da 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -48,6 +48,7 @@ doc:
+@@ -55,6 +55,7 @@ tools:
  # The following PHONY rule is important for Cygwin:
  .PHONY: install
  install:
diff --git a/debian/patches/0003-Do-not-install-apache.info-file.patch 
b/debian/patches/0003-Do-not-install-apache.info-file.patch
index 4e7cdae..017c3db 100644
--- a/debian/patches/0003-Do-not-install-apache.info-file.patch
+++ b/debian/patches/0003-Do-not-install-apache.info-file.patch
@@ -6,13 +6,13 @@ It is not needed with Apache 2.
 
 Signed-off-by: Stefano Zacchiroli 
 ---
- src/netcgi2-apache/Makefile.def | 2 +-
+ src/netcgi2-apache/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index 9efc603..6f6dfeb 100644
 a/src/netcgi2-apache/Makefile.def
-+++ b/src/netcgi2-apache/Makefile.def
+diff --git a/src/netcgi2-apache/Makefile b/src/netcgi2-apache/Makefile
+index 540141e..218fa7c 100644
+--- a/src/netcgi2-apache/Makefile
 b/src/netcgi2-apache/Makefile
 @@ -11,7 +11,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
  DOBJECTS = netcgi_apache.mli netcgi_modtpl.mli
  
diff --git a/debian/patches/0004-Force-major-version-for-apache-to-2.patch 
b/debian/patches/0004-Force-major-version-for-apache-to-2.patch
index e646ad0..c138d90 100644
--- a/debian/patches/0004-Force-major-version-for-apache-to-2.patch
+++ b/debian/patches/0004-Force-major-version-for-apache-to-2.patch
@@ -12,10 +12,10 @@ Signed-off-by: Stefano Zacchiroli 
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 17811cf..32c245b 100755
+index 2b9c66e..3a3dabb 100755
 --- a/configure
 +++ b/configure
-@@ -863,8 +863,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -895,8 +895,8 @@ if [ $enable_apache -gt 0 ]; then
apache=`get_path apache`
  fi
  
diff --git a/debian/patches/0005-Fix-upstream-cleaning-rules.patch 
b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
index 4d58800..32ee98d 100644
--- a/debian/patches/0005-Fix-upstream-cleaning-rules.patch
+++ b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
@@ -24,10 +24,10 @@ index 4f2f44b..2c83034 100644
 +distclean::
 +  $(RM) -rf .libs/ *.cds
 diff --git a/src/netsys/Makefile b/src/netsys/Makefile
-index 391def8..46a0b50 100644
+index 44b14e3..be70b5c 100644
 --- a/src/netsys/Makefile
 +++ b/src/netsys/Makefile
-@@ -99,7 +99,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
+@@ -104,7 +104,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
  
  
  clean::

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

[Pkg-ocaml-maint-commits] [ocamlnet] 09/13: Update packaging

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit 24cc2f120c7336800de777a28daf6826b19ba74e
Author: Stephane Glondu 
Date:   Thu Oct 15 11:06:04 2015 +0200

Update packaging
---
 debian/libnethttpd-ocaml-dev.install.in | 1 -
 debian/libocamlnet-ocaml-dev.install.in | 6 +-
 debian/libocamlnet-ssl-ocaml-dev.install.in | 2 --
 debian/libocamlnet-ssl-ocaml.install.in | 1 -
 debian/rules| 6 +++---
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/libnethttpd-ocaml-dev.install.in 
b/debian/libnethttpd-ocaml-dev.install.in
index dd88062..b6653c7 100644
--- a/debian/libnethttpd-ocaml-dev.install.in
+++ b/debian/libnethttpd-ocaml-dev.install.in
@@ -1,2 +1 @@
 @OCamlStdlibDir@/nethttpd  @OCamlStdlibDir@
-@OCamlStdlibDir@/nethttpd-for-netcgi2  @OCamlStdlibDir@
diff --git a/debian/libocamlnet-ocaml-dev.install.in 
b/debian/libocamlnet-ocaml-dev.install.in
index 24551a2..09f61ef 100644
--- a/debian/libocamlnet-ocaml-dev.install.in
+++ b/debian/libocamlnet-ocaml-dev.install.in
@@ -4,20 +4,16 @@
 @OCamlStdlibDir@/netcgi2-apache @OCamlStdlibDir@
 @OCamlStdlibDir@/netcgi2-plex   @OCamlStdlibDir@
 @OCamlStdlibDir@/netclient  @OCamlStdlibDir@
-@OCamlStdlibDir@/netgssapi  @OCamlStdlibDir@
-@OCamlStdlibDir@/netmech-scram  @OCamlStdlibDir@
 @OCamlStdlibDir@/netmulticore   @OCamlStdlibDir@
 @OCamlStdlibDir@/netplex@OCamlStdlibDir@
 @OCamlStdlibDir@/netshm @OCamlStdlibDir@
 @OCamlStdlibDir@/netstring  @OCamlStdlibDir@
 @OCamlStdlibDir@/netstring-pcre @OCamlStdlibDir@
 @OCamlStdlibDir@/netsys @OCamlStdlibDir@
+@OCamlStdlibDir@/netunidata @OCamlStdlibDir@
 @OCamlStdlibDir@/netzip @OCamlStdlibDir@
-@OCamlStdlibDir@/pop@OCamlStdlibDir@
-@OCamlStdlibDir@/rpc-auth-dh@OCamlStdlibDir@
 @OCamlStdlibDir@/rpc-auth-local @OCamlStdlibDir@
 @OCamlStdlibDir@/rpc-generator  @OCamlStdlibDir@
 @OCamlStdlibDir@/rpc@OCamlStdlibDir@
 @OCamlStdlibDir@/shell  @OCamlStdlibDir@
-@OCamlStdlibDir@/smtp   @OCamlStdlibDir@
 usr/share/ocamlnet  /usr/share
diff --git a/debian/libocamlnet-ssl-ocaml-dev.install.in 
b/debian/libocamlnet-ssl-ocaml-dev.install.in
index 4ee3334..e69de29 100644
--- a/debian/libocamlnet-ssl-ocaml-dev.install.in
+++ b/debian/libocamlnet-ssl-ocaml-dev.install.in
@@ -1,2 +0,0 @@
-@OCamlStdlibDir@/equeue-ssl@OCamlStdlibDir@
-@OCamlStdlibDir@/rpc-ssl   @OCamlStdlibDir@
diff --git a/debian/libocamlnet-ssl-ocaml.install.in 
b/debian/libocamlnet-ssl-ocaml.install.in
index 9af4eb1..e69de29 100644
--- a/debian/libocamlnet-ssl-ocaml.install.in
+++ b/debian/libocamlnet-ssl-ocaml.install.in
@@ -1 +0,0 @@
-@OCamlDllDir@/*equeue_ssl*.so  @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index f8bed80..bf477e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,11 @@ BUILD_TARGET += opt
 endif
 
 CFGFLAGS =
-CFGFLAGS += -enable-gtk2 -enable-ssl
-CFGFLAGS += -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh
+CFGFLAGS += -enable-gtk2
+CFGFLAGS += -with-nethttpd -prefer-netcgi2
 CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet
 CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
-CFGFLAGS += -enable-pcre -enable-zip -enable-crypto
+CFGFLAGS += -enable-pcre -enable-zip
 
 %:
dh $@ --with ocaml,apache2

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [obus] annotated tag debian/1.1.5-4 created (now 9ce010d)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag debian/1.1.5-4
in repository obus.

at  9ce010d   (tag)
   tagging  4164604989ac27ff75d0fea57609ce863c0ec287 (commit)
  replaces  debian/1.1.5-3
 tagged by  Stephane Glondu
on  Fri Oct 16 10:35:50 2015 +0200

- Log -
obus Debian release 1.1.5-4
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCgAGBQJWILbmAAoJEHhT2k1JiBrTjSQQAJPy7doY6KzFUFBXYwEP5fWa
PrORycjuMbKilCr8/qMTpFPLgOMQUP+pYWCO3mPcnySyBb6xyxoIbDjDRrzepUCt
5kjCQMK4YIiyMtD6z2iSNHSDv8s5Q23B2UK3nLY+LE1v51aYRVQdENdrHh8iXg8w
JJcLJ4yLFCG0DLCy7fnjeabOPd7LbmgLodpYLLA8rRWfZtfLtJw97UFgis+2Sd0B
Iu00CqE9Ka70A/k/3ug0kgxQVKl126M8PxLNVnJo/DwwPUZWkFIfaaoL11eaYcFW
/tAd5r6n8aEHhH2ZwkXTCxOebr6LJhLFJqBA9+ZbUmg2Pxyd+otOsU9sb5dPiFz3
dbhGPfK2HbbtvNt0uIubyCsvP+qgUMmCnK8BdpzWRMqXH+T0101dqCDCgW0Gca3v
MrOwG+QmXJXqfOSV+LKLPC6gdsWxDly4jhliGJeWaRWmaZ0UH5ML0moTLe2XzmrD
suY3TlKgQeLelIZyDP/WTKuaQdVU42hYB2Nx2kj0nqbq6z4SUIWhSYx1F52EWcjs
QVkPHZ9OX4XM+PL+c39y4np5c11IgSanIT3hf6zXQj1fSaLXD+gIyLqQ69q+fuQ8
WwtfrqACCs2RHx3dN7DBsgjlGq8aW66IXy2y3MiVY04+eDnrgvLitWr33yHU2P0F
tUeO3aGiRHb79QN8iSF4
=050J
-END PGP SIGNATURE-

Stephane Glondu (2):
  Add camlp4 to Build-Depends
  Prepare upload to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/obus.git

___
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] [obus] branch master updated (076d421 -> 4164604)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch master
in repository obus.

  from  076d421   Add camlp4 to Build-Depends
   new  4164604   Prepare upload to unstable

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/obus.git

___
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] [ocaml-usb] branch master updated (fde7167 -> d838e8f)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch master
in repository ocaml-usb.

  from  fde7167   Add camlp4 to Build-Depends
   new  d838e8f   Prepare upload to unstable

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-usb.git

___
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] [ocaml-usb] 01/01: Prepare upload to unstable

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-usb.

commit d838e8f0b2ceb9448e8e274da3ff50306cfa4c0c
Author: Stephane Glondu 
Date:   Fri Oct 16 10:30:21 2015 +0200

Prepare upload to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8a848a..a1669c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-ocaml-usb (1.3.0-3) UNRELEASED; urgency=medium
+ocaml-usb (1.3.0-3) unstable; urgency=medium
 
   * Add camlp4 to Build-Depends
 
- -- Stéphane Glondu   Wed, 17 Jun 2015 11:28:07 +0200
+ -- Stéphane Glondu   Fri, 16 Oct 2015 10:30:18 +0200
 
 ocaml-usb (1.3.0-2) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-usb.git

___
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] [ocaml-usb] annotated tag debian/1.3.0-3 created (now cc2115c)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag debian/1.3.0-3
in repository ocaml-usb.

at  cc2115c   (tag)
   tagging  d838e8f0b2ceb9448e8e274da3ff50306cfa4c0c (commit)
  replaces  debian/1.3.0-2
 tagged by  Stephane Glondu
on  Fri Oct 16 10:33:11 2015 +0200

- Log -
ocaml-usb Debian release 1.3.0-3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCgAGBQJWILZHAAoJEHhT2k1JiBrTs6EP/jdsu5cuKmL1i9/3xXQjG9mp
LE4mWBO28UPT5yS9KnT0k4AaNiz7ZWjr3mp+K02AtDjw6bo+NymmzZSw5Qxa+Vbd
ZkL7GmHeL19B5D4eVbX3LAV4/VB9DoFW3h5jUhXER6LBDcThQsMJIEkIqOB3Wgeo
pbfS2PWNXT9+4i0d05UnhDpWtSRPzdSSSkwFRe5gvPJAVFvTrBDjlRXkvqGYfuzJ
TTmLRetmSQpaaZk2OQezP4RA+mSsEI0CHO2WdMA1Dw1rKk2BwCPKh2PQ3mJKFbDB
YmErXNLh+oBwk2TUiqkIeh7GaF392yT8YQ6MXqPv8Bq7u8xO7e3umGilT1fUpBOL
gblDlsIc5GxXWFj03LS4I/lTYUm6HfPptkGso6CLIE3f+khON7LJ50wbBJCX6xNT
7XSTy+JUsqJ0mpIRqUC9Tu3JE+ebvIjosbcs5oTfQdTek2CZ79iYyMmW4wTis3RT
E+vDHMWfrfshaP/kq1T1X42+6ACQ2/yN5dU68wfDyqgLSgtFcpPMpXRq62iN5Ecl
0TCfZ2sOKvSkBU1J1+I9hJ78lNvz1SE+j+qjjtGnDE3EHoX1O8+OCv5YGQtRFDz0
lM05le2kbwrGagL96aKZI9JWbxJUoUrDRPC7onXZrr++0EcqyUAIPX+grk73z7Db
cADWptTWq1RuVYFMMlwJ
=yK+e
-END PGP SIGNATURE-

Stephane Glondu (2):
  Add camlp4 to Build-Depends
  Prepare upload to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-usb.git

___
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] [ocamlnet] 04/04: pristine-tar data for ocamlnet_4.0.4.orig.tar.gz

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository ocamlnet.

commit 77b4f93a7536ebedd798268d82e3a25b642009e1
Author: Stephane Glondu 
Date:   Thu Oct 15 09:37:22 2015 +0200

pristine-tar data for ocamlnet_4.0.4.orig.tar.gz
---
 ocamlnet_4.0.4.orig.tar.gz.delta | Bin 0 -> 117029 bytes
 ocamlnet_4.0.4.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ocamlnet_4.0.4.orig.tar.gz.delta b/ocamlnet_4.0.4.orig.tar.gz.delta
new file mode 100644
index 000..c433a1e
Binary files /dev/null and b/ocamlnet_4.0.4.orig.tar.gz.delta differ
diff --git a/ocamlnet_4.0.4.orig.tar.gz.id b/ocamlnet_4.0.4.orig.tar.gz.id
new file mode 100644
index 000..34ff788
--- /dev/null
+++ b/ocamlnet_4.0.4.orig.tar.gz.id
@@ -0,0 +1 @@
+c1b9eb53b66be2df3e88ef7628397ec6546749f7

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] annotated tag debian/4.0.4-1 created (now 363cd9f)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag debian/4.0.4-1
in repository ocamlnet.

at  363cd9f   (tag)
   tagging  67a2e33d2f38d26ea0336eb29c6a0622e1bff20d (commit)
  replaces  upstream/4.0.4
 tagged by  Stephane Glondu
on  Fri Oct 16 10:22:43 2015 +0200

- Log -
ocamlnet Debian release 4.0.4-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCgAGBQJWILPTAAoJEHhT2k1JiBrTg0MP/Rezxt+g0G4pGzp0qtmGL0Fk
h5vEMspq2KKjIq2s1Ai0mlpXFZGkH+y4T6fhiGr3bQA7w+OdigcZgkqwXXQEXT6k
wryA9jnk9gYBHIh3pUQAPmAvJPxUJm6JBDFtjW0xJXQwNhI55OU151BD1WYG20jK
hNRdAbdUgXY9leuRIrFbWCoew0GQ/0txGmUmrAB58ZD6vyI8aXJ2U3o8NhtWha1T
IzKELDYMC00VV44kMf+kWD2W2VN69DjXT9GVwEVEmxnYM+ivc05h7t4SXJRYhyzO
h/PwakI9AoQT8mkkpBcoJ5c4otOzfn/4bGRo6M9qaqiGGvlYmcuZ1F8FsSWgi0nk
nnmbQHUc04ch7jYfvb9xItT9OhF0hLcllA9kezdObEYQm49/PRtAgUPd5bTJ4hLg
4D3tIL9I7pVIE2NpxirttWnUllyOiVk+1QohunRrbXdkV3Q7w2vxjztj//mY42D5
b8djdg55fDCxat5nBzj6dmf1PSZyLa2EKDumMBAuSSn8cKPvCNm/tuJC7J1OFY2z
pLb1tskuDae2/qitRgVYWY6CTukdOYy2+lmbhAAPU5Rept+t+G5o78oyO1vJI0Kr
A/Z49z3Jvv6RMwrYJUO2jiAhDlwZxja+6qpwftTJa/Fe3Wm0b6XMVN002F2nNvyz
9f5I0EOiRRBcMImZPnOX
=eKjt
-END PGP SIGNATURE-

Eric Cooper (7):
  Update patches for new upstream version
  cgi directory is no longer shipped by upstream
  netcgi1 is no longer shipped by upstream
  nethttpd-for-netcgi1 is no longer shipped by upstream
  Don't ship *.so.owner files created by findlib
  Unapply patches after build
  changelog entry for version 3.2.1-1

Stefano Zacchiroli (125):
  first check in of svn-buildpackage aware ocamlnet package
  added preinst script to get dir of old diversions
  fixed bug in preinst which inhibit clean up of old diversions
  new upstream version 1.1
  Merge commit 'upstream/1.1'
  added some missing deps
  unreleased header
  right zack's email address in changelog
  bugfix: no longer mkdir -p /usr/lib/ during build
  policy-compliant lists in extended description
  unreleased header
  ships examples/
  fixed ftbfs
  /bin/bash as interpreter for preinst (bashisms are used)
  ocaml 3.09 transition
  bugfix: mv .so to libocamlnet-ocaml
  - ported to ocaml 3.09.1
  fixed typo in changelog
  next attempt at proper cleaning of divesions in old ocaml standard 
library directories
  transition to ocaml 3.09.2 (experimental upload)
  3.09.2 transition
  added to debian/control the XS-X-Vcs-Svn field pointing to the package's 
SVN URL
  better safe then sorry: commited the X-Svn-... change also to control.in 
files
  sane setting for debian/* stuff
  no longer needed, generated at build time
  bumped dep on pcre-ocaml
  local dpatch configuration (subsumes -b and ../upstream settings)
  ready for 3.09.3 and ocaml.mk
  typo with OCAML_HAVE_OCAMLOPT
  renamed Vcs-Svn to match the final name
  ready for the upload
  added watch file
  Merge commit 'upstream/2.2'
  token: I m working on ocamlnet 2.2
  ocamlnet 2.2 packaging snapshot
  - more recent upstream tarball (which fixes rpc DH build failure)
  snapshot: draft package split
  Merge commit 'upstream/2.2.3'
  snapshot, almost ready for an upload to experimental
  - split a new -bin package since the two binaries together are more than 
1 Mb
  cosmetic: added (dummy) misc:Depends field to the -bin package
  fixed typo which triggered useless re-invocation of ./configure upon 
"install"
  fix: libocamlnet-ocaml-bin does *not* provide librpc-ocaml-dev, only 
conflicts with it
  added recommends on -doc
  added transitional dummy packages for equeue, netclient, camlrpc
  versioned conflicts/replaces from -bin to librpc-ocaml-dev to avoid 
self-conflicts
  shortened changelog entry, it was boring ...
  recommend libnethttpd-ocaml-dev from the core package to avoid nethttpd 
disappear upon package upgrade
  care of transitions from etch:
  new upstream, minor fixes
  Merge commit 'upstream/2.2.4'
  added XS-Vcs-Browser field
  Merge commit 'upstream/2.2.7'
  new upstream release, targeted for unstable, still does not build 
properly against apache 2.2 (asked upstream the reason)
  disabled building of the apache connector against apache2 (currently not 
working upstream)
  ready(?) for an upload to unstable
  fixed sections to match the override file (which is right this time)
  * rebuild with OCaml 3.10
  * debian/patches
  add .dpatch extension in 00list, to ease jumping thru files with vim
  * debian/patches/
  - add build-dep on camlp5, the legacy camlp4
  * NOT RELEASED YET
  * new upstream release
  * libocamlnet-ocaml-dev.{postinst,preinst,postrm}
  * debian/rules
  * NOT RELEASED YET
  Merge commit 'upstream/2.2.8.1'
  merge

[Pkg-ocaml-maint-commits] [ocamlnet] 03/04: pristine-tar data for ocamlnet_4.0.3.orig.tar.gz

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository ocamlnet.

commit 9334ce5245856f4de412beac2f84808a83c2f35c
Author: Stephane Glondu 
Date:   Thu Oct 15 09:37:10 2015 +0200

pristine-tar data for ocamlnet_4.0.3.orig.tar.gz
---
 ocamlnet_4.0.3.orig.tar.gz.delta | Bin 0 -> 117801 bytes
 ocamlnet_4.0.3.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ocamlnet_4.0.3.orig.tar.gz.delta b/ocamlnet_4.0.3.orig.tar.gz.delta
new file mode 100644
index 000..3444548
Binary files /dev/null and b/ocamlnet_4.0.3.orig.tar.gz.delta differ
diff --git a/ocamlnet_4.0.3.orig.tar.gz.id b/ocamlnet_4.0.3.orig.tar.gz.id
new file mode 100644
index 000..a003cfb
--- /dev/null
+++ b/ocamlnet_4.0.3.orig.tar.gz.id
@@ -0,0 +1 @@
+8d20ef9131db3fc78d3cdcb02107a78461b7a078

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 10/13: Enable gnutls

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit 50fe58192937634c4b01cec511b8819dbe082b38
Author: Stephane Glondu 
Date:   Thu Oct 15 14:00:09 2015 +0200

Enable gnutls
---
 debian/control  | 1 +
 debian/libocamlnet-ssl-ocaml-dev.install.in | 1 +
 debian/libocamlnet-ssl-ocaml.install.in | 1 +
 debian/rules| 1 +
 4 files changed, 4 insertions(+)

diff --git a/debian/control b/debian/control
index 60b104a..25bf22b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
  libssl-ocaml-dev (>= 0.4.3-3~),
  libzip-ocaml-dev,
  libcryptokit-ocaml-dev,
+ libgnutls28-dev,
  apache2-dev
 Standards-Version: 3.9.4
 Homepage: http://projects.camlcity.org/projects/ocamlnet.html
diff --git a/debian/libocamlnet-ssl-ocaml-dev.install.in 
b/debian/libocamlnet-ssl-ocaml-dev.install.in
index e69de29..86bf6d7 100644
--- a/debian/libocamlnet-ssl-ocaml-dev.install.in
+++ b/debian/libocamlnet-ssl-ocaml-dev.install.in
@@ -0,0 +1 @@
+@OCamlStdlibDir@/nettls-gnutls @OCamlStdlibDir@
diff --git a/debian/libocamlnet-ssl-ocaml.install.in 
b/debian/libocamlnet-ssl-ocaml.install.in
index e69de29..d33a3bb 100644
--- a/debian/libocamlnet-ssl-ocaml.install.in
+++ b/debian/libocamlnet-ssl-ocaml.install.in
@@ -0,0 +1 @@
+@OCamlDllDir@/dllnettls-gnutls.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index bf477e3..0c2dc3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ CFGFLAGS += -with-nethttpd -prefer-netcgi2
 CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet
 CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
 CFGFLAGS += -enable-pcre -enable-zip
+CFGFLAGS += -enable-gnutls
 
 %:
dh $@ --with ocaml,apache2

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 12/13: Bump Standards-Version to 3.9.6

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit a08e45c98d87c7e80e2fc38ac4101f52af3161c3
Author: Stephane Glondu 
Date:   Fri Oct 16 09:55:53 2015 +0200

Bump Standards-Version to 3.9.6
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index d78d6f9..df4c7a5 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  libzip-ocaml-dev,
  libgnutls28-dev,
  apache2-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: http://projects.camlcity.org/projects/ocamlnet.html
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocamlnet.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocamlnet.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] branch pristine-tar updated (838bc67 -> 77b4f93)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch pristine-tar
in repository ocamlnet.

  from  838bc67   pristine-tar data for ocamlnet_3.7.7.orig.tar.gz
   new  fd871e6   pristine-tar data for ocamlnet_4.0.1.orig.tar.gz
   new  aabec50   pristine-tar data for ocamlnet_4.0.2.orig.tar.gz
   new  9334ce5   pristine-tar data for ocamlnet_4.0.3.orig.tar.gz
   new  77b4f93   pristine-tar data for ocamlnet_4.0.4.orig.tar.gz

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ocamlnet_4.0.1.orig.tar.gz.delta | Bin 0 -> 118247 bytes
 ocamlnet_4.0.1.orig.tar.gz.id|   1 +
 ocamlnet_4.0.2.orig.tar.gz.delta | Bin 0 -> 125809 bytes
 ocamlnet_4.0.2.orig.tar.gz.id|   1 +
 ocamlnet_4.0.3.orig.tar.gz.delta | Bin 0 -> 117801 bytes
 ocamlnet_4.0.3.orig.tar.gz.id|   1 +
 ocamlnet_4.0.4.orig.tar.gz.delta | Bin 0 -> 117029 bytes
 ocamlnet_4.0.4.orig.tar.gz.id|   1 +
 8 files changed, 4 insertions(+)
 create mode 100644 ocamlnet_4.0.1.orig.tar.gz.delta
 create mode 100644 ocamlnet_4.0.1.orig.tar.gz.id
 create mode 100644 ocamlnet_4.0.2.orig.tar.gz.delta
 create mode 100644 ocamlnet_4.0.2.orig.tar.gz.id
 create mode 100644 ocamlnet_4.0.3.orig.tar.gz.delta
 create mode 100644 ocamlnet_4.0.3.orig.tar.gz.id
 create mode 100644 ocamlnet_4.0.4.orig.tar.gz.delta
 create mode 100644 ocamlnet_4.0.4.orig.tar.gz.id

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 01/04: pristine-tar data for ocamlnet_4.0.1.orig.tar.gz

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository ocamlnet.

commit fd871e6874eb70cf22c789eee59219b830b59f31
Author: Stephane Glondu 
Date:   Thu Oct 15 09:36:51 2015 +0200

pristine-tar data for ocamlnet_4.0.1.orig.tar.gz
---
 ocamlnet_4.0.1.orig.tar.gz.delta | Bin 0 -> 118247 bytes
 ocamlnet_4.0.1.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ocamlnet_4.0.1.orig.tar.gz.delta b/ocamlnet_4.0.1.orig.tar.gz.delta
new file mode 100644
index 000..f7e1cab
Binary files /dev/null and b/ocamlnet_4.0.1.orig.tar.gz.delta differ
diff --git a/ocamlnet_4.0.1.orig.tar.gz.id b/ocamlnet_4.0.1.orig.tar.gz.id
new file mode 100644
index 000..618aa09
--- /dev/null
+++ b/ocamlnet_4.0.1.orig.tar.gz.id
@@ -0,0 +1 @@
+bfe72ce653744a3644846d68713e0a5ccd49fb15

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 02/04: pristine-tar data for ocamlnet_4.0.2.orig.tar.gz

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch pristine-tar
in repository ocamlnet.

commit aabec5068b41be4dba60e4451d14c7f23a80
Author: Stephane Glondu 
Date:   Thu Oct 15 09:37:01 2015 +0200

pristine-tar data for ocamlnet_4.0.2.orig.tar.gz
---
 ocamlnet_4.0.2.orig.tar.gz.delta | Bin 0 -> 125809 bytes
 ocamlnet_4.0.2.orig.tar.gz.id|   1 +
 2 files changed, 1 insertion(+)

diff --git a/ocamlnet_4.0.2.orig.tar.gz.delta b/ocamlnet_4.0.2.orig.tar.gz.delta
new file mode 100644
index 000..1ecfdf4
Binary files /dev/null and b/ocamlnet_4.0.2.orig.tar.gz.delta differ
diff --git a/ocamlnet_4.0.2.orig.tar.gz.id b/ocamlnet_4.0.2.orig.tar.gz.id
new file mode 100644
index 000..485b09d
--- /dev/null
+++ b/ocamlnet_4.0.2.orig.tar.gz.id
@@ -0,0 +1 @@
+c2e6ebf11c8d0a895bb20afade431863dd8bddf8

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 11/13: Remove obsolete build-dependencies

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit 374caea52f4aecb6c562b29b2d5669d502796482
Author: Stephane Glondu 
Date:   Thu Oct 15 14:32:39 2015 +0200

Remove obsolete build-dependencies
---
 debian/control | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/control b/debian/control
index 25bf22b..d78d6f9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,7 @@ Build-Depends:
  libpcre-ocaml-dev (>= 6.0.1-2~),
  liblablgtk2-ocaml-dev (>= 2.12.0-4~),
  libcryptgps-ocaml-dev (>= 0.2.1-7~),
- libssl-ocaml-dev (>= 0.4.3-3~),
  libzip-ocaml-dev,
- libcryptokit-ocaml-dev,
  libgnutls28-dev,
  apache2-dev
 Standards-Version: 3.9.4

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 13/13: Update changelog and prepare upload to unstable

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit 67a2e33d2f38d26ea0336eb29c6a0622e1bff20d
Author: Stephane Glondu 
Date:   Fri Oct 16 09:41:57 2015 +0200

Update changelog and prepare upload to unstable
---
 debian/changelog | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d08da9d..0e46f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-ocamlnet (4.0.4-1) UNRELEASED; urgency=medium
+ocamlnet (4.0.4-1) unstable; urgency=medium
 
   * New upstream release
+- compiles with OCaml 4.02.3 (Closes: #801550)
+- remove libssl-ocaml-dev and libcryptokit-ocaml-dev from
+  Build-Depends; add libgnutls28-dev
+- add patch Fix-compilation-of-Apache-module
+  * Bump Standards-Version to 3.9.6
 
- -- Stéphane Glondu   Thu, 15 Oct 2015 09:40:32 +0200
+ -- Stéphane Glondu   Fri, 16 Oct 2015 09:55:18 +0200
 
 ocamlnet (3.7.3-4) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] 06/13: New upstream release

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlnet.

commit 77b28059b14aa0a659eb633aec9fa086043c79b5
Author: Stephane Glondu 
Date:   Thu Oct 15 09:40:35 2015 +0200

New upstream release
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b00f58e..d08da9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-ocamlnet (3.7.7-1) UNRELEASED; urgency=medium
+ocamlnet (4.0.4-1) UNRELEASED; urgency=medium
 
   * New upstream release
 
- -- Stéphane Glondu   Thu, 26 Feb 2015 10:51:33 +0100
+ -- Stéphane Glondu   Thu, 15 Oct 2015 09:40:32 +0200
 
 ocamlnet (3.7.3-4) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] annotated tag upstream/4.0.2 created (now 5a5bd08)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/4.0.2
in repository ocamlnet.

at  5a5bd08   (tag)
   tagging  87aa9489718ab37e9afdccf3300fd1044325e287 (commit)
  replaces  upstream/4.0.1
 tagged by  Stephane Glondu
on  Thu Oct 15 09:37:01 2015 +0200

- Log -
Upstream version 4.0.2

Stephane Glondu (1):
  Imported Upstream version 4.0.2

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] annotated tag upstream/4.0.3 created (now 4109bd1)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/4.0.3
in repository ocamlnet.

at  4109bd1   (tag)
   tagging  ccb5cf7ffc9620c4559e41fc038732788cf7e316 (commit)
  replaces  upstream/4.0.2
 tagged by  Stephane Glondu
on  Thu Oct 15 09:37:10 2015 +0200

- Log -
Upstream version 4.0.3

Stephane Glondu (1):
  Imported Upstream version 4.0.3

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] annotated tag upstream/4.0.4 created (now 706f037)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/4.0.4
in repository ocamlnet.

at  706f037   (tag)
   tagging  ad91e78aeed8990f688284505b5d952d6c528de3 (commit)
  replaces  upstream/4.0.3
 tagged by  Stephane Glondu
on  Thu Oct 15 09:37:22 2015 +0200

- Log -
Upstream version 4.0.4

Stephane Glondu (1):
  Imported Upstream version 4.0.4

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [ocamlnet] annotated tag upstream/4.0.1 created (now 873498f)

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag upstream/4.0.1
in repository ocamlnet.

at  873498f   (tag)
   tagging  68045898e2156122d040c06cda94beb024091c57 (commit)
  replaces  upstream/3.7.7
 tagged by  Stephane Glondu
on  Thu Oct 15 09:36:51 2015 +0200

- Log -
Upstream version 4.0.1

Stephane Glondu (1):
  Imported Upstream version 4.0.1

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git

___
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] [obus] 01/01: Prepare upload to unstable

2015-10-16 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository obus.

commit 4164604989ac27ff75d0fea57609ce863c0ec287
Author: Stephane Glondu 
Date:   Fri Oct 16 10:29:50 2015 +0200

Prepare upload to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb1d0dd..ffc076e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-obus (1.1.5-4) UNRELEASED; urgency=medium
+obus (1.1.5-4) unstable; urgency=medium
 
   * Add camlp4 to Build-Depends
 
- -- Stéphane Glondu   Wed, 17 Jun 2015 11:25:55 +0200
+ -- Stéphane Glondu   Fri, 16 Oct 2015 10:29:44 +0200
 
 obus (1.1.5-3) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/obus.git

___
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] [ocaml-lastfm] branch master updated (538bf75 -> 9c630be)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository ocaml-lastfm.

  from  538bf75   New upload.
   new  7951e23   Port to ocamlnet 4.0.4
   new  9c630be   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |  7 +++
 debian/control   |  2 +-
 debian/patches/0001-Port-to-ocamlnet-4.0.4.patch | 54 
 debian/patches/series|  1 +
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0001-Port-to-ocamlnet-4.0.4.patch
 create mode 100644 debian/patches/series

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-lastfm.git

___
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] [ocaml-lastfm] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocaml-lastfm.

commit 9c630becbb5b67fefffe168b7770f8a5739c7bd5
Author: Mehdi Dogguy 
Date:   Sat Oct 17 00:05:17 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dea083..73dafa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-ocaml-lastfm (0.3.0-4) UNRELEASED; urgency=medium
+ocaml-lastfm (0.3.0-4) unstable; urgency=medium
 
   * Team upload.
   * Port to ocamlnet 4.0.4
 
- -- Mehdi Dogguy   Sat, 17 Oct 2015 00:04:25 +0200
+ -- Mehdi Dogguy   Sat, 17 Oct 2015 00:05:17 +0200
 
 ocaml-lastfm (0.3.0-3) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-lastfm.git

___
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] [why] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository why.

commit 68f25ada046ddc0a772402eca9153422b536dadf
Author: Mehdi Dogguy 
Date:   Sat Oct 17 01:12:21 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f9636e..9a0fae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-why (2.34-4) UNRELEASED; urgency=medium
+why (2.34-4) unstable; urgency=medium
 
   [ Ralf Treinen ]
   * improve as-installed package tests
@@ -9,7 +9,7 @@ why (2.34-4) UNRELEASED; urgency=medium
 - not turning warning 3 into an error
   * Port Why to ocamlgraph 1.8.6
 
- -- Mehdi Dogguy   Sat, 17 Oct 2015 00:22:35 +0200
+ -- Mehdi Dogguy   Sat, 17 Oct 2015 01:12:21 +0200
 
 why (2.34-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/why.git

___
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] [why] 01/02: Fix FTBFS with OCaml 4.02.3

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository why.

commit 773e2998237026472a455b091e330dd59727d954
Author: Mehdi Dogguy 
Date:   Sat Oct 17 00:23:30 2015 +0200

Fix FTBFS with OCaml 4.02.3
---
 debian/changelog| 11 +--
 debian/patches/bprintf  | 17 +
 debian/patches/edge | 13 +
 debian/patches/makefile | 13 +
 debian/patches/series   |  3 +++
 5 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dbd078..5f9636e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-why (2.34-3) UNRELEASED; urgency=medium
+why (2.34-4) UNRELEASED; urgency=medium
 
+  [ Ralf Treinen ]
   * improve as-installed package tests
 
- -- Ralf Treinen   Thu, 16 Oct 2014 22:08:01 +0200
+  [ Mehdi Dogguy ]
+  * Fix FTBFS with OCaml 4.02.3 by:
+- not using Format.bprintf anymore
+- not turning warning 3 into an error
+  * Port Why to ocamlgraph 1.8.6
+
+ -- Mehdi Dogguy   Sat, 17 Oct 2015 00:22:35 +0200
 
 why (2.34-2) unstable; urgency=medium
 
diff --git a/debian/patches/bprintf b/debian/patches/bprintf
new file mode 100644
index 000..8d813b6
--- /dev/null
+++ b/debian/patches/bprintf
@@ -0,0 +1,17 @@
+Author: Mehdi Dogguy 
+Description: Stop using deprecated function Format.bprintf
+
+Index: src/encoding_mono_inst.ml
+===
+--- a/src/encoding_mono_inst.ml
 b/src/encoding_mono_inst.ml
+@@ -126,7 +126,8 @@
+ | PTexternal (l,id) -> fprintf fmt "%aI%a" 
+ (Pp.print_list (Pp.constant_string "I") aux) l Ident.print id in
+   let b = Buffer.create 10 in
+-  Format.bprintf b "%a@?" aux t;
++  let to_b = Format.formatter_of_buffer b in
++  Format.fprintf to_b "%a@?" aux t;
+   let from = match from,t with
+ | true,PTexternal (l,id) -> Some (create_ident_id,id::(List.map 
(ident_of_close_type ~from:false) l))
+ | _ -> None in
diff --git a/debian/patches/edge b/debian/patches/edge
new file mode 100644
index 000..449fc6d
--- /dev/null
+++ b/debian/patches/edge
@@ -0,0 +1,13 @@
+--- a/src/hypotheses_filtering.ml
 b/src/hypotheses_filtering.ml
+@@ -1687,8 +1687,9 @@
+ 
+ module W = struct 
+   type label = PdlGraph.E.label
++  type edge = PdlGraph.E.t
+   type t = int
+-  let weight x = x
++  let weight x = PdlGraph.E. label x
+   let zero = 0
+   let add = (+)
+   let compare = compare
diff --git a/debian/patches/makefile b/debian/patches/makefile
new file mode 100644
index 000..5469d22
--- /dev/null
+++ b/debian/patches/makefile
@@ -0,0 +1,13 @@
+--- a/Makefile.in
 b/Makefile.in
+@@ -64,8 +64,8 @@
+ CAMLP4   = @CAMLP4O@
+ 
+ INCLUDES = -I src -I jc -I c -I java -I intf -I tools -I mix -I ml
+-BFLAGS   = -w Z -warn-error A -dtypes -g $(INCLUDES) @INCLUDEGTK2@ -I 
+threads @OCAMLGRAPHLIB@
+-OFLAGS   = -w Z -warn-error A -dtypes $(INCLUDES) @INCLUDEGTK2@ -I +threads 
@OCAMLGRAPHLIB@
++BFLAGS   = -w Z -warn-error +a-3 -dtypes -g $(INCLUDES) @INCLUDEGTK2@ -I 
+threads @OCAMLGRAPHLIB@
++OFLAGS   = -w Z -warn-error +a-3 -dtypes $(INCLUDES) @INCLUDEGTK2@ -I 
+threads @OCAMLGRAPHLIB@
+ 
+ LCFLAGS = -L/usr/lib -L/usr/local/lib/ocaml
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 72f8956..cc1e7af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 atp-versions
+bprintf
+makefile
+edge

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/why.git

___
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] [why] branch master updated (355dcfe -> 68f25ad)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository why.

  from  355dcfe   improve as installed package tests
   new  773e299   Fix FTBFS with OCaml 4.02.3
   new  68f25ad   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog| 11 +--
 debian/patches/bprintf  | 17 +
 debian/patches/edge | 13 +
 debian/patches/makefile | 13 +
 debian/patches/series   |  3 +++
 5 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/bprintf
 create mode 100644 debian/patches/edge
 create mode 100644 debian/patches/makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/why.git

___
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] [why] annotated tag debian/2.34-4 created (now c413a26)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/2.34-4
in repository why.

at  c413a26   (tag)
   tagging  68f25ada046ddc0a772402eca9153422b536dadf (commit)
  replaces  debian/2.34-2
 tagged by  Mehdi Dogguy
on  Sat Oct 17 01:17:44 2015 +0200

- Log -
why Debian release 2.34-4

Mehdi Dogguy (2):
  Fix FTBFS with OCaml 4.02.3
  Release to unstable

Ralf Treinen (1):
  improve as installed package tests

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/why.git

___
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] [ocaml-lastfm] 01/02: Port to ocamlnet 4.0.4

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocaml-lastfm.

commit 7951e23ca58fb432d037263524ac88d7a648c752
Author: Mehdi Dogguy 
Date:   Sat Oct 17 00:05:00 2015 +0200

Port to ocamlnet 4.0.4
---
 debian/changelog |  7 +++
 debian/control   |  2 +-
 debian/patches/0001-Port-to-ocamlnet-4.0.4.patch | 54 
 debian/patches/series|  1 +
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d2e8d7e..8dea083 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-lastfm (0.3.0-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Port to ocamlnet 4.0.4
+
+ -- Mehdi Dogguy   Sat, 17 Oct 2015 00:04:25 +0200
+
 ocaml-lastfm (0.3.0-3) unstable; urgency=low
 
   * Rebuild against latest packages. 
diff --git a/debian/control b/debian/control
index be5515f..76abfdc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers 

 Uploaders: Samuel Mimram , Romain Beauxis 

 Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ocaml-nox, dh-ocaml (>= 
0.9),
ocaml-findlib (>= 1.2.4), libxmlplaylist-ocaml-dev (>= 0.1.3), 
-   libocamlnet-ocaml-dev (>= 2.2.9-7~), libpcre-ocaml-dev (>= 
6.0.1-2~)
+   libocamlnet-ocaml-dev (>= 4.0.4~), libpcre-ocaml-dev (>= 
6.0.1-2~)
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/pkg-ocaml-maint/packages/ocaml-lastfm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-lastfm.git
diff --git a/debian/patches/0001-Port-to-ocamlnet-4.0.4.patch 
b/debian/patches/0001-Port-to-ocamlnet-4.0.4.patch
new file mode 100644
index 000..ca99adc
--- /dev/null
+++ b/debian/patches/0001-Port-to-ocamlnet-4.0.4.patch
@@ -0,0 +1,54 @@
+From: Mehdi Dogguy 
+Date: Sat, 17 Oct 2015 00:02:55 +0200
+Subject: Port to ocamlnet 4.0.4
+
+---
+ examples/download.ml |  2 +-
+ src/lastfm.ml| 10 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/examples/download.ml b/examples/download.ml
+index e9bfaeb..803a81e 100644
+--- a/examples/download.ml
 b/examples/download.ml
+@@ -18,7 +18,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *)
+ 
+-open Http_client
++open Nethttp_client
+ 
+ let _ =
+   try
+diff --git a/src/lastfm.ml b/src/lastfm.ml
+index 32f82aa..dd2f3ac 100644
+--- a/src/lastfm.ml
 b/src/lastfm.ml
+@@ -38,13 +38,13 @@ struct
+ in
+ let call = 
+   match request with
+-| Get -> new Http_client.get_call
+-| Post _ -> new Http_client.post_call
++| Get -> new Nethttp_client.get_call
++| Post _ -> new Nethttp_client.post_call
+ in
+-let pipeline = new Http_client.pipeline in
++let pipeline = new Nethttp_client.pipeline in
+ pipeline#set_options 
+   { pipeline#get_options with 
+-  Http_client.connection_timeout = timeout 
++  Nethttp_client.connection_timeout = timeout 
+   } ;
+ let http_headers = call#request_header `Base in
+ let body = call#request_body in
+@@ -72,7 +72,7 @@ struct
+   pipeline#run () ;
+   call#response_body#value
+ with
+-  | Http_client.Http_protocol e 
++  | Nethttp_client.Http_protocol e 
+   | e -> 
+  pipeline#reset() ; 
+  raise (Http  (Printexc.to_string e))
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..d452ad3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Port-to-ocamlnet-4.0.4.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-lastfm.git

___
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] [galax] 01/02: Port to ocamlnet 4.0.4

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository galax.

commit 3d2d4037f739ba17792b179afe774a5b4d49f2ce
Author: Mehdi Dogguy 
Date:   Sat Oct 17 00:34:26 2015 +0200

Port to ocamlnet 4.0.4
---
 debian/changelog   |  6 +++
 debian/control |  2 +-
 .../patches/0011-Compile-with-ocamlnet-4.0.4.patch | 52 ++
 debian/patches/series  |  1 +
 4 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 95b720c..8a8759d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+galax (1.1-13) UNRELEASED; urgency=medium
+
+  * Port to ocamlnet 4.0.4
+
+ -- Mehdi Dogguy   Sat, 17 Oct 2015 00:33:18 +0200
+
 galax (1.1-12) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 309e085..9230988 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  autotools-dev,
  camlp4,
  libpcre-ocaml-dev,
- libocamlnet-ocaml-dev (>= 3.3.5),
+ libocamlnet-ocaml-dev (>= 4.0.4),
  libpxp-ocaml-dev (>= 1.2.1-1~),
  libcamomile-ocaml-dev,
  hevea,
diff --git a/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch 
b/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch
new file mode 100644
index 000..417d561
--- /dev/null
+++ b/debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch
@@ -0,0 +1,52 @@
+From: Mehdi Dogguy 
+Date: Sat, 17 Oct 2015 00:32:56 +0200
+Subject: Compile with ocamlnet 4.0.4
+
+---
+ configure  | 6 +++---
+ tools/http/http.ml | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index b513732..0d34b39 100755
+--- a/configure
 b/configure
+@@ -725,7 +725,7 @@ fi
+ printf "%s" "Checking for OCaml netclient library... "
+ if [ -z "$ocaml_netclient" ]
+ then
+-  if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/netclient" -a -f 
"$ocaml_pkglib/netclient/http_client.cmi" ]
++  if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/netclient" -a -f 
"$ocaml_pkglib/netclient/nethttp_client.cmi" ]
+   then
+   ocaml_netclient="$ocaml_pkglib/netclient"
+   elif [ -n "$tool_ocamlfind" ]
+@@ -733,11 +733,11 @@ then
+   ocaml_netclient=`$tool_ocamlfind query netclient 2>/dev/null`
+   fi
+ fi
+-if [ -n "$ocaml_netclient" -a -f "$ocaml_netclient/http_client.cmi" ]
++if [ -n "$ocaml_netclient" -a -f "$ocaml_netclient/nethttp_client.cmi" ]
+ then
+   echo "found"
+ else
+-  echo "ERROR: unable to find http_client.cmi in $ocaml_netclient"
++  echo "ERROR: unable to find nethttp_client.cmi in $ocaml_netclient"
+   exit 1
+ fi
+ 
+diff --git a/tools/http/http.ml b/tools/http/http.ml
+index 70a1d04..b5ef3da 100644
+--- a/tools/http/http.ml
 b/tools/http/http.ml
+@@ -165,8 +165,8 @@ module HTTP = struct
+ process_response result
+
+   let get url = 
+-let call = new Http_client.get url in
+-let pipeline = new Http_client.pipeline in
++let call = new Nethttp_client.get url in
++let pipeline = new Nethttp_client.pipeline in
+ pipeline # add call;
+ pipeline#run();
+ match call#status with
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3ef7f8d..4ed8acf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-Fix-configure-for-hurd.patch
 0009-Fix-build-with-ocaml-4.01.patch
 0010-Fix-space-tab-issue-in-some-Makefiles.patch
+0011-Compile-with-ocamlnet-4.0.4.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/galax.git

___
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] [galax] 02/02: Release to unstable

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository galax.

commit c2c951a635c7721958556629f6b99cfe9ee99c34
Author: Mehdi Dogguy 
Date:   Sat Oct 17 00:35:38 2015 +0200

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a8759d..6942d94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-galax (1.1-13) UNRELEASED; urgency=medium
+galax (1.1-13) unstable; urgency=medium
 
   * Port to ocamlnet 4.0.4
 
- -- Mehdi Dogguy   Sat, 17 Oct 2015 00:33:18 +0200
+ -- Mehdi Dogguy   Sat, 17 Oct 2015 00:35:38 +0200
 
 galax (1.1-12) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/galax.git

___
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] [galax] annotated tag debian/1.1-13 created (now cd5e478)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/1.1-13
in repository galax.

at  cd5e478   (tag)
   tagging  c2c951a635c7721958556629f6b99cfe9ee99c34 (commit)
  replaces  debian/1.1-12
 tagged by  Mehdi Dogguy
on  Sat Oct 17 00:50:31 2015 +0200

- Log -
galax Debian release 1.1-13

Mehdi Dogguy (2):
  Port to ocamlnet 4.0.4
  Release to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/galax.git

___
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] [galax] branch master updated (887670c -> c2c951a)

2015-10-16 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository galax.

  from  887670c   Release to unstable
   new  3d2d403   Port to ocamlnet 4.0.4
   new  c2c951a   Release to unstable

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |  6 +++
 debian/control |  2 +-
 .../patches/0011-Compile-with-ocamlnet-4.0.4.patch | 52 ++
 debian/patches/series  |  1 +
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0011-Compile-with-ocamlnet-4.0.4.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/galax.git

___
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] [dose3] 01/01: skip ocamldoc

2015-10-16 Thread Ralf Treinen 
This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to annotated tag debian/4.0.2-2
in repository dose3.

commit eab78b429c3e745cd3d926ac734480141b515d2f
Author: Ralf Treinen 
Date:   Fri Oct 16 19:02:10 2015 +0200

skip ocamldoc
---
 debian/changelog   | 10 ++
 debian/libdose3-ocaml-dev.doc-base |  9 -
 debian/libdose3-ocaml-dev.docs |  2 +-
 debian/patches/series  |  1 +
 debian/patches/skip-ocamldoc   | 15 +++
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 053c1f1..f8639e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dose3 (4.0.2-2) unstable; urgency=medium
+
+  * skip generation of ocamldoc documentation  since it fails with ocaml 4.02
+(closes: #801773):
+- patch skip-ocamldoc
+- debian/libdose3-ocaml-dev.docs
+- drop debian/libdose3-ocaml-dev.doc-base
+
+ -- Ralf Treinen   Fri, 16 Oct 2015 19:12:52 +0200
+
 dose3 (4.0.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/libdose3-ocaml-dev.doc-base 
b/debian/libdose3-ocaml-dev.doc-base
deleted file mode 100644
index f33fe47..000
--- a/debian/libdose3-ocaml-dev.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: dose3
-Title: libdose3-ocaml-dev OCamldoc API Reference
-Author: Pietro Abate
-Abstract: API reference manual for libdose3-ocaml-dev (generated via OCamldoc)
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libdose3-ocaml-dev/dose3.docdir/index.html
-Files: /usr/share/doc/libdose3-ocaml-dev/dose3.docdir/*
diff --git a/debian/libdose3-ocaml-dev.docs b/debian/libdose3-ocaml-dev.docs
index e93ad7f..d9d06aa 100644
--- a/debian/libdose3-ocaml-dev.docs
+++ b/debian/libdose3-ocaml-dev.docs
@@ -1 +1 @@
-_build/dose3.docdir
+#_build/dose3.docdir
diff --git a/debian/patches/series b/debian/patches/series
index b7e42fd..35289e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 binaries-prefix-edos
 coinstall-binary-name
 # librpm-4.12
+skip-ocamldoc
diff --git a/debian/patches/skip-ocamldoc b/debian/patches/skip-ocamldoc
new file mode 100644
index 000..2914db5
--- /dev/null
+++ b/debian/patches/skip-ocamldoc
@@ -0,0 +1,15 @@
+Index: dose3/Makefile
+===
+--- dose3.orig/Makefile2015-10-16 18:38:17.046686436 +0200
 dose3/Makefile 2015-10-16 19:01:07.752813579 +0200
+@@ -227,8 +227,8 @@
+   @git log --pretty=format:'%aN%aE' | LC_ALL=C sort -u | awk 
-F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';
+ 
+ doc: all
+-  $(OCAMLBUILD) dose3.docdir/index.html dose3.docdir/index.dot
+-  dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
++  #$(OCAMLBUILD) dose3.docdir/index.html dose3.docdir/index.dot
++  #dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
+   (cd doc && $(MAKE) all)
+ 
+ man:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

___
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] [dose3] annotated tag debian/4.0.2-2 created (now 8e87932)

2015-10-16 Thread Ralf Treinen 
This is an automated email from the git hooks/post-receive script.

treinen pushed a change to annotated tag debian/4.0.2-2
in repository dose3.

at  8e87932   (tag)
   tagging  eab78b429c3e745cd3d926ac734480141b515d2f (commit)
  replaces  debian/3.3-4
 tagged by  Ralf Treinen
on  Fri Oct 16 19:13:51 2015 +0200

- Log -
dose3 Debian release 4.0.2-2

Johannes Schauer (26):
  remove patches cudfSolver-fix-leaking-fds and 
encode-package-name-in-cudf_extras
  upstream moved deb/format822.ml to common - adjusting d/copyright
  upstream moved ./deb/version.ml to ./versioning/debian_version.ml
  add d/copyright paragraph for common/shell_lexer.mll
  reenable `make doc` with a patch against upstream
  bump d/compat to 9
  d/rules: simplify override_dh_auto_configure target
  run dh-autoreconf to make sure that everything can truly be built from 
source
  add d/missing-sources with sources for bootstrap.min.js and 
jquery-2.1.3.min.js, document in d/README.source and add d/copyright entries
  add doc/webpages to Files-Excluded in d/copyright
  run dch -r to refresh timestamp in latest d/copyright entry for upload
  update debian/dose-distcheck.NEWS with more content
  Imported Upstream version 4.0.1
  Merge tag 'upstream/4.0.1'
  adapt debian/changelog for new upstream release
  upstream dropped doc/webpages directory so remove debian/missing-sources 
and the corresponding sections from debian/copyright
  remove patch make-doc-target-work as upstream fixed this
  bump version requirement for libextlib-ocaml-dev to 1.7.0 because 
upstream requires implementation for custom exit values if wrong command line 
options are passed
  restructure debian/changelog for new upstream release and close #797448
  debian/dose-distcheck.NEWS: modify header to make lintian happy
  release 4.0.1-1 to unstable
  release 4.0.1-2 with new patch fix_META
  Imported Upstream version 4.0.2
  Merge tag 'upstream/4.0.2'
  update changelog for 4.0.2-1 and remove patch fix_META
  release 4.0.2-1 to unstable

Ralf Treinen (14):
  drop edos-distcheck transitional package
  Imported Upstream version 4.0
  Imported Upstream version 4.0
  Imported Upstream version 4.0
  Imported Upstream version 4.0
  Imported Upstream version 4.0
  Merge tag 'upstream/4.0'
  upstream 4.0
  update debian patches
  build-dependency cppo
  no make doc
  simplify build target. upstream now builds the primers
  NEWS: changes in output format
  skip ocamldoc

---

This annotated tag includes the following new commits:

   new  eab78b4   skip ocamldoc

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

___
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