[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr407-32-gab49ab0

2013-06-23 Thread Nicolas Dandrimont
The following commit has been merged in the master branch:
commit ab49ab0a00dcd528d0611cad08d59f2289ff4ed0
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date:   Sun Jun 23 20:14:49 2013 +0200

Add bug closing info

diff --git a/debian/changelog b/debian/changelog
index b1fc359..7435ae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 marionnet (0.90.6+bzr421-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
+- Fixes FTBFS from the LedGrid module move (Closes: #713534)
   * Add myself to uploaders
   * Bump ocamlbricks requirement
 

-- 
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-32-gab49ab0

2013-06-23 Thread Nicolas Dandrimont
The following commit has been merged in the master branch:
commit 35753896c6e9a4fda7b9f9d8ff8520d3b1ef2c88
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date:   Sun Jun 23 18:12:39 2013 +0200

Bump ocamlbricks requirement

diff --git a/debian/control b/debian/control
index 3e2134c..8158946 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (= 8.0.0),
  camlp4-extra,
  ocaml-findlib,
  liblablgtk2-ocaml-dev (= 2.12.0-2),
- libocamlbricks-ocaml-dev (= 0.90+bzr356),
+ libocamlbricks-ocaml-dev (= 0.90+bzr365~),
  liblablgtksourceview2-ocaml-dev (= 2.14.2)
 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-32-gab49ab0

2013-06-23 Thread Nicolas Dandrimont
The following commit has been merged in the master branch:
commit fdf0259556cf72c205d1eae45846865a282ee0d6
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date:   Sun Jun 23 18:13:45 2013 +0200

update changelog

diff --git a/debian/changelog b/debian/changelog
index 6d186e7..b1fc359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 marionnet (0.90.6+bzr421-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
+  * Add myself to uploaders
+  * Bump ocamlbricks requirement
 
  -- Nicolas Dandrimont nicolas.dandrim...@crans.org  Sun, 23 Jun 2013 
17:50:32 +0200
 

-- 
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-32-gab49ab0

2013-06-23 Thread Nicolas Dandrimont
The following commit has been merged in the master branch:
commit 764406f41d9430955c2d2d9c4fb7509d98fe67d9
Merge: ca6e2f4c62c172432a142fa1e44b1b078705bd01 
814f78a56aa183d029859208a5fb1cbfc7881065
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date:   Sun Jun 23 19:54:40 2013 +0200

Merge tag 'upstream/0.90.6+bzr421'

Upstream version 0.90.6+bzr421


-- 
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-32-gab49ab0

2013-06-23 Thread Nicolas Dandrimont
The following commit has been merged in the master branch:
commit 23aad913ec56e4ccc3cf157ba32c00f1bd85e758
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date:   Sun Jun 23 18:31:25 2013 +0200

Update saved files for new upstream snapshot

diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 6f25d06..000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-share/marionnet.conf
diff --git a/debian/rules b/debian/rules
index e9f452f..38e32b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
 
 override_dh_auto_build:
cp -f po/messages.pot po/messages.pot.orig
-   cp -f .bzr/checkout/dirstate .bzr/checkout/dirstate.orig
dh_auto_build
 
 override_dh_auto_install:
@@ -26,7 +25,6 @@ override_dh_auto_install:
 override_dh_auto_clean:
dh_auto_clean
if [ -f po/messages.pot.orig ]; then mv po/messages.pot.orig 
po/messages.pot; fi
-   if [ -f .bzr/checkout/dirstate.orig ]; then mv 
.bzr/checkout/dirstate.orig .bzr/checkout/dirstate; fi
 
 # see https://launchpad.net/marionnet/trunk
 PACKAGE = marionnet

-- 
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-32-gab49ab0

2013-06-23 Thread Nicolas Dandrimont
The following commit has been merged in the master branch:
commit 74315ed7c136790e8ec067c5ecc78b64082c370f
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date:   Sun Jun 23 18:10:51 2013 +0200

Import new version

diff --git a/debian/changelog b/debian/changelog
index e43479e..6d186e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+marionnet (0.90.6+bzr421-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot
+
+ -- Nicolas Dandrimont nicolas.dandrim...@crans.org  Sun, 23 Jun 2013 
17:50:32 +0200
+
 marionnet (0.90.6+bzr407-1) unstable; urgency=low
 
   [ Lucas Nussbaum ]

-- 
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