This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository lablgtk2.
commit 827dd65b655e1f53c5aa5487752882c02daf7c77
Author: Stephane Glondu <st...@glondu.net>
Date: Thu Dec 19 19:27:39 2013 +0100
Add headers to patches and refresh
---
debian/patches/0001-Disable-svgz.patch | 6 +++---
...fix-install-path.patch => 0002-Fix-install-path.patch} | 13 ++++++++++++-
...-files.patch => 0003-Don-t-install-Props.-files.patch} | 15 +++++++++++++--
debian/patches/series | 4 ++--
4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/debian/patches/0001-Disable-svgz.patch
b/debian/patches/0001-Disable-svgz.patch
index 918fa88..b73ea45 100644
--- a/debian/patches/0001-Disable-svgz.patch
+++ b/debian/patches/0001-Disable-svgz.patch
@@ -1,13 +1,13 @@
From: Julien Cristau <julien.cris...@ens-lyon.org>
Date: Sun, 7 Jun 2009 16:55:39 +0200
-Subject: [PATCH] Disable svgz
+Subject: Disable svgz
librsvg doesn't have a rsvg-gz.h header anymore, and
rsvg_handle_new_gz isn't necessary (svgz files are detected
automatically). So don't build a binding for this function.
---
- config.make.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ config.make.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.make.in b/config.make.in
index e689bda..d5487d7 100644
diff --git a/debian/patches/0002-fix-install-path.patch
b/debian/patches/0002-Fix-install-path.patch
similarity index 70%
rename from debian/patches/0002-fix-install-path.patch
rename to debian/patches/0002-Fix-install-path.patch
index dbaf12d..2ff6c55 100644
--- a/debian/patches/0002-fix-install-path.patch
+++ b/debian/patches/0002-Fix-install-path.patch
@@ -1,6 +1,16 @@
+From: Lifeng Sun <lifong...@gmail.com>
+Date: Sun, 12 May 2013 08:30:34 +0800
+Subject: Fix install path.
+
+---
+ src/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index c498882..f4200dc 100755
--- a/src/Makefile
+++ b/src/Makefile
-@@ -427,9 +427,9 @@
+@@ -427,9 +427,9 @@ findlib-install:
then \
echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \
fi`
@@ -12,3 +22,4 @@
rm lablgtk2$(XB)
$(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB)
cp lablgtk2$(XB) "$(BINDIR)"
+--
diff --git a/debian/patches/0003-dont-install-Props-files.patch
b/debian/patches/0003-Don-t-install-Props.-files.patch
similarity index 64%
rename from debian/patches/0003-dont-install-Props-files.patch
rename to debian/patches/0003-Don-t-install-Props.-files.patch
index 07adb6e..611fd29 100644
--- a/debian/patches/0003-dont-install-Props-files.patch
+++ b/debian/patches/0003-Don-t-install-Props.-files.patch
@@ -1,6 +1,16 @@
+From: Lifeng Sun <lifong...@gmail.com>
+Date: Thu, 25 Jul 2013 23:39:53 +0800
+Subject: Don't install *Props.* files.
+
+---
+ src/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index f4200dc..48ad050 100755
--- a/src/Makefile
+++ b/src/Makefile
-@@ -236,6 +236,7 @@
+@@ -236,6 +236,7 @@ MLOBJS4 = gContainer.cmo gPack.cmo gButton.cmo gText.cmo \
gUtil.cmo gToolbox.cmo
MLOBJS = $(MLOBJS1) $(ENUMOBJS) $(MLOBJS2) $(GTKPROPS:.props=Props.cmo) \
$(MLOBJS3) $(GTKPROPS:%.props=o%Props.cmo) $(MLOBJS4)
@@ -8,7 +18,7 @@
THOBJS = gtkThread.cmo
INITOBJS = gtkInit.cmo
ifdef USE_GTKQUARTZ
-@@ -244,7 +245,7 @@
+@@ -244,7 +245,7 @@ else
THINITOBJS = gtkThInit.cmo
endif
EXTRAOBJS = $(INITOBJS) $(THOBJS) $(THINITOBJS)
@@ -17,3 +27,4 @@
$(RSVGMLOBJS) $(GNOMECANVASMLOBJS) $(GNOMEUIMLOBJS) $(PANELMLOBJS) \
$(GTKSPELLMLOBJS) $(GTKSOURCEVIEW2MLOBJS) \
$(INITOBJS)
+--
diff --git a/debian/patches/series b/debian/patches/series
index ba67c55..43d771b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
0001-Disable-svgz.patch
-0002-fix-install-path.patch
-0003-dont-install-Props-files.patch
+0002-Fix-install-path.patch
+0003-Don-t-install-Props.-files.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgtk2.git
_______________________________________________
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
