[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging annotated tag, debian/0.90+bzr356-1, created. debian/0.90+bzr356-1

2013-02-18 Thread Lucas Nussbaum 
The annotated tag, debian/0.90+bzr356-1 has been created
at  54a914581fa32dcd979fc22468513682ca2b4909 (tag)
   tagging  1a2478901057100f20a4ff84efed4b37a2081e96 (commit)
  replaces  debian/0.50.1-4
 tagged by  Lucas Nussbaum
on  Mon Feb 18 21:16:56 2013 +0100

- Shortlog 
Debian release 0.90+bzr356-1

Lucas Nussbaum (29):
  Add get-orig-source target
  Imported Upstream version 0.90+bzr337
  Merge tag 'upstream/0.90+bzr337'
  update changelog
  Initial debian/rules
  Convert package to 3.0 (quilt).
  Remove obsolete dir
  Add patch to fix some includes.
  Continued debian/rules.
  Build-Depends clean-up
  Merge tag 'upstream/0.90+bzr348'
  Imported Upstream version 0.90+bzr348
  new upstream snapshot
  Add patch: edit CONFIGME to install to debian/tmp
  Bump debian/compat
  Restrict build-dependencies a bit
  Clean debian/rules
  File no longer needed
  Remove old useless files.
  disable tests, there are none
  Imported Upstream version 0.90+bzr356
  Merge tag 'upstream/0.90+bzr356'
  new snapshot from upstream
  Update some control fields
  add some build-deps
  Drop DMUA
  Update debian/copyright
  Remove .bzr dir from future snapshots
  Prepare changelog for upload

Sylvain Le Gall (1):
  Remove Sylvain Le Gall from uploaders

---

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-30-g1a24789

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 7a6f41c2c4fe8943f41343d2a3a26f7cb757ed6c
Author: Lucas Nussbaum 
Date:   Mon Feb 18 20:55:03 2013 +0100

Update debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 2a9cc72..43fd965 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,41 @@
-This package was debianized by Jonathan Roudiere  
 on
-Mon, 14 Apr 2008 03:21:38 +0200.
-
-It was downloaded from 
-
-Upstream Authors: 
-
-Luca Saiu 
-Jean-Vincent Loddo 
-
-Copyright:
- 
-Copyright (C) 2008  Luca Saiu
-Copyright (C) 2008  Jean-Vincent Loddo
-
-License:
-
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
- 
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
- 
-You should have received a copy of the GNU General Public License
-along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2008, root 
 and
-is licensed under the GPL, see above.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ocamlbricks
+Source: https://launchpad.net/ocamlbricks
+
+Files: *
+Copyright: 2007-2013 Luca Saiu 
+   2007-2013 Jean-Vincent Loddo 
+   2007-2013 Université Paris 13
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see .
+
+Files: debian/*
+Copyright: 2008 Jonathan Roudière 
+   2013 Lucas Nussbaum 
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see 
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-30-g1a24789

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 187a2f6c5d0c57cab9e33cc2f607d6cb057c7c3d
Author: Lucas Nussbaum 
Date:   Mon Feb 18 21:01:49 2013 +0100

Remove .bzr dir from future snapshots

diff --git a/debian/rules b/debian/rules
index fda2a95..0070ae3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ get-orig-source:
rm -rf get-orig-source $(TARBALL)
mkdir get-orig-source
bzr branch -r $(BZR_REVISION) lp:$(PACKAGE)/trunk 
get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
+   rm -rf get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig/.bzr
GZIP=--best tar czf $(TARBALL) -C get-orig-source 
$(PACKAGE)-$(SRC_VERSION).orig
rm -rf get-orig-source
echo "  "$(TARBALL)" created; move it to the right destination to build 
the package"

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-30-g1a24789

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 1a2478901057100f20a4ff84efed4b37a2081e96
Author: Lucas Nussbaum 
Date:   Mon Feb 18 21:08:44 2013 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 6b99b15..06e4190 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocamlbricks (0.90+bzr356-1) UNRELEASED; urgency=low
+ocamlbricks (0.90+bzr356-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
@@ -7,10 +7,11 @@ ocamlbricks (0.90+bzr356-1) UNRELEASED; urgency=low
   * New upstream snapshot from the trunk branch, after discussion with
 upstream author in https://bugs.launchpad.net/marionnet/+bug/1085055.
 This is a step towards packaging marionnet.
+  * Rework most of the packaging.
   * Update Standards-Version. No changes needed.
   * New homepage: https://launchpad.net/ocamlbricks
 
- -- Lucas Nussbaum   Mon, 18 Feb 2013 16:34:15 +0100
+ -- Lucas Nussbaum   Mon, 18 Feb 2013 21:08:04 +0100
 
 ocamlbricks (0.50.1-4) unstable; urgency=low
 

-- 
ocamlbricks packaging

___
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] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-14-g0d8f26d

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 0d8f26d297bc7744bf1432648c2fa64b70c73b2b
Author: Lucas Nussbaum 
Date:   Mon Feb 18 18:00:23 2013 +0100

Add some build-depends

diff --git a/debian/control b/debian/control
index 4c0d861..ee4321b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,14 @@ Section: net
 Priority: extra
 Maintainer: Debian OCaml Maintainers 
 Uploaders: Lucas Nussbaum 
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0),
+ ocaml-nox (>= 3.12.1),
+ dh-ocaml (>= 0.9.1),
+ camlp4-extra,
+ ocaml-findlib,
+ liblablgtk2-ocaml-dev (>= 2.12.0-2),
+ libocamlbricks-ocaml-dev (>= 0.90+bzr356),
+ liblablgtksourceview2-ocaml-dev (>= 2.14.2)
 Standards-Version: 3.9.3
 Homepage: http://www.marionnet.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/marionnet.git
@@ -11,7 +18,10 @@ Vcs-Git: 
git://git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
 
 Package: marionnet
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
+ liblablgtk2-ocaml-dev (>= 2.12.0-2),
+ libocamlbricks-ocaml-dev (>= 0.90+bzr356),
+ liblablgtksourceview2-ocaml-dev (>= 2.14.2)
 Description: Virtual network laboratory
  Marionnet is a virtual network laboratory: it allows users to define,
  configure and run complex computer networks without any need for physical

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-14-g0d8f26d

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 84cb4750ab6d480a3300369a35fac1d45d9d7598
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:42:15 2013 +0100

add ITP number, set distro to UNRELEASED

diff --git a/debian/changelog b/debian/changelog
index c2b76c6..6d3392e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-marionnet (0.90.6+bzr407-1) unstable; urgency=low
+marionnet (0.90.6+bzr407-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #)  
+  * Initial release (Closes: #489392)
 
  -- Lucas Nussbaum   Wed, 13 Feb 2013 09:05:14 +0100

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-14-g0d8f26d

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit f35f909b15e9d452c29268bbae1ecd73fe597782
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:50:17 2013 +0100

add TODO file

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 000..b3de613
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,3 @@
+- /etc/init.d
+- clean up .native vs .byte mess
+- script to download kernels + filesystems

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-14-g0d8f26d

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 9d64f0ad4ddff8fd730e6882a80ea9320eff04c1
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:50:52 2013 +0100

control fixes

diff --git a/debian/control b/debian/control
index 79e6223..4c0d861 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: marionnet
 Section: net
 Priority: extra
 Maintainer: Debian OCaml Maintainers 
-Maintainer: Lucas Nussbaum 
+Uploaders: Lucas Nussbaum 
 Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.3
 Homepage: http://www.marionnet.org/

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-14-g0d8f26d

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 336aaf212d8481495e11c3baa350996def0c4390
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:47:43 2013 +0100

Fix control

diff --git a/debian/control b/debian/control
index f6781d6..79e6223 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,25 @@
 Source: marionnet
 Section: net
 Priority: extra
+Maintainer: Debian OCaml Maintainers 
 Maintainer: Lucas Nussbaum 
 Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.3
 Homepage: http://www.marionnet.org/
-#Vcs-Git: git://git.debian.org/collab-maint/marionnet.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/marionnet.git;a=summary
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/marionnet.git
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/marionnet.git
 
 Package: marionnet
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: 
- 
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}
+Description: Virtual network laboratory
+ Marionnet is a virtual network laboratory: it allows users to define,
+ configure and run complex computer networks without any need for physical
+ setup. Only a single, possibly even non-networked GNU/Linux host machine
+ is required to simulate a whole Ethernet network complete with computers,
+ routers, hubs, switches, cables, and more. Support is also provided for
+ integrating the virtual network with the physical host network.
+ .
+ As Marionnet is meant to be used also by inexperienced people, it features
+ a very intuitive graphical user interface. Marionnet depends on User Mode
+ Linux and VDE Virtual Distributed Ethernet for the simulation part.

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-14-g0d8f26d

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit ecc917e4522d92942ea4d0ab6c9a0d6c18aa192c
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:43:22 2013 +0100

Remove more templates

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 96827c4..000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-marionnet for Debian
-
-
-
-
- -- Lucas Nussbaum   Wed, 13 Feb 2013 09:05:14 +0100
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 6dd737e..000
--- a/debian/README.source
+++ /dev/null
@@ -1,9 +0,0 @@
-marionnet for Debian
-
-
-
-
-
-
-
diff --git a/debian/rules b/debian/rules
index 0917ddb..9ef4915 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-14-g0d8f26d

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 1b9c584769aa6583ada3139946bf33c32387468f
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:41:20 2013 +0100

Fill-in copyright

diff --git a/debian/copyright b/debian/copyright
index 54d36fe..5122723 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,25 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: marionnet
-Source: 
+Source: https://launchpad.net/marionnet
 
 Files: *
-Copyright:  
-
-License: 
- 
- 
+Copyright: 2007-2013 Luca Saiu 
+   2007-2013 Jean-Vincent Loddo 
+   2007-2013 Université Paris 13
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
  .
- 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see .
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
 Copyright: 2013 Lucas Nussbaum 
 License: GPL-2+
@@ -31,8 +38,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

-- 
marionnet packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-27-ga718805

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit a71880525acab839340b44dcbcc0c9ff7880e710
Author: Lucas Nussbaum 
Date:   Mon Feb 18 18:08:41 2013 +0100

Drop DMUA

diff --git a/debian/control b/debian/control
index a61f046..a9ed7fb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers 
 Uploaders: Jonathan Roudiere , Lucas 
Nussbaum 
-DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8),
  ocaml-nox (>= 3.12.1),
  liblablgtk2-ocaml-dev (>= 2.12.0-2),

-- 
ocamlbricks packaging

___
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] [SCM] marionnet packaging annotated tag, upstream/0.90.6+bzr404, created. upstream/0.90.6+bzr404

2013-02-18 Thread Lucas Nussbaum 
The annotated tag, upstream/0.90.6+bzr404 has been created
at  c6aa4c98792f4f9a3fcd43aca2f4f646531b3318 (tag)
   tagging  be5a52108c9c5e5259090a61a6257ec6c0590b79 (commit)
 tagged by  Lucas Nussbaum
on  Wed Feb 13 08:52:25 2013 +0100

- Shortlog 
Upstream version 0.90.6+bzr404

Lucas Nussbaum (1):
  Imported Upstream version 0.90.6+bzr404

---

-- 
marionnet packaging

___
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] [SCM] marionnet packaging annotated tag, upstream/0.90.6+bzr407, created. upstream/0.90.6+bzr407

2013-02-18 Thread Lucas Nussbaum 
The annotated tag, upstream/0.90.6+bzr407 has been created
at  d07dc53c391ed034b6526945c3d6b3b7b514 (tag)
   tagging  a8cb37e92f6ae03de5e36f14ea04ec8d489aaf0c (commit)
  replaces  upstream/0.90.6+bzr404
 tagged by  Lucas Nussbaum
on  Mon Feb 18 16:37:23 2013 +0100

- Shortlog 
Upstream version 0.90.6+bzr407

Lucas Nussbaum (1):
  Imported Upstream version 0.90.6+bzr407

---

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, master, created. c3e48ae6499d71ece02934bc3dce91c7a46db405

2013-02-18 Thread Lucas Nussbaum 
The branch, master has been created
at  c3e48ae6499d71ece02934bc3dce91c7a46db405 (commit)

- Shortlog 
commit c3e48ae6499d71ece02934bc3dce91c7a46db405
Author: Lucas Nussbaum 
Date:   Mon Feb 18 16:41:26 2013 +0100

patch merged upstream + cleanup

commit 6086c242daeb66a486a618109741a94e744518ec
Author: Lucas Nussbaum 
Date:   Mon Feb 18 16:37:37 2013 +0100

new upstream snapshot

commit a71e775d92fa1d4d4d91bd6d0e91c5a9372807bf
Merge: dfa11d4 a8cb37e
Author: Lucas Nussbaum 
Date:   Mon Feb 18 16:37:23 2013 +0100

Merge tag 'upstream/0.90.6+bzr407'

Upstream version 0.90.6+bzr407

commit dfa11d4c9483ffe9815ef4391fdf5a67bf2f11e3
Author: Lucas Nussbaum 
Date:   Wed Feb 13 11:35:46 2013 +0100

one more patch...

commit 78e22d5e1d5c784a7b0e5f37683ada434a9a05a8
Author: Lucas Nussbaum 
Date:   Wed Feb 13 11:03:18 2013 +0100

update patches

commit 184cc4da1e46eddadfc7aff96f8c922e5ca5e5ff
Author: Lucas Nussbaum 
Date:   Wed Feb 13 10:23:01 2013 +0100

add patch to customize installation paths

commit a0b26cdfe23110083c2d35b806075c72c66f673f
Author: Lucas Nussbaum 
Date:   Wed Feb 13 10:22:51 2013 +0100

add basic debian/ dir generated by dh_make

---

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, pristine-tar, created. 9b646c36f0c10ff321a8cfd1b549f0d11eb446f2

2013-02-18 Thread Lucas Nussbaum 
The branch, pristine-tar has been created
at  9b646c36f0c10ff321a8cfd1b549f0d11eb446f2 (commit)

- Shortlog 
commit 9b646c36f0c10ff321a8cfd1b549f0d11eb446f2
Author: Lucas Nussbaum 
Date:   Mon Feb 18 16:37:23 2013 +0100

pristine-tar data for marionnet_0.90.6+bzr407.orig.tar.gz

commit c4c0a3478d94579f60d40aa7efdbc4cecb228373
Author: Lucas Nussbaum 
Date:   Wed Feb 13 08:52:25 2013 +0100

pristine-tar data for marionnet_0.90.6+bzr404.orig.tar.gz

---

-- 
marionnet packaging

___
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] [SCM] marionnet packaging branch, upstream, created. a8cb37e92f6ae03de5e36f14ea04ec8d489aaf0c

2013-02-18 Thread Lucas Nussbaum 
The branch, upstream has been created
at  a8cb37e92f6ae03de5e36f14ea04ec8d489aaf0c (commit)

- Shortlog 
---

-- 
marionnet packaging

___
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] [SCM] ocamlbricks packaging annotated tag, upstream/0.90+bzr356, created. upstream/0.90+bzr356

2013-02-18 Thread Lucas Nussbaum 
The annotated tag, upstream/0.90+bzr356 has been created
at  7c7cf55c24e6ff6af75572e90fbebe282406d50b (tag)
   tagging  14a07908594d9fdd0315b21273025c3608bdf524 (commit)
  replaces  upstream/0.90+bzr348
 tagged by  Lucas Nussbaum
on  Mon Feb 18 16:34:07 2013 +0100

- Shortlog 
Upstream version 0.90+bzr356

Lucas Nussbaum (1):
  Imported Upstream version 0.90+bzr356

---

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging annotated tag, upstream/0.90+bzr348, created. upstream/0.90+bzr348

2013-02-18 Thread Lucas Nussbaum 
The annotated tag, upstream/0.90+bzr348 has been created
at  917d5016d8ca0480af3662a84cf3edb4ebdd0c58 (tag)
   tagging  7396c945db6446da32624c3f5d5a398e99d38c46 (commit)
  replaces  upstream/0.90+bzr337
 tagged by  Lucas Nussbaum
on  Tue Feb 12 17:41:25 2013 +0100

- Shortlog 
Upstream version 0.90+bzr348

Lucas Nussbaum (1):
  Imported Upstream version 0.90+bzr348

---

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging annotated tag, upstream/0.90+bzr337, created. upstream/0.90+bzr337

2013-02-18 Thread Lucas Nussbaum 
The annotated tag, upstream/0.90+bzr337 has been created
at  efab106ccd77a2c9d40ec314493c5876b2422014 (tag)
   tagging  bb966d39f32f92a1cccf13933f5336b90f1a284b (commit)
 tagged by  Lucas Nussbaum
on  Sat Dec 1 18:02:12 2012 +0100

- Shortlog 
Upstream version 0.90+bzr337

Lucas Nussbaum (1):
  Imported Upstream version 0.90+bzr337

Sylvain Le Gall (1):
  Imported Upstream version 0.50.1

---

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, pristine-tar, updated. 002eef5f9dea3a5d30a4ef33e1a3e9beaf01ac14

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the pristine-tar branch:
commit 002eef5f9dea3a5d30a4ef33e1a3e9beaf01ac14
Author: Lucas Nussbaum 
Date:   Mon Feb 18 16:34:07 2013 +0100

pristine-tar data for ocamlbricks_0.90+bzr356.orig.tar.gz

diff --git a/ocamlbricks_0.90+bzr356.orig.tar.gz.delta 
b/ocamlbricks_0.90+bzr356.orig.tar.gz.delta
new file mode 100644
index 000..32a8ef6
Binary files /dev/null and b/ocamlbricks_0.90+bzr356.orig.tar.gz.delta differ
diff --git a/ocamlbricks_0.90+bzr356.orig.tar.gz.id 
b/ocamlbricks_0.90+bzr356.orig.tar.gz.id
new file mode 100644
index 000..d460e38
--- /dev/null
+++ b/ocamlbricks_0.90+bzr356.orig.tar.gz.id
@@ -0,0 +1 @@
+484159b0faf070b6a84fcf74d2f7921a9a2544dc

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 9154c2cc31a955912a9f4b7832052b79450ccc92
Merge: 5115fcfa363b8536ce29165d36c74f1714933137 
14a07908594d9fdd0315b21273025c3608bdf524
Author: Lucas Nussbaum 
Date:   Mon Feb 18 16:34:07 2013 +0100

Merge tag 'upstream/0.90+bzr356'

Upstream version 0.90+bzr356


-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 5115fcfa363b8536ce29165d36c74f1714933137
Author: Lucas Nussbaum 
Date:   Tue Feb 12 20:16:48 2013 +0100

disable tests, there are none

diff --git a/debian/rules b/debian/rules
index d303347..fda2a95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ override_dh_auto_clean:
dh_auto_clean
rm -f meta_ocamlbricks.ml
 
+override_dh_auto_test:
+   # do nothing
+
 # see https://launchpad.net/ocamlbricks/trunk
 PACKAGE = ocamlbricks
 SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 
\(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 57a98f5d420e0a9cdf7bfa3a0473035cbaff22db
Author: Lucas Nussbaum 
Date:   Tue Feb 12 19:49:32 2013 +0100

Bump debian/compat

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit cf9e0a1cef0572f7d70ccdd73d02403f7a6a4daf
Author: Lucas Nussbaum 
Date:   Tue Feb 12 19:50:56 2013 +0100

Clean debian/rules

diff --git a/debian/rules b/debian/rules
index 492a84c..d303347 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,97 +8,6 @@ include /usr/share/ocaml/ocamlvars.mk
 override_dh_auto_clean:
dh_auto_clean
rm -f meta_ocamlbricks.ml
-# 
-# # include standard OCaml template
-# include /usr/share/ocaml/ocamlinit.mk
-# 
-# # Variable use here (find version, path)
-# DESTDIR = $(CURDIR)/debian/tmp
-# 
-# # include an external Makefile to use dpatch
-# include /usr/share/dpatch/dpatch.make
-# 
-# # Upstream package
-# PACKAGE = ocamlbricks
-# VERSION = 0.50.1
-# 
-# # Name of generated package
-# DEB_PACKAGE = libocamlbricks-ocaml-dev
-# 
-# ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-# CFLAGS += -g
-# endif
-# ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-# INSTALL_PROGRAM += -s
-# endif
-# 
-# configure: configure-stamp
-# configure-stamp: ocamlinit
-#  dh_testdir
-#  touch configure-stamp
-# 
-# build: build-stamp
-# build-stamp: patch-stamp configure-stamp 
-#  dh_testdir
-#  test -d '$(CURDIR)/doc' || mkdir '$(CURDIR)/doc'
-#  $(MAKE)
-#  touch build-stamp
-# 
-# clean: unpatch ocamlinit-clean
-#  dh_testdir
-#  dh_testroot
-#  -$(RM) build-stamp configure-stamp 
-#  $(MAKE) clean
-#  dh_clean --exclude=buildsystem/* 
-#  -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).doc-base.ocamldoc-apiref
-#  -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).dirs
-#  -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).*.debhelper 
-#  -$(RM) -r '$(CURDIR)/doc'
-# 
-# install: build
-#  dh_testdir
-#  dh_testroot
-#  dh_clean -k --exclude=buildsystem/* 
-#  dh_installdirs
-#  $(MAKE) install
-#  
-#  # Documentation type html 
-#  cp $(DESTDIR)/usr/share/doc/$(PACKAGE)/html/*.html 
$(CURDIR)/debian/$(DEB_PACKAGE)/usr/share/doc/$(DEB_PACKAGE)/html/api/
-#  cp $(DESTDIR)/usr/share/doc/$(PACKAGE)/html/*.css 
$(CURDIR)/debian/$(DEB_PACKAGE)/usr/share/doc/$(DEB_PACKAGE)/html/api/
-# 
-#  # Copy libraries for libocamlbricks-ocaml-dev
-#  cp $(DESTDIR)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/* 
$(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/
-#  -$(RM) 
$(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/stupidprogram*
-# 
-#  # create .mli file (header)
-#  chmod +x $(CURDIR)/debian/generate_mli.sh
-#  $(CURDIR)/debian/generate_mli.sh  
$(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/
-# 
-# # Build architecture-independent files here.
-# binary-indep: build install
-# # We have nothing to do by default.
-# 
-# # Build architecture-dependent files here.
-# binary-arch: build install
-#  dh_testdir -s
-#  dh_testroot -s
-#  dh_installchangelogs -s
-#  dh_installdocs -s
-#  dh_installexamples -s --exclude=COPYING $(CURDIR)/debian/buildsystem
-#  dh_installexamples -s $(CURDIR)/stupidprogram.ml
-#  dh_installexamples -s $(CURDIR)/LEDGRID/sample-images
-#  dh_install -s
-#  dh_compress -s
-#  dh_fixperms -s
-#  dh_makeshlibs -s
-#  dh_installdeb -s
-#  dh_shlibdeps -s
-#  dh_ocaml -s
-#  dh_gencontrol -s
-#  dh_md5sums -s
-#  dh_builddeb -s
-# 
-# binary: binary-indep binary-arch
 
 # see https://launchpad.net/ocamlbricks/trunk
 PACKAGE = ocamlbricks

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 3659bb3a10edaf06a4188e0701c24b6bd2637782
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:02:59 2013 +0100

Update some control fields

diff --git a/debian/changelog b/debian/changelog
index aac6166..6b99b15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ ocamlbricks (0.90+bzr356-1) UNRELEASED; urgency=low
 
   [ Lucas Nussbaum ]
   * New upstream snapshot from the trunk branch, after discussion with
-upstream author in https://bugs.launchpad.net/marionnet/+bug/1085055
+upstream author in https://bugs.launchpad.net/marionnet/+bug/1085055.
+This is a step towards packaging marionnet.
+  * Update Standards-Version. No changes needed.
+  * New homepage: https://launchpad.net/ocamlbricks
 
  -- Lucas Nussbaum   Mon, 18 Feb 2013 16:34:15 +0100
 
diff --git a/debian/control b/debian/control
index 6bf61ce..1b917d6 100644
--- a/debian/control
+++ b/debian/control
@@ -10,20 +10,21 @@ Build-Depends: debhelper (>= 8),
  bash (>= 3.1),
  dh-ocaml (>= 0.9.1),
  ocaml-findlib
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlbricks.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git
-Homepage: http://darcs.marionnet.org/repos/ocamlbricks/
+Homepage: https://launchpad.net/ocamlbricks
 
 Package: libocamlbricks-ocaml-dev
 Architecture: any
-Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}, 
liblablgtk2-ocaml-dev (>= 2.6.0-7)
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}, 
liblablgtk2-ocaml-dev (>= 2.12.0-2)
 Provides: ${ocaml:Provides}
 Replaces: ocamlbricks (<< 0.50.1)
 Suggests: ocaml-findlib
 Description: Miscellaneous utility functions in OCaml for Marionnet
- Library OCaml which provide a set of needed and useful macros for developing.
- Modules and functionality are the follows :
+ This OCaml library provides a set of needed and useful macros for developing.
+ It is mainly used by the marionnet package.
+ Modules and functionality are the following :
  .
   - Configuration_files: Allow to get information from configuration files
   - Environments: Environments are useful for maintaining the state, intendend 

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, pristine-tar, updated. 002eef5f9dea3a5d30a4ef33e1a3e9beaf01ac14

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the pristine-tar branch:
commit 4061e3129eb8bdac599e70fc00382a479445d4af
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:02:12 2012 +0100

pristine-tar data for ocamlbricks_0.90+bzr337.orig.tar.gz

diff --git a/ocamlbricks_0.90+bzr337.orig.tar.gz.delta 
b/ocamlbricks_0.90+bzr337.orig.tar.gz.delta
new file mode 100644
index 000..61da97f
Binary files /dev/null and b/ocamlbricks_0.90+bzr337.orig.tar.gz.delta differ
diff --git a/ocamlbricks_0.90+bzr337.orig.tar.gz.id 
b/ocamlbricks_0.90+bzr337.orig.tar.gz.id
new file mode 100644
index 000..d89403d
--- /dev/null
+++ b/ocamlbricks_0.90+bzr337.orig.tar.gz.id
@@ -0,0 +1 @@
+520866d7a0af2e5a7dfce9857f51d8d5f3ae8238

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, pristine-tar, updated. 002eef5f9dea3a5d30a4ef33e1a3e9beaf01ac14

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the pristine-tar branch:
commit 51e1819afaeebf88815fb0508edde1e90e5d94b6
Author: Lucas Nussbaum 
Date:   Tue Feb 12 17:41:25 2013 +0100

pristine-tar data for ocamlbricks_0.90+bzr348.orig.tar.gz

diff --git a/ocamlbricks_0.90+bzr348.orig.tar.gz.delta 
b/ocamlbricks_0.90+bzr348.orig.tar.gz.delta
new file mode 100644
index 000..92b053d
Binary files /dev/null and b/ocamlbricks_0.90+bzr348.orig.tar.gz.delta differ
diff --git a/ocamlbricks_0.90+bzr348.orig.tar.gz.id 
b/ocamlbricks_0.90+bzr348.orig.tar.gz.id
new file mode 100644
index 000..7ccb506
--- /dev/null
+++ b/ocamlbricks_0.90+bzr348.orig.tar.gz.id
@@ -0,0 +1 @@
+61264a38645eb3fb20cc383a1009514b0243fde7

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 2265fae6d570bae98fd561ba50b9b1d9de9169d6
Merge: 960f56ae8b3e106a4666585fd73edb07fa093dad 
7396c945db6446da32624c3f5d5a398e99d38c46
Author: Lucas Nussbaum 
Date:   Tue Feb 12 17:41:25 2013 +0100

Merge tag 'upstream/0.90+bzr348'

Upstream version 0.90+bzr348


-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 12e2410ea32db54946b319e701dd6f61734d8f3b
Author: Lucas Nussbaum 
Date:   Tue Feb 12 19:49:55 2013 +0100

Restrict build-dependencies a bit

diff --git a/debian/control b/debian/control
index a43d30e..6bf61ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: ocamlbricks
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers 
-Uploaders: Jonathan Roudiere 
+Uploaders: Jonathan Roudiere , Lucas 
Nussbaum 
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8),
- ocaml-nox (>= 3.11.0-5),
+ ocaml-nox (>= 3.12.1),
  liblablgtk2-ocaml-dev (>= 2.12.0-2),
  bash (>= 3.1),
- dh-ocaml (>= 0.9),
+ dh-ocaml (>= 0.9.1),
  ocaml-findlib
 Standards-Version: 3.8.3
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlbricks.git
@@ -17,7 +17,7 @@ Homepage: http://darcs.marionnet.org/repos/ocamlbricks/
 
 Package: libocamlbricks-ocaml-dev
 Architecture: any
-Depends: ${ocaml:Depends}, liblablgtk2-ocaml-dev (>= 2.6.0-7)
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}, 
liblablgtk2-ocaml-dev (>= 2.6.0-7)
 Provides: ${ocaml:Provides}
 Replaces: ocamlbricks (<< 0.50.1)
 Suggests: ocaml-findlib

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 57c36f59d5e41217df531ac581e34b997bd1a492
Author: Lucas Nussbaum 
Date:   Mon Feb 18 17:07:08 2013 +0100

add some build-deps

diff --git a/debian/control b/debian/control
index 1b917d6..a61f046 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,9 @@ Build-Depends: debhelper (>= 8),
  liblablgtk2-ocaml-dev (>= 2.12.0-2),
  bash (>= 3.1),
  dh-ocaml (>= 0.9.1),
- ocaml-findlib
+ ocaml-findlib,
+ bzr,
+ camlp4-extra
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlbricks.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 8e6de8f45d1b2abc29e25c16d45af5e22c7fb33e
Author: Lucas Nussbaum 
Date:   Tue Feb 12 20:02:45 2013 +0100

Remove old useless files.

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index 8b8c231..000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,17 +0,0 @@
-Ocamlbricks for Debian
-==
-
-Originally, OCamlbricks is provided with a useful build system, it is composed 
-of a generic and coherent, set of files, for compile OCaml project using 
-OCamlBuild.
-
-The main Makefile allow to generate automatically file, the myOCamlBuild 
plugin, 
-you can also use it to create binary or sources tarball, and for distribute 
easily 
-generic files for any kind of project (like  configuration file, README, 
-REQUIREMENT, NEWS, INSTALL, etc ...)
-
-The Debian package provide this build system like an example, under 
buildsystem 
-directory in /usr/share/doc/libocamlbricks-ocaml-dev/examples/ with hope to 
help 
-OCaml's developpers for build and distribute their project.
-
-For more informations see INSTALL file in examples/buildsystem/ directory.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index fc98b3d..000
--- a/debian/README.source
+++ /dev/null
@@ -1,38 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
-debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
 
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa 
-10 Aug 2008.
diff --git a/debian/libocamlbricks-ocaml-dev.dirs.in 
b/debian/libocamlbricks-ocaml-dev.dirs.in
deleted file mode 100644
index 51df790..000
--- a/debian/libocamlbricks-ocaml-dev.dirs.in
+++ /dev/null
@@ -1,4 +0,0 @@
-@OCamlStdlibDir@/ocamlbricks
-usr/share/doc-base
-usr/share/doc/libocamlbricks-ocaml-dev/html/api
-usr/share/doc/libocamlbricks-ocaml-dev/examples/buildsystem
diff --git a/debian/libocamlbricks-ocaml-dev.doc-base 
b/debian/libocamlbricks-ocaml-dev.doc-base
deleted file mode 100644
index 487346c..000
--- a/debian/libocamlbricks-ocaml-dev.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libocamlbricks-ocaml-dev
-Title: OCaml Bricks Module Documentation
-Author: Luca Saiu and Jean-Vincent Loddo
-Abstract: OCaml Bricks module documentation
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/libocamlbricks-ocaml-dev/html/api/index.html
-Files: /usr/share/doc/libocamlbricks-ocaml-dev/html/api/*
diff --git a/debian/libocamlbricks-ocaml-dev.docs 
b/debian/libocamlbricks-ocaml-dev.docs
deleted file mode 100644
index c231d73..000
--- a/debian/libocamlbricks-ocaml-dev.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README
-AUTHORS 
-THANKS

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 3c20e389fb797f90efb91147dc4c09d54b53d9f7
Author: Lucas Nussbaum 
Date:   Mon Feb 18 16:35:03 2013 +0100

new snapshot from upstream

diff --git a/debian/changelog b/debian/changelog
index fb0edc6..aac6166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocamlbricks (0.90+bzr348-1) UNRELEASED; urgency=low
+ocamlbricks (0.90+bzr356-1) UNRELEASED; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
@@ -7,7 +7,7 @@ ocamlbricks (0.90+bzr348-1) UNRELEASED; urgency=low
   * New upstream snapshot from the trunk branch, after discussion with
 upstream author in https://bugs.launchpad.net/marionnet/+bug/1085055
 
- -- Lucas Nussbaum   Sat, 01 Dec 2012 18:02:32 +0100
+ -- Lucas Nussbaum   Mon, 18 Feb 2013 16:34:15 +0100
 
 ocamlbricks (0.50.1-4) unstable; urgency=low
 

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 5884eca9b3a5ca2db7cb37c0e92c3dec1e7c3214
Author: Lucas Nussbaum 
Date:   Tue Feb 12 19:54:03 2013 +0100

File no longer needed

diff --git a/debian/generate_mli.sh b/debian/generate_mli.sh
deleted file mode 100755
index 498660e..000
--- a/debian/generate_mli.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Script provide with libocamlbricks-ocaml-dev packages
-# utility: create *.mli files from sources in $TARGET directory. 
-# where $TARGET is the first argument pass to the script
-
-# directory to add in command line
-OCAML_PATH=$(ocamlc -where)
-# where we put *.mli files 
-TARGET=$1
-# to exclude a sources file word or regexp
-EXCLUDE="stupid"
-
-# if not exist create $TARGET directory 
-mkdir -p $TARGET
-
-# for all *.ml files found in sources directory 
-for i in $(find ./[A-Z]*  -name \*.ml |grep -v $EXCLUDE |grep -v -e "/m[e,y]" 
);
-do 
-   # create the *.mli corresponding  
-   ocamlc -I debian/tmp/$OCAML_PATH/ocamlbricks/ -I $OCAML_PATH/  -I 
$OCAML_PATH/lablgtk2/ \
--i $i > $TARGET/$(basename $i |sed s/'$'/'i'/g) 2> /dev/null
-   done
-
-# Not possible to build this .mli 
-rm -f $TARGET/modelExtra.mli 2> /dev/null
-
-exit 0

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 6c936a7d9047ecf2353b065ac1dcd626b2262799
Author: Lucas Nussbaum 
Date:   Tue Feb 12 19:46:50 2013 +0100

Add patch: edit CONFIGME to install to debian/tmp

diff --git a/debian/patches/01_adapt_debian.diff 
b/debian/patches/01_adapt_debian.diff
deleted file mode 100644
index 114687d..000
--- a/debian/patches/01_adapt_debian.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_adapt_debian.dpatch by  
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Little modif to add cmx file, one compilation option and path to build 
-## DP: package
-
-@DPATCH@
-
 a/CONFIGME
-+++ b/CONFIGME
-@@ -33,12 +33,15 @@
- # Section 2: Installation setup: prefixes, and the like
- ###
- 
-+# Change for Debian Packaging
-+DESTDIR=$PWD"/debian/tmp"
-+
- # Installation prefix for OCaml libraries: they will be installed into
- # $prefix/$name, where $name is the package name defined in META.
- # This is a reasonable default, but you can change it if you really want
- # to install into a different, custom prefix.
- # *No* trailing slash should be included.
--libraryprefix=`ocamlc -where || exit -1`
-+libraryprefix=$DESTDIR/`ocamlc -where || exit -1`
- #libraryprefix=/mystrangepath
- 
- # This should be defined as the absolute path to a directory containing
-@@ -48,7 +51,7 @@ libraryprefix=`ocamlc -where || exit -1`
- # the directory containing OCaml headers.  
- #
- # This definition is appropriate for debian-like distributions:
--ocaml_sources=/usr/include/caml
-+ocaml_sources=$DESTDIR/usr/include/caml
- #
- # This is reasonable if you have downloaded and configured the OCaml
- # sources yourself, somewhere:
-@@ -56,14 +59,14 @@ ocaml_sources=/usr/include/caml
- 
- # Installation prefix, for example /usr or /usr/local
- # *No* trailing slash should be included.
--prefix=/usr/local
-+prefix=$DESTDIR/usr
- 
- # Prefix for host-wide configuration files; you should probably keep the
- # default setting:
--configurationprefix=/etc
-+configurationprefix=$DESTDIR/etc
- 
- # Prefix for the locale files
--localeprefix=/usr/share/locale
-+localeprefix=$DESTDIR/usr/share/locale
- 
- # Prefix for documentation files; you should probably keep the
- # default setting:
 a/Makefile
-+++ b/Makefile
-@@ -442,6 +442,7 @@ install-libraries: libraries install-lib
- cp -f META $(OTHER_LIBRARY_FILES_TO_INSTALL) \
-   _build/*.cma _build/*.cmxa _build/*.a \
-   `find _build/ -name \*.cmi | grep -v /myocamlbuild` \
-+`find _build/ -name \*.cmx | grep -v /myocamlbuild` \
-   `find _build/ -name \*.mli | grep -v /myocamlbuild` \
- $$libraryprefix/$$name/) && \
- echo 'Library installation was successful.'; \
-@@ -670,9 +671,9 @@ NATIVE_OR_BYTE = \
- # -byte-plugin if needed:
- OCAMLBUILD_COMMAND_LINE = \
-   (if [ $$( $(call NATIVE_OR_BYTE) ) == 'byte' ]; then \
--echo 'ocamlbuild -byte-plugin -verbose 2 -log _build/_log'; \
-+echo 'ocamlbuild -byte-plugin -classic-display -verbose 2 -log 
_build/_log'; \
-   else \
--echo 'ocamlbuild -verbose 2 -log _build/_log'; \
-+echo 'ocamlbuild -classic-display -verbose 2 -log _build/_log'; \
-   fi)
- 
- # Macro extracting, via source, the value associated to some keys
diff --git a/debian/patches/debian-prefix.diff 
b/debian/patches/debian-prefix.diff
new file mode 100644
index 000..3db631b
--- /dev/null
+++ b/debian/patches/debian-prefix.diff
@@ -0,0 +1,25 @@
+--- a/CONFIGME
 b/CONFIGME
+@@ -34,11 +34,11 @@
+ 
+ # Installation prefix, for example /usr or /usr/local
+ # *No* trailing slash should be included.
+-prefix=/usr/local
++prefix=${DESTDIR:-debian/tmp}
+ 
+ # Prefix for host-wide configuration files; you should probably keep the
+ # default setting:
+-configurationprefix=/etc
++configurationprefix=${prefix}/etc
+ 
+ # Prefix for the locale files
+ localeprefix=${prefix}/share/locale
+@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || e
+ # By default they will be installed into ${ocaml_libraryprefix}, but you 
+ # can change it if you really want to install into a different, custom prefix.
+ # *No* trailing slash should be included.
+-libraryprefix=${ocaml_libraryprefix}
++libraryprefix=${prefix}/${ocaml_libraryprefix}
+ #
+ # This definition may be appropriate for debian packaging:
+ #libraryprefix=debian/tmp/${ocaml_libraryprefix}
diff --git a/debian/patches/series b/debian/patches/series
index af38ad9..a08459b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01_adapt_debian.diff
 fix_mlvalues.h_path.diff
+debian-prefix.diff

-- 
ocamlbricks packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/lis

[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit ae3b6b41c5c5e51db723723e2dfb87f3a4cec15d
Author: Lucas Nussbaum 
Date:   Tue Feb 12 17:43:06 2013 +0100

new upstream snapshot

diff --git a/debian/changelog b/debian/changelog
index b2a71cf..fb0edc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ocamlbricks (0.90+bzr337-2) UNRELEASED; urgency=low
+ocamlbricks (0.90+bzr348-1) UNRELEASED; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 4e2494effcb87651f017a1e30c39f06556c46b80
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:16:25 2012 +0100

Convert package to 3.0 (quilt).

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d91fa75..000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_adapt_debian
-02_remove_dbug_print
-03_compatibility_withdash_fixbug
-04_solve_meta_lacks_dependancies
diff --git a/debian/patches/01_adapt_debian.dpatch 
b/debian/patches/01_adapt_debian.diff
old mode 100755
new mode 100644
similarity index 58%
rename from debian/patches/01_adapt_debian.dpatch
rename to debian/patches/01_adapt_debian.diff
index 0aace05..114687d
--- a/debian/patches/01_adapt_debian.dpatch
+++ b/debian/patches/01_adapt_debian.diff
@@ -7,42 +7,55 @@
 
 @DPATCH@
 
-diff -rN -u ocamlbricks-0.50.1-orig/CONFIGME ocamlbricks-0.50.1/CONFIGME
 ocamlbricks-0.50.1-orig/CONFIGME   2008-05-12 23:46:28.0 +0200
-+++ ocamlbricks-0.50.1/CONFIGME2008-05-13 01:52:53.0 +0200
-@@ -32,21 +32,23 @@
+--- a/CONFIGME
 b/CONFIGME
+@@ -33,12 +33,15 @@
  # Section 2: Installation setup: prefixes, and the like
  ###
  
--# Installation prefix for OCaml libraries: they will be installed into
 +# Change for Debian Packaging
 +DESTDIR=$PWD"/debian/tmp"
 +
+ # Installation prefix for OCaml libraries: they will be installed into
  # $prefix/$name, where $name is the package name defined in META.
  # This is a reasonable default, but you can change it if you really want
  # to install into a different, custom prefix.
  # *No* trailing slash should be included.
 -libraryprefix=`ocamlc -where || exit -1`
--#libraryprefix=/mystrangepath
-+#libraryprefix=`ocamlc -where || exit -1`
 +libraryprefix=$DESTDIR/`ocamlc -where || exit -1`
+ #libraryprefix=/mystrangepath
+ 
+ # This should be defined as the absolute path to a directory containing
+@@ -48,7 +51,7 @@ libraryprefix=`ocamlc -where || exit -1`
+ # the directory containing OCaml headers.  
+ #
+ # This definition is appropriate for debian-like distributions:
+-ocaml_sources=/usr/include/caml
++ocaml_sources=$DESTDIR/usr/include/caml
+ #
+ # This is reasonable if you have downloaded and configured the OCaml
+ # sources yourself, somewhere:
+@@ -56,14 +59,14 @@ ocaml_sources=/usr/include/caml
  
  # Installation prefix, for example /usr or /usr/local
  # *No* trailing slash should be included.
 -prefix=/usr/local
-+prefix=$DESTDIR"/usr"
++prefix=$DESTDIR/usr
  
  # Prefix for host-wide configuration files; you should probably keep the
  # default setting:
 -configurationprefix=/etc
-+configurationprefix=$DESTDIR"/etc"
++configurationprefix=$DESTDIR/etc
+ 
+ # Prefix for the locale files
+-localeprefix=/usr/share/locale
++localeprefix=$DESTDIR/usr/share/locale
  
  # Prefix for documentation files; you should probably keep the
  # default setting:
-diff -rN -u ocamlbricks-0.50.1-orig/Makefile ocamlbricks-0.50.1/Makefile
 ocamlbricks-0.50.1-orig/Makefile   2008-05-12 23:46:29.0 +0200
-+++ ocamlbricks-0.50.1/Makefile2008-05-13 01:52:57.0 +0200
-@@ -349,6 +349,7 @@
+--- a/Makefile
 b/Makefile
+@@ -442,6 +442,7 @@ install-libraries: libraries install-lib
  cp -f META $(OTHER_LIBRARY_FILES_TO_INSTALL) \
_build/*.cma _build/*.cmxa _build/*.a \
`find _build/ -name \*.cmi | grep -v /myocamlbuild` \
@@ -50,15 +63,15 @@ diff -rN -u ocamlbricks-0.50.1-orig/Makefile 
ocamlbricks-0.50.1/Makefile
`find _build/ -name \*.mli | grep -v /myocamlbuild` \
  $$libraryprefix/$$name/) && \
  echo 'Library installation was successful.'; \
-@@ -574,9 +575,9 @@
+@@ -670,9 +671,9 @@ NATIVE_OR_BYTE = \
  # -byte-plugin if needed:
  OCAMLBUILD_COMMAND_LINE = \
(if [ $$( $(call NATIVE_OR_BYTE) ) == 'byte' ]; then \
--echo 'ocamlbuild -byte-plugin'; \
-+echo 'ocamlbuild -byte-plugin -classic-display'; \
+-echo 'ocamlbuild -byte-plugin -verbose 2 -log _build/_log'; \
++echo 'ocamlbuild -byte-plugin -classic-display -verbose 2 -log 
_build/_log'; \
else \
--echo 'ocamlbuild'; \
-+echo 'ocamlbuild -classic-display'; \
+-echo 'ocamlbuild -verbose 2 -log _build/_log'; \
++echo 'ocamlbuild -classic-display -verbose 2 -log _build/_log'; \
fi)
  
  # Macro extracting, via source, the value associated to some keys
diff --git a/debian/patches/02_remove_dbug_print.dpatch 
b/debian/patches/02_remove_dbug_print.dpatch
deleted file mode 100755
index 9748b83..000
--- a/debian/patches/02_remove_dbug_print.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_dbug_print.dpatch by Sylvain Le Gall 
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove debug print statement.
-
-@DPATCH@
-diff

[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 65055af89b4cec2d05dcc061180dee4679f1d102
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:41:14 2012 +0100

Add patch to fix some includes.

diff --git a/debian/patches/fix_mlvalues.h_path.diff 
b/debian/patches/fix_mlvalues.h_path.diff
new file mode 100644
index 000..fc3192b
--- /dev/null
+++ b/debian/patches/fix_mlvalues.h_path.diff
@@ -0,0 +1,53 @@
+--- a/EXTRA/does-process-exist-c-wrapper.c
 b/EXTRA/does-process-exist-c-wrapper.c
+@@ -24,10 +24,10 @@
+ #include 
+ 
+ #include 
+-#include 
++#include 
+ /* If I don't #include caml/alloc.h then this module compiles fine, but then 
crashes
+at runtime. Funny, isn't it? */
+-#include 
++#include 
+ 
+ /* Return true iff the process identified by the given pid exists. The idea 
is just to
+call kill with 0 as a signal, which is easy in C but impossible in OCaml: 
*/
+--- a/EXTRA/waitpid-c-wrapper.c
 b/EXTRA/waitpid-c-wrapper.c
+@@ -22,12 +22,12 @@
+ #include 
+ #include 
+ 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ #define WAITPID_NAME "waitpid"
+ 
+--- a/GETTEXT/gettext-c-wrapper.c
 b/GETTEXT/gettext-c-wrapper.c
+@@ -22,11 +22,11 @@
+ #include 
+ #include 
+ 
+-#include 
++#include 
+ /* If I don't #include caml/alloc.h then this module compiles fine, but then 
crashes
+at runtime. Funny, isn't it? */
+-#include 
+-#include 
++#include 
++#include 
+ 
+ /* Some part of the gettext initialization should only be performed once: */
+ static bool was_gettext_initialized = false;
diff --git a/debian/patches/series b/debian/patches/series
index 15bef37..af38ad9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_adapt_debian.diff
+fix_mlvalues.h_path.diff

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 960f56ae8b3e106a4666585fd73edb07fa093dad
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:41:57 2012 +0100

Build-Depends clean-up

diff --git a/debian/control b/debian/control
index b7488e7..a43d30e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers 
 Uploaders: Jonathan Roudiere 
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>> 5.0.0),
+Build-Depends: debhelper (>= 8),
  ocaml-nox (>= 3.11.0-5),
  liblablgtk2-ocaml-dev (>= 2.12.0-2),
  bash (>= 3.1),
  dh-ocaml (>= 0.9),
