[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr421-34-gb4b81b8
The following commit has been merged in the master branch: commit e7478a34548c55faea1742f9713beee0daaaeca8 Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Sun Jun 23 20:27:48 2013 +0200 Move to Standards-Version 3.9.4 (no changes) diff --git a/debian/changelog b/debian/changelog index 7435ae4..e47988f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ marionnet (0.90.6+bzr421-1) UNRELEASED; urgency=low - Fixes FTBFS from the LedGrid module move (Closes: #713534) * Add myself to uploaders * Bump ocamlbricks requirement + * Move to Standards-Version 3.9.4 (no changes) -- Nicolas Dandrimont nicolas.dandrim...@crans.org Sun, 23 Jun 2013 17:50:32 +0200 diff --git a/debian/control b/debian/control index 8158946..b7aa939 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (= 8.0.0), liblablgtk2-ocaml-dev (= 2.12.0-2), libocamlbricks-ocaml-dev (= 0.90+bzr365~), liblablgtksourceview2-ocaml-dev (= 2.14.2) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.marionnet.org/ 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 -- 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+bzr421-34-gb4b81b8
The following commit has been merged in the master branch:
commit b4b81b812fd01de59603dbb92551cc731028abec
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date: Sun Jun 23 22:02:12 2013 +0200
Add DEP-3 info to the patches
diff --git a/debian/patches/debian-prefix.diff
b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
similarity index 69%
rename from debian/patches/debian-prefix.diff
rename to
debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
index 29e4213..d835508 100644
--- a/debian/patches/debian-prefix.diff
+++
b/debian/patches/0001-Customize-installation-paths-for-Debian-packaging.patch
@@ -1,3 +1,14 @@
+From: Lucas Nussbaum lu...@lucas-nussbaum.net
+Date: Wed, 13 Feb 2013 10:23:01 +0100
+Subject: Customize installation paths for Debian packaging
+
+Forwarded: not-needed
+---
+ CONFIGME | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CONFIGME b/CONFIGME
+index 4513612..4d9c92c 100644
--- a/CONFIGME
+++ b/CONFIGME
@@ -34,11 +34,11 @@
@@ -14,7 +25,7 @@
# Prefix for the locale files
localeprefix=${prefix}/share/locale
-@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || e
+@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1)
# 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.
diff --git a/debian/patches/hack-filesystems-path.diff
b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
similarity index 67%
rename from debian/patches/hack-filesystems-path.diff
rename to
debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
index f0cd889..5e6138a 100644
--- a/debian/patches/hack-filesystems-path.diff
+++ b/debian/patches/0002-Tweak-file-installation-paths-in-marionnet.conf.patch
@@ -1,3 +1,14 @@
+From: Lucas Nussbaum lu...@lucas-nussbaum.net
+Date: Wed, 13 Feb 2013 11:03:18 +0100
+Subject: Tweak file installation paths in marionnet.conf
+
+Forwarded: not-needed
+---
+ etc/marionnet.conf | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/etc/marionnet.conf b/etc/marionnet.conf
+index 8eda75e..b7c0197 100644
--- a/etc/marionnet.conf
+++ b/etc/marionnet.conf
@@ -64,10 +64,10 @@ MARIONNET_VDE_PREFIX=
diff --git a/debian/patches/series b/debian/patches/series
index 504cac6..3fb53af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian-prefix.diff
-hack-filesystems-path.diff
+0001-Customize-installation-paths-for-Debian-packaging.patch
+0002-Tweak-file-installation-paths-in-marionnet.conf.patch
--
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+bzr421-34-gb4b81b8
The following commit has been merged in the master branch: commit 8b443959255ef952c8e5b475796c5cb167e1a4fc Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Sun Jun 23 21:58:20 2013 +0200 Use canonical Vcs URIs diff --git a/debian/changelog b/debian/changelog index e47988f..e372882 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ marionnet (0.90.6+bzr421-1) UNRELEASED; urgency=low * Add myself to uploaders * Bump ocamlbricks requirement * Move to Standards-Version 3.9.4 (no changes) + * Use canonical Vcs URIs -- Nicolas Dandrimont nicolas.dandrim...@crans.org Sun, 23 Jun 2013 17:50:32 +0200 diff --git a/debian/control b/debian/control index b7aa939..aed8cfd 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: debhelper (= 8.0.0), liblablgtksourceview2-ocaml-dev (= 2.14.2) Standards-Version: 3.9.4 Homepage: http://www.marionnet.org/ -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 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/marionnet.git +Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/marionnet.git Package: marionnet Architecture: any -- 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
