[Pkg-ocaml-maint-commits] [SCM] gmetadom packaging branch, master, updated. debian/0.2.6-5-7-gb7dfda0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit dd0a81d9991bf01679e058e1116f60303bdae905
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue May 31 10:37:51 2011 +0200

    Switch patches to quilt

diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index c2409be..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e9bc2c7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc-4.3.dpatch
-ld-as-needed.dpatch
diff --git a/debian/patches/gcc-4.3.dpatch b/debian/patches/gcc-4.3.dpatch
deleted file mode 100755
index d8d1d46..0000000
--- a/debian/patches/gcc-4.3.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc-4.3.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ensure sources build with gcc-4.3
-
- at DPATCH@
-diff -urNad trunk~/src/shared/Traits.hh.in trunk/src/shared/Traits.hh.in
---- trunk~/src/shared/Traits.hh.in	2003-01-14 12:41:55.000000000 +0100
-+++ trunk/src/shared/Traits.hh.in	2008-05-01 15:45:39.000000000 +0200
-@@ -26,6 +26,7 @@
-  */
- 
- #include <string>
-+#include <cstring>
- 
- #include "@DOM_NAMESPACE at Char.hh"
- 
diff --git a/debian/patches/gcc-4.3.patch b/debian/patches/gcc-4.3.patch
new file mode 100644
index 0000000..a12df44
--- /dev/null
+++ b/debian/patches/gcc-4.3.patch
@@ -0,0 +1,22 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 31 May 2011 10:34:08 +0200
+Subject: gcc-4.3
+
+Ensure sources build with gcc-4.3.
+---
+ src/shared/Traits.hh.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/shared/Traits.hh.in b/src/shared/Traits.hh.in
+index fec3db7..35262a3 100644
+--- a/src/shared/Traits.hh.in
++++ b/src/shared/Traits.hh.in
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <string>
++#include <cstring>
+ 
+ #include "@DOM_NAMESPACE at Char.hh"
+ 
+-- 
diff --git a/debian/patches/ld-as-needed.dpatch b/debian/patches/ld-as-needed.dpatch
deleted file mode 100755
index 6223dd2..0000000
--- a/debian/patches/ld-as-needed.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ld-as-needed.dpatch by Colin Watson <cjwatson at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: rearrange link order to work with 'ld --as-needed'
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gmetadom~/src/gdome_cpp_smart/test/Makefile.am gmetadom/src/gdome_cpp_smart/test/Makefile.am
---- gmetadom~/src/gdome_cpp_smart/test/Makefile.am	2007-05-08 16:26:18.000000000 +0100
-+++ gmetadom/src/gdome_cpp_smart/test/Makefile.am	2011-05-20 15:20:07.000000000 +0100
-@@ -6,9 +6,9 @@
- deep_SOURCES = deep.cc
- 
- LDADDS = \
--  $(GDOME_LIBS) \
-   $(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \
-   $(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \
-+  $(GDOME_LIBS) \
-   -lstdc++
- 
- test_LDADD = $(LDADDS)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gmetadom~/src/gdome_cpp_smart/test/Makefile.in gmetadom/src/gdome_cpp_smart/test/Makefile.in
---- gmetadom~/src/gdome_cpp_smart/test/Makefile.in	2007-10-15 10:42:44.000000000 +0100
-+++ gmetadom/src/gdome_cpp_smart/test/Makefile.in	2011-05-20 15:20:13.000000000 +0100
-@@ -217,9 +217,9 @@
- basic_SOURCES = basic.cc
- deep_SOURCES = deep.cc
- LDADDS = \
--  $(GDOME_LIBS) \
-   $(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \
-   $(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \
-+  $(GDOME_LIBS) \
-   -lstdc++
- 
- test_LDADD = $(LDADDS)
diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
new file mode 100644
index 0000000..dfd962e
--- /dev/null
+++ b/debian/patches/ld-as-needed.patch
@@ -0,0 +1,41 @@
+From: Colin Watson <cjwatson at ubuntu.com>
+Date: Tue, 31 May 2011 10:35:04 +0200
+Subject: ld-as-needed
+
+Rearrange link order to work with 'ld --as-needed'.
+---
+ src/gdome_cpp_smart/test/Makefile.am |    2 +-
+ src/gdome_cpp_smart/test/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gdome_cpp_smart/test/Makefile.am b/src/gdome_cpp_smart/test/Makefile.am
+index be25fd2..aeba674 100644
+--- a/src/gdome_cpp_smart/test/Makefile.am
++++ b/src/gdome_cpp_smart/test/Makefile.am
+@@ -6,9 +6,9 @@ basic_SOURCES = basic.cc
+ deep_SOURCES = deep.cc
+ 
+ LDADDS = \
+-  $(GDOME_LIBS) \
+   $(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \
+   $(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \
++  $(GDOME_LIBS) \
+   -lstdc++
+ 
+ test_LDADD = $(LDADDS)
+diff --git a/src/gdome_cpp_smart/test/Makefile.in b/src/gdome_cpp_smart/test/Makefile.in
+index 3476da5..d342ddb 100644
+--- a/src/gdome_cpp_smart/test/Makefile.in
++++ b/src/gdome_cpp_smart/test/Makefile.in
+@@ -217,9 +217,9 @@ test_SOURCES = main.cc
+ basic_SOURCES = basic.cc
+ deep_SOURCES = deep.cc
+ LDADDS = \
+-  $(GDOME_LIBS) \
+   $(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \
+   $(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \
++  $(GDOME_LIBS) \
+   -lstdc++
+ 
+ test_LDADD = $(LDADDS)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..abcb25d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+gcc-4.3.patch
+ld-as-needed.patch

-- 
gmetadom packaging