[Pkg-ocaml-maint-commits] r5731 - in /trunk/packages/ledit/trunk/debian: changelog control patches/00list patches/META.dpatch patches/ledit-cma.dpatch rules
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Tue Jun 3 09:32:37 UTC 2008
Author: zack
Date: Tue Jun 3 09:32:37 2008
New Revision: 5731
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5731
Log:
split a new libledit-ocaml-dev binary package, shipping Ledit as a
library to build interactive programs with line editing capabilities
Added:
trunk/packages/ledit/trunk/debian/patches/META.dpatch (with props)
trunk/packages/ledit/trunk/debian/patches/ledit-cma.dpatch (with props)
Modified:
trunk/packages/ledit/trunk/debian/changelog
trunk/packages/ledit/trunk/debian/control
trunk/packages/ledit/trunk/debian/patches/00list
trunk/packages/ledit/trunk/debian/rules
Modified: trunk/packages/ledit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/changelog?rev=5731&op=diff
==============================================================================
--- trunk/packages/ledit/trunk/debian/changelog (original)
+++ trunk/packages/ledit/trunk/debian/changelog Tue Jun 3 09:32:37 2008
@@ -1,3 +1,10 @@
+ledit (2.00-4) UNRELEASED; urgency=low
+
+ * split a new libledit-ocaml-dev binary package, shipping Ledit as a
+ library to build interactive programs with line editing capabilities
+
+ -- Stefano Zacchiroli <zack at debian.org> Tue, 03 Jun 2008 11:30:30 +0200
+
ledit (2.00-3) unstable; urgency=low
* Rebuild against OCaml 3.10.2
Modified: trunk/packages/ledit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/control?rev=5731&op=diff
==============================================================================
--- trunk/packages/ledit/trunk/debian/control (original)
+++ trunk/packages/ledit/trunk/debian/control Tue Jun 3 09:32:37 2008
@@ -16,3 +16,17 @@
Ledit is a line editor, allowing to use control commands like in emacs
or in shells (bash, tcsh). To be used with interactive commands. It is
written in OCaml and Camlp4 and uses the library unix.cma.
+
+Package: libledit-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
+ ${misc:Depends}
+Description: OCaml line editor library
+ Ledit is a line editor, allowing to use control commands like in emacs
+ or in shells (bash, tcsh). To be used with interactive commands. It is
+ written in OCaml and Camlp4 and uses the library unix.cma.
+ .
+ This package ships Ledit as a development library, so that you can use
+ it to build interactive programs with line editing capabilities.
+
Modified: trunk/packages/ledit/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/patches/00list?rev=5731&op=diff
==============================================================================
--- trunk/packages/ledit/trunk/debian/patches/00list (original)
+++ trunk/packages/ledit/trunk/debian/patches/00list Tue Jun 3 09:32:37 2008
@@ -1,1 +1,3 @@
no-custom.dpatch
+ledit-cma.dpatch
+META.dpatch
Added: trunk/packages/ledit/trunk/debian/patches/META.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/patches/META.dpatch?rev=5731&op=file
==============================================================================
--- trunk/packages/ledit/trunk/debian/patches/META.dpatch (added)
+++ trunk/packages/ledit/trunk/debian/patches/META.dpatch Tue Jun 3 09:32:37 2008
@@ -1,0 +1,39 @@
+#! /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~/Makefile trunk/Makefile
+--- trunk~/Makefile 2008-06-03 11:08:43.000000000 +0200
++++ trunk/Makefile 2008-06-03 11:10:02.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)/
+ test -f ledit.cmxa && cp ledit.cmxa ledit.a $(LIBDIR)/
+
++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 -urNad trunk~/trunk/META.tpl trunk/trunk/META.tpl
+--- trunk~/META.tpl 1970-01-01 01:00:00.000000000 +0100
++++ trunk/META.tpl 2008-06-03 11:09:05.000000000 +0200
+@@ -0,0 +1,6 @@
++name="ledit"
++version="LEDIT_VERSION"
++description="Line editing for interactive commands"
++requires="unix"
++archive(byte)="ledit.cma"
++archive(native)="ledit.cmxa"
Propchange: trunk/packages/ledit/trunk/debian/patches/META.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/packages/ledit/trunk/debian/patches/ledit-cma.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/patches/ledit-cma.dpatch?rev=5731&op=file
==============================================================================
--- trunk/packages/ledit/trunk/debian/patches/ledit-cma.dpatch (added)
+++ trunk/packages/ledit/trunk/debian/patches/ledit-cma.dpatch Tue Jun 3 09:32:37 2008
@@ -1,0 +1,46 @@
+#! /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
+
+ 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 @@
+ EXT=ext/pa_def.cmo ext/pa_local.cmo
+
+ all: $(EXT) $(TARGET) ledit.1
++all: ledit.cma
++opt: ledit.cmxa
+
+ $(TARGET): $(OBJS)
+ $(OCAMLC) $(OTHER_OBJS) $(OBJS) -o $(TARGET)
+@@ -25,14 +27,26 @@
+ 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
+
+ install:
+ -$(MKDIR) $(BINDIR) $(MANDIR)
+ -cp ledit.out $(BINDIR)/ledit
+ -cp ledit.1 $(MANDIR)/ledit.1
+
++install-lib: META
++ -$(MKDIR) $(LIBDIR)
++ cp META $(LIBDIR)/
++ cp ledit.cma ledit.cmi cursor.cmi $(LIBDIR)/
++ if [ -f ledit.cmxa ] ; then cp ledit.cmxa ledit.a $(LIBDIR)/ ; fi
++
+ depend:
+ > .depend.new
+ for i in $(OBJS:.cmo=.ml); do \
Propchange: trunk/packages/ledit/trunk/debian/patches/ledit-cma.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/ledit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ledit/trunk/debian/rules?rev=5731&op=diff
==============================================================================
--- trunk/packages/ledit/trunk/debian/rules (original)
+++ trunk/packages/ledit/trunk/debian/rules Tue Jun 3 09:32:37 2008
@@ -1,20 +1,15 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# We want to use dpatch.
include /usr/share/dpatch/dpatch.make
-#PACKAGE = ledit
-#VERSION = 1.11
DESTDIR=$(CURDIR)/debian/ledit
+LEDIT_LIBDIR = $(CURDIR)/debian/libledit-ocaml-dev/$(OCAML_STDLIB_DIR)/ledit
-OCAMLABI = $(shell ocamlc -version)
+OCAMLABI := $(shell ocamlc -version)
OFILES = $(patsubst %.in,%,$(shell ls debian/*.in))
+OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
ocamlinit:
for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
@@ -22,58 +17,75 @@
configure: configure-stamp
configure-stamp:
dh_testdir
-
for t in `find . -name \*.in | grep -v debian/control.in`; do \
sed -e 's%#OcamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
done
-
touch configure-stamp
build: configure-stamp build-stamp
build-stamp: patch-stamp
dh_testdir
$(MAKE)
+ if [ -x /usr/bin/ocamlopt ] ; then $(MAKE) opt ; fi
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-
$(MAKE) clean
-
dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
+install-indep: build
+ dh_testdir -i
+ dh_testroot -i
+ dh_clean -k -i
+ dh_installdirs -i
$(MAKE) install BINDIR=$(DESTDIR)/usr/bin MANDIR=$(DESTDIR)/usr/share/man/man1
-cp debian/lintian.overrides $(CURDIR)/debian/ledit/usr/share/lintian/overrides/ledit
+install-arch: build
+ dh_testdir -s
+ dh_testroot -s
+ dh_clean -k -s
+ dh_installdirs -s
+ mkdir -p $(LEDIT_LIBDIR)
+ $(MAKE) install-lib LIBDIR=$(LEDIT_LIBDIR)
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman ledit.1
- dh_installinfo
- dh_installchangelogs CHANGES
- dh_link
- dh_strip -X ledit
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums
- dh_builddeb
+binary-indep: build install-indep
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installman -i ledit.1
+ dh_installinfo -i
+ dh_installchangelogs -i CHANGES
+ dh_link -i
+ dh_strip -X ledit -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_md5sums -i
+ dh_builddeb -i
-binary: binary-indep
+binary-arch: build install-arch
+ dh_testdir -s
+ dh_testroot -s
+ dh_installdocs -s
+ dh_installexamples -s
+ dh_installinfo -s
+ dh_installchangelogs -s CHANGES
+ dh_link -s
+ dh_strip -s
+ dh_compress -s
+ dh_fixperms -s
+ dh_installdeb -s
+ dh_shlibdeps -s
+ dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
+ dh_md5sums -s
+ dh_builddeb -s
+
+binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary install configure
More information about the Pkg-ocaml-maint-commits
mailing list