[Pkg-ocaml-maint-commits] [SCM] ledit packaging branch, master, updated. debian/2.01-6-11-g56e1633

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 56e1633f6e06ba4f416ced04660578f8d743459c
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Nov 19 11:49:39 2010 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index a4e3421..930514f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-ledit (2.02.0-1~1) UNRELEASED; urgency=low
+ledit (2.02.1-1~1) UNRELEASED; urgency=low
 
   * New upstream release
+    - remove all patches (merged upstream)
 
- -- Stéphane Glondu <glondu at debian.org>  Fri, 19 Nov 2010 09:38:28 +0100
+ -- Stéphane Glondu <glondu at debian.org>  Fri, 19 Nov 2010 11:49:55 +0100
 
 ledit (2.01-6) unstable; urgency=low
 
diff --git a/debian/patches/0001-Add-possibility-to-remove-custom.patch b/debian/patches/0001-Add-possibility-to-remove-custom.patch
deleted file mode 100644
index fae0c94..0000000
--- a/debian/patches/0001-Add-possibility-to-remove-custom.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Fri, 19 Nov 2010 08:56:40 +0100
-Subject: [PATCH] Add possibility to remove -custom
-
-...and to build in -custom mode (by overriding), in order to be
-arch-independent.
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- Makefile |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b305414..bf1be14 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,11 +12,12 @@ OTHER_XOBJS=unix.cmxa -I `camlp5 -where` gramlib.cmxa
- TARGET=ledit.out
- MKDIR=mkdir -p
- EXT=ext/pa_def.cmo ext/pa_local.cmo
-+CUSTOM=-custom
- 
- all: $(EXT) $(TARGET) ledit.1
- 
- $(TARGET): $(OBJS)
--	$(OCAMLC) -custom $(OTHER_OBJS) $(OBJS) -o $(TARGET)
-+	$(OCAMLC) $(CUSTOM) $(OTHER_OBJS) $(OBJS) -o $(TARGET)
- 
- $(TARGET:.out=.opt): $(OBJS:.cmo=.cmx)
- 	$(OCAMLOPT) $(OTHER_XOBJS) $(OBJS:.cmo=.cmx) -o $(TARGET:.out=.opt)
--- 
diff --git a/debian/patches/0002-Build-a-ledit.cma.patch b/debian/patches/0002-Build-a-ledit.cma.patch
deleted file mode 100644
index 1c4da49..0000000
--- a/debian/patches/0002-Build-a-ledit.cma.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Fri, 19 Nov 2010 08:57:54 +0100
-Subject: [PATCH] Build a ledit.cma
-
-...so that Ledit can be used as a library. Ship also a META file.
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- META.tpl |    6 ++++++
- Makefile |   20 ++++++++++++++++++++
- 2 files changed, 26 insertions(+), 0 deletions(-)
- create mode 100755 META.tpl
-
-diff --git a/META.tpl b/META.tpl
-new file mode 100755
-index 0000000..750dad1
---- /dev/null
-+++ b/META.tpl
-@@ -0,0 +1,6 @@
-+name="ledit"
-+version="LEDIT_VERSION"
-+description="Line editing for interactive commands"
-+requires="unix,camlp5.gramlib"
-+archive(byte)="ledit.cma"
-+archive(native)="ledit.cmxa"
-diff --git a/Makefile b/Makefile
-index bf1be14..60bfad5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,8 +13,11 @@ TARGET=ledit.out
- MKDIR=mkdir -p
- EXT=ext/pa_def.cmo ext/pa_local.cmo
- CUSTOM=-custom
-+LEDIT_LIBDIR=$(shell $(OCAMLC) -where)/ledit
- 
- all: $(EXT) $(TARGET) ledit.1
-+all: ledit.cma
-+opt: ledit.cmxa
- 
- $(TARGET): $(OBJS)
- 	$(OCAMLC) $(CUSTOM) $(OTHER_OBJS) $(OBJS) -o $(TARGET)
-@@ -26,14 +29,31 @@ ledit.1: ledit.1.tpl go.ml
- 	VERSION=`sed -n -e 's/^.* version = "\(.*\)".*$$/\1/p' go.ml`; \
- 	sed s/LEDIT_VERSION/$$VERSION/ ledit.1.tpl > ledit.1
- 
-+ledit.cma: cursor.cmo ledit.cmo
-+	$(OCAMLC) -a -o $@ $^
-+ledit.cmxa: cursor.cmx ledit.cmx
-+	$(OCAMLOPT) -a -o $@ $^
-+
- clean:
- 	/bin/rm -f *.cm[iox] *.pp[oi] *.o ext/*.cm[io] *.bak $(TARGET) ledit.1
-+	rm -f ledit.cma ledit.cmxa *.a
-+	rm -f META
- 
- install:
- 	-$(MKDIR) $(BINDIR) $(MANDIR)
- 	-cp ledit.out $(BINDIR)/ledit
- 	-cp ledit.1 $(MANDIR)/ledit.1
- 
-+install-lib: META
-+	-$(MKDIR) $(LEDIT_LIBDIR)
-+	cp META $(LEDIT_LIBDIR)/
-+	cp ledit.cma ledit.cmi cursor.cmi $(LEDIT_LIBDIR)/
-+	if [ -f ledit.cmxa ] ; then cp ledit.cmxa ledit.a $(LEDIT_LIBDIR)/ ; fi
-+
-+META: META.tpl
-+	VERSION=`sed -n -e 's/^.* version = "\(.*\)".*$$/\1/p' go.ml`; \
-+	sed s/LEDIT_VERSION/$$VERSION/ META.tpl > META
-+
- depend:
- 	> .depend.new
- 	for i in $(OBJS:.cmo=.ml); do \
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f007aef..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Add-possibility-to-remove-custom.patch
-0002-Build-a-ledit.cma.patch

-- 
ledit packaging