[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.8.2-2-6-g54a29de

2013-06-25 Thread Mehdi Dogguy
The following commit has been merged in the master branch:
commit 53f6fdd64a90acdb45ecab32fb6a517c041168b0
Author: Mehdi Dogguy me...@debian.org
Date:   Tue Jun 25 22:19:54 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 3a7df00..1e6a839 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-ocamlgraph (1.8.2-3) UNRELEASED; urgency=low
+ocamlgraph (1.8.3-1) UNRELEASED; urgency=low
 
+  [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Sylvain Le Gall gil...@debian.org  Fri, 21 Sep 2012 01:21:14 +
+  [ Mehdi Dogguy ]
+  * New upstream release
+
+ -- Mehdi Dogguy me...@debian.org  Tue, 25 Jun 2013 22:19:36 +0200
 
 ocamlgraph (1.8.2-2) unstable; urgency=low
 

-- 
ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.8.2-2-6-g54a29de

2013-06-25 Thread Mehdi Dogguy
The following commit has been merged in the master branch:
commit 6560e92143be5dede7b757dfe1bf6d3cabc1b992
Merge: 7bebf24260a40301879b917b81780b8d9b92afbb 
ab3608493982b4dce98bc5bb8dbc8dae70986795
Author: Mehdi Dogguy me...@debian.org
Date:   Tue Jun 25 22:19:29 2013 +0200

Merge tag 'upstream/1.8.3'

Upstream version 1.8.3


-- 
ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.8.2-2-6-g54a29de

2013-06-25 Thread Mehdi Dogguy
The following commit has been merged in the master branch:
commit e446b141b9c69e411b61ee1c08d275b9fbc9ddc3
Author: Mehdi Dogguy me...@debian.org
Date:   Tue Jun 25 22:21:18 2013 +0200

Refresh patches

diff --git 
a/debian/patches/0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
 
b/debian/patches/0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
index 5bb3904..ea16682 100644
--- 
a/debian/patches/0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
+++ 
b/debian/patches/0001-prefix-binary-names-with-ocaml-and-do-not-install-us.patch
@@ -1,16 +1,16 @@
 From: Mehdi Dogguy me...@debian.org
 Date: Sun, 25 Apr 2010 14:50:30 +0200
-Subject: [PATCH] prefix binary names with 'ocaml' and do not install useless 
files
+Subject: prefix binary names with 'ocaml' and do not install useless files
 
 ---
  Makefile.in |   11 +++
- 1 files changed, 7 insertions(+), 4 deletions(-)
+ 1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index f138175..136909e 100644
+index 1b32d45..3aa2377 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -293,11 +293,13 @@ install: install-$(OCAMLBEST) install-byte
+@@ -330,11 +330,13 @@ install: install-$(OCAMLBEST) install-byte
mkdir -p $(BINDIR)
  ifeq (@LABLGNOMECANVAS@,yes)
  ifeq ($(OCAMLBEST),byte)
@@ -28,7 +28,7 @@ index f138175..136909e 100644
  endif
  endif
  
-@@ -305,6 +307,7 @@ install-byte:
+@@ -342,6 +344,7 @@ install-byte:
mkdir -p $(INSTALL_LIBDIR)
cp -f graph.cmo graph.cmi $(CMA) $(INSTALL_LIBDIR)
cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
diff --git 
a/debian/patches/0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch 
b/debian/patches/0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch
index e9237d6..9f4a108 100644
--- a/debian/patches/0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch
+++ b/debian/patches/0002-avoid-referencing-non-existent-icon-ed_icon.xpm.patch
@@ -1,10 +1,10 @@
 From: Mehdi Dogguy me...@debian.org
 Date: Sun, 25 Apr 2010 14:51:39 +0200
-Subject: [PATCH] avoid referencing non existent icon ed_icon.xpm
+Subject: avoid referencing non existent icon ed_icon.xpm
 
 ---
  editor/ed_main.ml |4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/editor/ed_main.ml b/editor/ed_main.ml
 index b5ece22..e66fb4a 100644

-- 
ocamlgraph 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] ocamlgraph packaging branch, master, updated. debian/1.8.2-2-6-g54a29de

2013-06-25 Thread Mehdi Dogguy
The following commit has been merged in the master branch:
commit 54a29de234e8835c50a19074515691cdea73aa0b
Author: Mehdi Dogguy me...@debian.org
Date:   Tue Jun 25 22:26:54 2013 +0200

Update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 1e6a839..96d0b0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ocamlgraph (1.8.3-1) UNRELEASED; urgency=low
 
   [ Mehdi Dogguy ]
   * New upstream release
+  * Update debian/copyright
 
  -- Mehdi Dogguy me...@debian.org  Tue, 25 Jun 2013 22:19:36 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 4626857..523894a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,6 +35,10 @@ License: LGPL-2.1 + linking exception
  executable file might be covered by the GNU Library General Public
  License.
 
+Files: src/graphml.ml, src/graphml.mli, tests/testgraphml.ml
+Copyright: © 2012 Pietro Abate pietro.ab...@pps.jussieu.fr
+License: LGPL-2.1
+
 Files: *
 Copyright: © 2004-2010 Sylvain Conchon sylvain.conc...@lri.fr
© 2004-2010 Jean-Christophe Filliâtre 
jean-christophe.fillia...@lri.fr

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