[Pkg-ocaml-maint-commits] [lablgtk2] 07/09: Refresh patches

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository lablgtk2.

commit 513bac52426339745e08f5e57f8065c1f85529d0
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 17 14:37:52 2015 +0200

    Refresh patches
    
    Remove "Don't install *Props.* files." patch. With OCaml 4.02, these
    files are needed for e.g. mldonkey, coq.
---
 debian/patches/0001-Disable-svgz.patch             |  4 +--
 debian/patches/0002-Fix-install-path.patch         | 25 ------------------
 .../patches/0003-Don-t-install-Props.-files.patch  | 30 ----------------------
 debian/patches/series                              |  2 --
 4 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/debian/patches/0001-Disable-svgz.patch b/debian/patches/0001-Disable-svgz.patch
index b73ea45..bf314f3 100644
--- a/debian/patches/0001-Disable-svgz.patch
+++ b/debian/patches/0001-Disable-svgz.patch
@@ -10,10 +10,10 @@ automatically). So don't build a binding for this function.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/config.make.in b/config.make.in
-index e689bda..d5487d7 100644
+index 14d3cdd..8d1dfff 100644
 --- a/config.make.in
 +++ b/config.make.in
-@@ -19,7 +19,7 @@ EXE=@EXE@
+@@ -22,7 +22,7 @@ EXE=@EXE@
  USE_GL=@USE_GTKGL@
  USE_GLADE=@USE_GLADE@
  USE_RSVG=@USE_RSVG@
diff --git a/debian/patches/0002-Fix-install-path.patch b/debian/patches/0002-Fix-install-path.patch
deleted file mode 100644
index 2ff6c55..0000000
--- a/debian/patches/0002-Fix-install-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Lifeng Sun <lifongsun at 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 @@ findlib-install:
-       then \
-         echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \
-     fi`
--	$(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%)
-+	$(RANLIB) $(CLIBS:%="$(OCAMLFIND_DESTDIR)"/lablgtk2/%)
- 	@if test -f lablgtk.cmxa; \
--	  then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi
-+	  then ($(RANLIB) $(MLLIBS:%.cma="$(OCAMLFIND_DESTDIR)"/lablgtk2/%$(XA)) $(EXTRA_MLLIBS:%.cma="$(OCAMLFIND_DESTDIR)"/lablgtk2/%$(XA)) ); fi
- 	rm lablgtk2$(XB)
- 	$(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB)
- 	cp lablgtk2$(XB) "$(BINDIR)"
--- 
diff --git a/debian/patches/0003-Don-t-install-Props.-files.patch b/debian/patches/0003-Don-t-install-Props.-files.patch
deleted file mode 100644
index 611fd29..0000000
--- a/debian/patches/0003-Don-t-install-Props.-files.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Lifeng Sun <lifongsun at 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 @@ 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)
-+MLXOBJS = $(MLOBJS1) $(ENUMOBJS) $(MLOBJS2) $(MLOBJS3) $(MLOBJS4)
- THOBJS = gtkThread.cmo
- INITOBJS = gtkInit.cmo
- ifdef USE_GTKQUARTZ
-@@ -244,7 +245,7 @@ else
- THINITOBJS = gtkThInit.cmo
- endif
- EXTRAOBJS = $(INITOBJS) $(THOBJS) $(THINITOBJS)
--ALLOBJS = $(MLOBJS) $(GLMLOBJS) $(GNOMEMLOBJS) $(GLADEMLOBJS) \
-+ALLOBJS = $(MLXOBJS) $(GLMLOBJS) $(GNOMEMLOBJS) $(GLADEMLOBJS) \
- 	$(RSVGMLOBJS) $(GNOMECANVASMLOBJS) $(GNOMEUIMLOBJS) $(PANELMLOBJS) \
- 	$(GTKSPELLMLOBJS) $(GTKSOURCEVIEW2MLOBJS) \
- 	$(INITOBJS)
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 43d771b..08b30ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Disable-svgz.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