- dpatch
+ ocaml-findlib
 Standards-Version: 3.8.3
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlbricks.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 6854640fb85b9bae3dc308e49aa6dc808506bf43
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:41:45 2012 +0100

Continued debian/rules.

diff --git a/debian/rules b/debian/rules
index f0ad1c3..492a84c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,11 @@
 include /usr/share/ocaml/ocamlvars.mk
 
 %:
-   dh $@ --with ocaml
+   dh $@ --with ocaml
+
+override_dh_auto_clean:
+   dh_auto_clean
+   rm -f meta_ocamlbricks.ml
 # 
 # # include standard OCaml template
 # include /usr/share/ocaml/ocamlinit.mk
@@ -109,4 +113,4 @@ get-orig-source:
rm -rf get-orig-source
echo "  "$(TARBALL)" created; move it to the right destination to build 
the package"
 
-.PHONY: build clean binary-indep binary-arch binary install configure 
get-orig-source
+.PHONY: get-orig-source

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit c6ae752c85c07a18d031e4c4f39e4a8fe4e1bd36
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:06:41 2012 +0100

Initial debian/rules

diff --git a/debian/rules b/debian/rules
index e5abdf8..f0ad1c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,97 +1,100 @@
 #!/usr/bin/make -f
-# This file was generated by dh_make and adapted by 
-# Jonathan Roudiere (2008) for liboamlbricks-ocaml-dev package.
 
