[Pkg-ocaml-maint-commits] [SCM] ledit packaging branch, master, updated. debian/2.01-5-5-g718185f

Stephane Glondu steph at glondu.net
Fri Nov 19 08:08:58 UTC 2010 

The following commit has been merged in the master branch:
commit 718185f5758fc46777aa750764af9bb8959b3a98
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Nov 19 09:05:01 2010 +0100

    Switch source package format to 3.0 (quilt)

diff --git a/debian/control b/debian/control
index cb9b493..d556503 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Uploaders:
 Build-Depends:
  debhelper (>> 7.0.0),
  dh-ocaml (>= 0.9~),
- dpatch,
  ocaml-nox,
  camlp5 (>= 5.12)
 Standards-Version: 3.8.4
diff --git a/debian/patches/0001-Don-t-build-in-custom-mode.patch b/debian/patches/0001-Don-t-build-in-custom-mode.patch
new file mode 100644
index 0000000..25cd15e
--- /dev/null
+++ b/debian/patches/0001-Don-t-build-in-custom-mode.patch
@@ -0,0 +1,26 @@
+From: Samuel Mimram <smimram at debian.org>
+Date: Fri, 19 Nov 2010 08:56:40 +0100
+Subject: [PATCH] Don't build in -custom mode
+
+...in order to be arch-independant
+
+Signed-off-by: Samuel Mimram <smimram at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b305414..5ae2dd1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@ EXT=ext/pa_def.cmo ext/pa_local.cmo
+ all: $(EXT) $(TARGET) ledit.1
+ 
+ $(TARGET): $(OBJS)
+-	$(OCAMLC) -custom $(OTHER_OBJS) $(OBJS) -o $(TARGET)
++	$(OCAMLC) $(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/ledit-cma.dpatch b/debian/patches/0002-Build-a-ledit.cma.patch
old mode 100755
new mode 100644
similarity index 62%
rename from debian/patches/ledit-cma.dpatch
rename to debian/patches/0002-Build-a-ledit.cma.patch
index 4583d64..02387ce
--- a/debian/patches/ledit-cma.dpatch
+++ b/debian/patches/0002-Build-a-ledit.cma.patch
@@ -1,14 +1,20 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ledit-cma.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build a ledit.cma, so that Ledit can be used as a library
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Fri, 19 Nov 2010 08:57:54 +0100
+Subject: [PATCH] Build a ledit.cma
 
- at DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2008-06-03 11:29:21.000000000 +0200
-+++ trunk/Makefile	2008-06-03 11:29:36.000000000 +0200
-@@ -14,6 +14,8 @@
+...so that Ledit can be used as a library
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile |   14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5ae2dd1..2edc0b4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,6 +14,8 @@ MKDIR=mkdir -p
  EXT=ext/pa_def.cmo ext/pa_local.cmo
  
  all: $(EXT) $(TARGET) ledit.1
@@ -17,7 +23,7 @@ diff -urNad trunk~/Makefile trunk/Makefile
  
  $(TARGET): $(OBJS)
  	$(OCAMLC) $(OTHER_OBJS) $(OBJS) -o $(TARGET)
-@@ -25,14 +27,26 @@
+@@ -25,14 +27,26 @@ 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
  
@@ -44,3 +50,4 @@ diff -urNad trunk~/Makefile trunk/Makefile
  depend:
  	> .depend.new
  	for i in $(OBJS:.cmo=.ml); do \
+-- 
diff --git a/debian/patches/0003-Ship-a-META-file-for-the-ledit-library.patch b/debian/patches/0003-Ship-a-META-file-for-the-ledit-library.patch
new file mode 100644
index 0000000..60146be
--- /dev/null
+++ b/debian/patches/0003-Ship-a-META-file-for-the-ledit-library.patch
@@ -0,0 +1,34 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Fri, 19 Nov 2010 09:02:16 +0100
+Subject: [PATCH] Ship a META file for the ledit library
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2edc0b4..760d7ab 100644
+--- a/Makefile
++++ b/Makefile
+@@ -35,6 +35,7 @@ ledit.cmxa: cursor.cmx ledit.cmx
+ 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)
+@@ -47,6 +48,10 @@ install-lib: META
+ 	cp ledit.cma ledit.cmi cursor.cmi $(LIBDIR)/
+ 	if [ -f ledit.cmxa ] ; then cp ledit.cmxa ledit.a $(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/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 f53a035..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-no-custom.dpatch
-ledit-cma.dpatch
-META.dpatch
diff --git a/debian/patches/META.dpatch b/debian/patches/META.dpatch
deleted file mode 100755
index 67926fa..0000000
--- a/debian/patches/META.dpatch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## META.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ship a META file for the ledit library
-
- at DPATCH@
-diff -urNad trunk~/META.tpl trunk/META.tpl
---- trunk~/META.tpl	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/META.tpl	2008-06-03 11:40:17.000000000 +0200
-@@ -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 -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2008-06-03 11:40:06.000000000 +0200
-+++ trunk/Makefile	2008-06-03 11:40:06.000000000 +0200
-@@ -35,6 +35,7 @@
- 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)
-@@ -47,6 +48,10 @@
- 	cp ledit.cma ledit.cmi cursor.cmi $(LIBDIR)/
- 	if [ -f ledit.cmxa ] ; then cp ledit.cmxa ledit.a $(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/no-custom.dpatch b/debian/patches/no-custom.dpatch
deleted file mode 100755
index bf50b61..0000000
--- a/debian/patches/no-custom.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't build in -custom mode in order to be arch-independant.
-
- at DPATCH@
-diff -urNad ledit-2.00~/Makefile ledit-2.00/Makefile
---- ledit-2.00~/Makefile	2008-01-23 19:35:34.000000000 +0100
-+++ ledit-2.00/Makefile	2008-01-23 19:36:08.000000000 +0100
-@@ -16,7 +16,7 @@
- all: $(EXT) $(TARGET) ledit.1
- 
- $(TARGET): $(OBJS)
--	$(OCAMLC) -custom $(OTHER_OBJS) $(OBJS) -o $(TARGET)
-+	$(OCAMLC) $(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/series b/debian/patches/series
new file mode 100644
index 0000000..35354a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Don-t-build-in-custom-mode.patch
+0002-Build-a-ledit.cma.patch
+0003-Ship-a-META-file-for-the-ledit-library.patch
diff --git a/debian/rules b/debian/rules
index e4541d8..2523972 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR = $(CURDIR)/debian/ledit
@@ -14,13 +13,13 @@ configure-stamp:
 	touch configure-stamp
 
 build: configure-stamp build-stamp ocamlinit-stamp
-build-stamp: patch-stamp
+build-stamp:
 	dh_testdir
 	$(MAKE)
 	if [ $(OCAML_OPT_ARCH) ]; then $(MAKE) opt; fi
 	touch build-stamp
 
-clean:  unpatch ocamlinit-clean
+clean: ocamlinit-clean
 	dh_testdir
 	dh_testroot
 	$(MAKE) clean
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
ledit packaging

More information about the Pkg-ocaml-maint-commits mailing list