[Pkg-ocaml-maint-commits] [SCM] lablgtk-extras packaging branch, master, updated. debian/1.0-1-10-gadd9c10

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 439061bce34669a36c3d462fe7b2bf5103937085
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 26 07:39:44 2013 +0200

    Remove obsolete patches

diff --git a/debian/patches/0001-Fix-typo-in-master.Makefile.in.patch b/debian/patches/0001-Fix-typo-in-master.Makefile.in.patch
deleted file mode 100644
index 45d9b2e..0000000
--- a/debian/patches/0001-Fix-typo-in-master.Makefile.in.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Wed, 27 Jul 2011 10:59:04 +0200
-Subject: Fix typo in master.Makefile.in
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- master.Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/master.Makefile.in b/master.Makefile.in
-index d8919aa..8229b6b 100644
---- a/master.Makefile.in
-+++ b/master.Makefile.in
-@@ -59,7 +59,7 @@ DESTDIR=   # For debian packagers
- LIBDIR=$(DESTDIR)@libdir@
- BINDIR=$(DESTDIR)@bindir@
- MANDIR=$(DESTDIR)@mandir@
--DATADIR=$(DESDIT)@datadir@
-+DATADIR=$(DESTDIR)@datadir@
- 
- GELIB=@GELIB@
- GELIB_BYTE=@GELIB_BYTE@
--- 
diff --git a/debian/patches/0002-Fix-compilation-on-bytecode-only-architectures.patch b/debian/patches/0002-Fix-compilation-on-bytecode-only-architectures.patch
deleted file mode 100644
index 5202328..0000000
--- a/debian/patches/0002-Fix-compilation-on-bytecode-only-architectures.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sat, 10 Sep 2011 17:04:34 +0200
-Subject: Fix compilation on bytecode-only architectures
-
-Forwarded: no
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- src/Makefile |   16 +++++++++++-----
- 1 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 17d37d8..90d6d1e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -25,6 +25,7 @@
- #################################################################################
- 
- include ../master.Makefile
-+include /usr/share/ocaml/ocamlvars.mk
- 
- MY_INCLUDES=
- SYSTEM_INCLUDES= $(LABLGTK2_INCLUDES)
-@@ -57,7 +58,15 @@ CWLIB_CMOFILES=configwin_keys.cmo \
- CWLIB_CMIFILES=$(CWLIB_CMOFILES:.cmo=.cmi)
- CWLIB_CMXFILES=$(CWLIB_CMOFILES:.cmo=.cmx)
- 
--all: byte opt
-+ALL_TARGETS := byte
-+LIB_FILES_TO_INSTALL := $(GELIB_BYTE) $(GELIB_CMIFILES) $(GELIB_CMOFILES) $(GELIB_CMIFILES:.cmi=.mli) $(CWLIB_BYTE) $(CWLIB:.cmxa=.cmi) $(CWLIB:.cmxa=.mli)
-+
-+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-+  ALL_TARGETS += opt
-+  LIB_FILES_TO_INSTALL += $(GELIB) $(GELIB:.cmxa=.a) $(GELIB_CMXFILES) $(GELIB_CMXFILES:.cmx=.o) $(CWLIB) $(CWLIB:.cmxa=.a)
-+endif
-+
-+all: $(ALL_TARGETS)
- opt: $(GELIB) $(CWLIB)
- byte:  $(GELIB_BYTE) $(CWLIB_BYTE)
- 
-@@ -102,10 +111,7 @@ dummy:
- 
- install:
- 	$(MKDIR) $(BINDIR) $(LIBDIR) $(DATADIR)
--	$(CP) $(GELIB) $(GELIB_BYTE) $(GELIB:.cmxa=.a) $(GELIB_CMIFILES) \
--	$(GELIB_CMOFILES) $(GELIB_CMXFILES) \
--	$(GELIB_CMXFILES:.cmx=.o) $(GELIB_CMIFILES:.cmi=.mli) $(LIBDIR)/
--	$(CP) $(CWLIB) $(CWLIB_BYTE) $(CWLIB:.cmxa=.a) $(CWLIB:.cmxa=.cmi) $(CWLIB:.cmxa=.mli) $(LIBDIR)/
-+	$(CP) $(LIB_FILES_TO_INSTALL) $(LIBDIR)/
- 
- #	$(CP) gtk/ge.glade $(DATADIR)/
- #	$(CP) $(TOOLS) $(TOOLS_BYTE) $(BINDIR)/
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4f84e77..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-typo-in-master.Makefile.in.patch
-0002-Fix-compilation-on-bytecode-only-architectures.patch

-- 
lablgtk-extras packaging