From: rich Date: Mon, 22 Nov 2004 17:40:55 +0000 (+0000) Subject: Synched debian/ subdirectory with John Goerzen's arch repo. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=43ea9d6fb51c33d789760326f2233998dd1754ee;p=perl4caml.git Synched debian/ subdirectory with John Goerzen's arch repo. --- diff --git a/Makefile.config b/Makefile.config index 4d70d9e..c309a08 100644 --- a/Makefile.config +++ b/Makefile.config @@ -1,5 +1,5 @@ # perl4caml configuration -*- Makefile -*- -# $Id: Makefile.config,v 1.16 2004-11-03 14:15:18 rich Exp $ +# $Id: Makefile.config,v 1.17 2004-11-22 17:40:55 rich Exp $ # PERLINCDIR # Directory containing the Perl include files, eg. . @@ -32,4 +32,4 @@ EXTRA_CFLAGS := # PACKAGE and VERSION PACKAGE := perl4caml -VERSION := 0.3.11 +VERSION := 0.3.12 diff --git a/debian/changelog b/debian/changelog index adb01b1..2624f10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,26 @@ -perl4caml (0.3.9-4) unstable; urgency=low +perl4caml (0.3.10-1) unstable; urgency=low - * Initial Release. + * New upstream version + * Rebuilt for OCaml 3.08 - -- Richard W.M. Jones Sat, 1 Nov 2003 12:41:34 +0000 + -- John Goerzen Tue, 27 Jul 2004 09:22:40 -0500 + +perl4caml (0.3.7-3) unstable; urgency=low + + * Build perl_c.o with -fPIC. Closes: #237943. + + -- John Goerzen Wed, 21 Apr 2004 12:29:35 -0500 + +perl4caml (0.3.7-2) unstable; urgency=low + + * Hack up the Makefile to not build .cmxa and .opt examples on + architectures that do not have ocamlopt. Closes: #241067. + + -- John Goerzen Tue, 30 Mar 2004 10:38:57 -0600 + +perl4caml (0.3.7-1) unstable; urgency=low + + * Initial Release. Closes: #218507. + + -- John Goerzen Wed, 25 Feb 2004 16:27:12 -0600 diff --git a/debian/control b/debian/control index c822d38..63b6c0d 100644 --- a/debian/control +++ b/debian/control @@ -1,34 +1,44 @@ Source: perl4caml Priority: optional -Maintainer: Richard W.M. Jones -Build-Depends: debhelper (>= 4.0.0), ocaml-findlib, ocaml-3.07, libperl-dev +Maintainer: John Goerzen +Build-Depends: debhelper (>= 4.0.0), libperl-dev, perl-modules, perl-base (>= 5.8), perl (>= 5.8), ocaml-nox (>= 3.08) Standards-Version: 3.6.0 -Package: libperl-ocaml-dev -Section: devel +Package: libperl4caml-ocaml-dev +Section: libdevel Architecture: any -Depends: libperl-ocaml (= ${Source-Version}), ocaml-findlib, ocaml-3.07, - libperl-dev -Description: allows you to use Perl code within Objective CAML (OCaml) +Suggests: libperl4caml-ocaml-doc +Depends: libperl4caml-ocaml (= ${Source-Version}) +Description: Use Perl code in OCaml programs, development files perl4caml allows you to use Perl code within Objective CAML (OCaml), thus neatly side-stepping the old problem with OCaml which was that it lacked a comprehensive set of libraries. Well now you can use any part of CPAN in your OCaml code. . - perl4caml has both a low-level interface to Perl, and it contains - high-level wrappers around some CPAN libraries. - . - This package contains development interfaces, and documentation. + This package provides the tools necessary to use perl4caml in your own + programs. To get the documentation, please install libperl4caml-ocaml-doc. -Package: libperl-ocaml +Package: libperl4caml-ocaml Section: libs Architecture: any -Depends: libperl5.8, ocaml-base-3.07 -Description: allows you to use Perl code within Objective CAML (OCaml) +Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox (>= 3.08) +Description: Use Perl code in OCaml programs, runtime library + perl4caml allows you to use Perl code within Objective CAML (OCaml), + thus neatly side-stepping the old problem with OCaml which was that it + lacked a comprehensive set of libraries. Well now you can use any part + of CPAN in your OCaml code. + . + This package provides the runtime dynamic library necessary to use this + in bytecode OCaml programs. + +Package: libperl4caml-ocaml-doc +Section: doc +Architecture: all +Description: Use Perl code in OCaml programs, documentation perl4caml allows you to use Perl code within Objective CAML (OCaml), thus neatly side-stepping the old problem with OCaml which was that it lacked a comprehensive set of libraries. Well now you can use any part of CPAN in your OCaml code. . - perl4caml has both a low-level interface to Perl, and it contains - high-level wrappers around some CPAN libraries. + This package provides developers' documentation and examples about the + use of perl4caml. diff --git a/debian/copyright b/debian/copyright index 0e2fbf6..a5f3195 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,21 +1,15 @@ -This package was debianized by Richard W.M. Jones on -Sun, 2 Nov 2003 12:41:34 +0000. +This package was debianized by John Goerzen on +Wed, 25 Feb 2004 16:27:12 -0600. -Upstream Author: Richard W.M. Jones +It was downloaded from http://www.merjis.com/developers/perl4caml/ -Copyright: Copyright (C) 2003 Merjis Ltd. +Upstream Author(s): Richard W.M. Jones -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. +Copyright: +Copyright (C) 2003 Merjis Ltd. (http://www.merjis.com/) +perl4caml is distributed under the GNU Library General Public License +perl4caml was mainly written by Richard W.M. Jones +(rich@annexia.org). See file AUTHORS for other contributors. -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this library; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +Debian GNU/Linux users can find the GNU Library General Public License (aka +Lesser General Public License) in /usr/share/common-licenses/LGPL-2. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..e69de29 diff --git a/debian/libperl4caml-ocaml-dev.README.Debian b/debian/libperl4caml-ocaml-dev.README.Debian new file mode 100644 index 0000000..ebe80f7 --- /dev/null +++ b/debian/libperl4caml-ocaml-dev.README.Debian @@ -0,0 +1,13 @@ +Notes for libperl4caml-ocaml-dev +-------------------------------- + +Install libperl4caml-ocaml-doc for documentation and examples. You can find +the examples in /usr/share/doc/libperl4caml-ocaml-doc/examples. To compile +them to bytecode: + +ocamlfind ocamlc -package perl perl4caml.cma parsedate.ml -o parsedate + +Or to native code: + +ocamlfind ocamlopt -package perl perl4caml.cmxa parsedate.ml -o parsedate \ + usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a diff --git a/debian/libperl4caml-ocaml-dev.files b/debian/libperl4caml-ocaml-dev.files new file mode 100644 index 0000000..347c3cf --- /dev/null +++ b/debian/libperl4caml-ocaml-dev.files @@ -0,0 +1 @@ +usr/lib/ocaml/3.08/perl/* diff --git a/debian/libperl4caml-ocaml-doc.doc-base b/debian/libperl4caml-ocaml-doc.doc-base new file mode 100644 index 0000000..d82f16f --- /dev/null +++ b/debian/libperl4caml-ocaml-doc.doc-base @@ -0,0 +1,13 @@ +Document: perl4caml +Title: Reference and info for perl4caml +Author: Richard W.M. Jones +Abstract: API reference and info for the libperl4caml-ocaml-dev system +Section: devel + +Format: HTML +Index: /usr/share/doc/libperl4caml-ocaml-doc/html/index.html +Files: /usr/share/doc/libperl4caml-ocaml-doc/html/*.html + +Format: HTML +Index: /usr/share/doc/libperl4caml-ocaml-doc/writing-a-wrapper.html +Files: /usr/share/doc/libperl4caml-ocaml-doc/writing-a-wrapper.html diff --git a/debian/libperl4caml-ocaml-doc.docs b/debian/libperl4caml-ocaml-doc.docs new file mode 100644 index 0000000..3dc6c94 --- /dev/null +++ b/debian/libperl4caml-ocaml-doc.docs @@ -0,0 +1,4 @@ +README +doc/* +html +AUTHORS diff --git a/debian/libperl4caml-ocaml-doc.examples b/debian/libperl4caml-ocaml-doc.examples new file mode 100644 index 0000000..8baf054 --- /dev/null +++ b/debian/libperl4caml-ocaml-doc.examples @@ -0,0 +1,2 @@ +examples/*.pl +examples/*.ml diff --git a/debian/libperl4caml-ocaml.files b/debian/libperl4caml-ocaml.files new file mode 100644 index 0000000..b2c4705 --- /dev/null +++ b/debian/libperl4caml-ocaml.files @@ -0,0 +1 @@ +usr/lib/ocaml/3.08/stublibs/* diff --git a/debian/rules b/debian/rules index 53017b6..9a1242a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,20 +6,44 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# shared library versions, option 1 +version=2.0.5 +major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + configure: configure-stamp configure-stamp: dh_testdir + # Add here commands to configure the package. + touch configure-stamp + build: build-stamp build-stamp: configure-stamp dh_testdir - if [ -x /usr/bin/ocamlopt ]; then \ - $(MAKE) BUILD_OPT=1; \ - else \ - $(MAKE) BUILD_OPT=0; \ - fi + # Add here commands to compile the package. + $(MAKE) + touch build-stamp clean: @@ -27,7 +51,10 @@ clean: dh_testroot rm -f build-stamp configure-stamp + # Add here commands to clean up after the build process. -$(MAKE) clean + -rm -rf html + dh_clean install: build @@ -36,10 +63,10 @@ install: build dh_clean -k dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/libperl-ocaml + # Add here commands to install the package into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + cd debian/tmp && find . -name ".arch-ids" -exec rm -rf {} \; - # Move the remaining development files across. - dh_movefiles -plibperl-ocaml-dev --sourcedir=debian/libperl-ocaml # Build architecture-independent files here. binary-indep: build install @@ -49,6 +76,7 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot + dh_movefiles -a dh_installchangelogs dh_installdocs dh_installexamples @@ -64,7 +92,8 @@ binary-arch: build install # dh_installinfo dh_installman dh_link -# dh_strip # XXX fails - why? + # dh_strip is broken on this package! + #dh_strip dh_compress dh_fixperms # dh_perl