-# include standard OCaml template
-include /usr/share/ocaml/ocamlinit.mk
-
-# Variable use here (find version, path)
-DESTDIR = $(CURDIR)/debian/tmp
-
-# include an external Makefile to use dpatch
-include /usr/share/dpatch/dpatch.make
-
-# Upstream package
-PACKAGE = ocamlbricks
-VERSION = 0.50.1
-
-# Name of generated package
-DEB_PACKAGE = libocamlbricks-ocaml-dev
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp: ocamlinit
-   dh_testdir
-   touch configure-stamp
-
-build: build-stamp
-build-stamp: patch-stamp configure-stamp 
-   dh_testdir
-   test -d '$(CURDIR)/doc' || mkdir '$(CURDIR)/doc'
-   $(MAKE)
-   touch build-stamp
-
-clean: unpatch ocamlinit-clean
-   dh_testdir
-   dh_testroot
-   -$(RM) build-stamp configure-stamp 
-   $(MAKE) clean
-   dh_clean --exclude=buildsystem/* 
-   -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).doc-base.ocamldoc-apiref
-   -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).dirs
-   -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).*.debhelper 
-   -$(RM) -r '$(CURDIR)/doc'
-
-install: build
-   dh_testdir
-   dh_testroot
-   dh_clean -k --exclude=buildsystem/* 
-   dh_installdirs
-   $(MAKE) install
-   
-   # Documentation type html 
-   cp $(DESTDIR)/usr/share/doc/$(PACKAGE)/html/*.html 
$(CURDIR)/debian/$(DEB_PACKAGE)/usr/share/doc/$(DEB_PACKAGE)/html/api/
-   cp $(DESTDIR)/usr/share/doc/$(PACKAGE)/html/*.css 
$(CURDIR)/debian/$(DEB_PACKAGE)/usr/share/doc/$(DEB_PACKAGE)/html/api/
-
-   # Copy libraries for libocamlbricks-ocaml-dev
-   cp $(DESTDIR)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/* 
$(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/
-   -$(RM) 
$(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/stupidprogram*
-
-   # create .mli file (header)
-   chmod +x $(CURDIR)/debian/generate_mli.sh
-   $(CURDIR)/debian/generate_mli.sh  
$(CURDIR)/debian/$(DEB_PACKAGE)/$(OCAML_STDLIB_DIR)/$(PACKAGE)/
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-   dh_testdir -s
-   dh_testroot -s
-   dh_installchangelogs -s
-   dh_installdocs -s
-   dh_installexamples -s --exclude=COPYING $(CURDIR)/debian/buildsystem
-   dh_installexamples -s $(CURDIR)/stupidprogram.ml
-   dh_installexamples -s $(CURDIR)/LEDGRID/sample-images
-   dh_install -s
-   dh_compress -s
-   dh_fixperms -s
-   dh_makeshlibs -s
-   dh_installdeb -s
-   dh_shlibdeps -s
-   dh_ocaml -s
-   dh_gencontrol -s
-   dh_md5sums -s
-   dh_builddeb -s
-
-binary: binary-indep binary-arch
+include /usr/share/ocaml/ocamlvars.mk
+
+%:
+   dh $@ --with ocaml
+# 
+# # include standard OCaml template
+# include /usr/share/ocaml/ocamlinit.mk
+# 
+# # Variable use here (find version, path)
+# DESTDIR = $(CURDIR)/debian/tmp
+# 
+# # include an external Makefile to use dpatch
+# include /usr/share/dpatch/dpatch.make
+# 
+# # Upstream package
+# PACKAGE = ocamlbricks
+# VERSION = 0.50.1
+# 
+# # Name of generated package
+# DEB_PACKAGE = libocamlbricks-ocaml-dev
+# 
+# ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+# CFLAGS += -g
+# endif
+# ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+# INSTALL_PROGRAM += -s
+# endif
+# 
+# configure: configure-stamp
+# configure-stamp: ocamlinit
+#  dh_testdir
+#  touch configure-stamp
+# 
+# build: build-stamp
+# build-stamp: patch-stamp configure-stamp 
+#  dh_testdir
+#  test -d '$(CURDIR)/doc' || mkdir '$(CURDIR)/doc'
+#  $(MAKE)
+#  touch build-stamp
+# 
+# clean: unpatch ocamlinit-clean
+#  dh_testdir
+#  dh_testroot
+#  -$(RM) build-stamp configure-stamp 
+#  $(MAKE) clean
+#  dh_clean --exclude=buildsystem/* 
+#  -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).doc-base.ocamldoc-apiref
+#  -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).dirs
+#  -$(RM) $(CURDIR)/debian/$(DEB_PACKAGE).*.debhelper 
+#  -$(RM) -r '$(CURDIR)/doc'
+# 
+# install: build
+#  dh_testdir
+#  dh_testroot
+#  dh_clean -k --exclude=buildsystem/* 
+#  dh_installdirs
+#  $(MAKE) install
+#  
+#  # Documentation type html 
+#  cp $(DESTDIR)/usr/share/doc/$(PACKAGE)/html/*.h

[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit aa9fc86cf03b240faa8921696b71144afd1cb25a
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:03:40 2012 +0100

update changelog

diff --git a/debian/changelog b/debian/changelog
index fc1d2bf..b2a71cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-ocamlbricks (0.50.1-5) UNRELEASED; urgency=low
+ocamlbricks (0.90+bzr337-2) UNRELEASED; urgency=low
 
+  [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Sylvain Le Gall   Fri, 21 Sep 2012 01:20:49 +
+  [ Lucas Nussbaum ]
+  * New upstream snapshot from the trunk branch, after discussion with
+upstream author in https://bugs.launchpad.net/marionnet/+bug/1085055
+
+ -- Lucas Nussbaum   Sat, 01 Dec 2012 18:02:32 +0100
 
 ocamlbricks (0.50.1-4) unstable; urgency=low
 

-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 8a50258b1dea64c1bd8481e180c285eff689de71
Merge: 7ada1fa2039c4d5efe823f479a9a1729ec5b1fa0 
bb966d39f32f92a1cccf13933f5336b90f1a284b
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:02:12 2012 +0100

Merge tag 'upstream/0.90+bzr337'

Upstream version 0.90+bzr337


-- 
ocamlbricks packaging

___
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] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

2013-02-18 Thread Lucas Nussbaum 
The following commit has been merged in the master branch:
commit 7ada1fa2039c4d5efe823f479a9a1729ec5b1fa0
Author: Lucas Nussbaum 
Date:   Sat Dec 1 18:02:02 2012 +0100

Add get-orig-source target

diff --git a/debian/rules b/debian/rules
index db79ac9..e5abdf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,4 +92,18 @@ binary-arch: build install
dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+# see https://launchpad.net/ocamlbricks/trunk
+PACKAGE = ocamlbricks
+SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: 
\(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+BZR_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$2 }' | sed 
's/bzr//' )
+TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
+get-orig-source:
+   rm -rf get-orig-source $(TARBALL)
+   mkdir get-orig-source
+   bzr branch -r $(BZR_REVISION) lp:$(PACKAGE)/trunk 
get-orig-source/$(PACKAGE)-$(SRC_VERSION).orig
+   GZIP=--best tar czf $(TARBALL) -C get-orig-source 
$(PACKAGE)-$(SRC_VERSION).orig
+   rm -rf get-orig-source
+   echo "  "$(TARBALL)" created; move it to the right destination to build 
the package"
+
+.PHONY: build clean binary-indep binary-arch binary install configure 
get-orig-source

-- 
ocamlbricks packaging

___
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