[Pkg-ocaml-maint-commits] r3233 - in /trunk/packages/ocamlgsl/trunk/debian: changelog compat control control.in libocamlgsl-ocaml-dev.install patches/00list patches/make_bytecode.dpatch rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Thu Oct 12 00:13:01 UTC 2006 

Author: gildor
Date: Thu Oct 12 00:13:00 2006
New Revision: 3233

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3233
Log:
* Move to CDBS,
* New upstream,
-- SLG

Added:
    trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install
Modified:
    trunk/packages/ocamlgsl/trunk/debian/changelog
    trunk/packages/ocamlgsl/trunk/debian/compat
    trunk/packages/ocamlgsl/trunk/debian/control
    trunk/packages/ocamlgsl/trunk/debian/control.in
    trunk/packages/ocamlgsl/trunk/debian/patches/00list
    trunk/packages/ocamlgsl/trunk/debian/patches/make_bytecode.dpatch
    trunk/packages/ocamlgsl/trunk/debian/rules

Modified: trunk/packages/ocamlgsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/changelog?rev=3233&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/changelog (original)
+++ trunk/packages/ocamlgsl/trunk/debian/changelog Thu Oct 12 00:13:00 2006
@@ -1,3 +1,14 @@
+ocamlgsl (0.5.1-1) unstable; urgency=low
+
+  * New upstream version (Closes: #392361),
+  * Use CDBS for debian/rules,
+  * Upgrade debhelper debian/compat to 5,
+  * Real NUM acknowledgement (Closes: #361583, #361635),
+  * Rebuild against ocaml 3.09.2 (Closes: #368773),
+  * Patch cdf_handle_int_arguments.dpatch applied upstream,
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 12 Oct 2006 01:37:11 +0200
+
 ocamlgsl (0.4.0-5) unstable; urgency=low
 
   * Acknowledge NMU (thanks to Samuel Mimram)

Modified: trunk/packages/ocamlgsl/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/compat?rev=3233&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/compat (original)
+++ trunk/packages/ocamlgsl/trunk/debian/compat Thu Oct 12 00:13:00 2006
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/ocamlgsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control?rev=3233&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control Thu Oct 12 00:13:00 2006
@@ -2,14 +2,14 @@
 Section: devel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: ocaml-nox (>= 3.09.2), debhelper (>= 4), dpatch (>=1.11), ocaml-findlib, libgsl0-dev, chrpath, gawk
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2), ocaml-findlib, libgsl0-dev, chrpath, gawk
 Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgsl
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgsl
 
 Package: libocamlgsl-ocaml-dev
 Section: libdevel
 Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${Source-Version}), libgsl0-dev
+Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the
  Objective Caml language.

Modified: trunk/packages/ocamlgsl/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/control.in?rev=3233&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/control.in (original)
+++ trunk/packages/ocamlgsl/trunk/debian/control.in Thu Oct 12 00:13:00 2006
@@ -2,14 +2,14 @@
 Section: devel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: ocaml-nox (>= #OCamlABI#), debhelper (>= 4), dpatch (>=1.11), ocaml-findlib, libgsl0-dev, chrpath, gawk
+Build-Depends: @cdbs@, ocaml-nox (>= 3.09.2), ocaml-findlib, libgsl0-dev, chrpath, gawk
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlgsl
 
 Package: libocamlgsl-ocaml-dev
 Section: libdevel
 Architecture: i386 arm ia64 s390 alpha powerpc m68k mips mipsel amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${Source-Version}), libgsl0-dev
+Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the
  Objective Caml language.

Added: trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install?rev=3233&op=file
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install (added)
+++ trunk/packages/ocamlgsl/trunk/debian/libocamlgsl-ocaml-dev.install Thu Oct 12 00:13:00 2006
@@ -1,0 +1,1 @@
+doc/*   /usr/share/doc/libocamlgsl-ocaml-dev/html

Modified: trunk/packages/ocamlgsl/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/patches/00list?rev=3233&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlgsl/trunk/debian/patches/00list Thu Oct 12 00:13:00 2006
@@ -1,3 +1,2 @@
 make_bytecode
 02_correct_examples
-cdf_handle_int_arguments

Modified: trunk/packages/ocamlgsl/trunk/debian/patches/make_bytecode.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/patches/make_bytecode.dpatch?rev=3233&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/patches/make_bytecode.dpatch (original)
+++ trunk/packages/ocamlgsl/trunk/debian/patches/make_bytecode.dpatch Thu Oct 12 00:13:00 2006
@@ -23,32 +23,33 @@
 exit 0
 
 @DPATCH@
-diff -urNad ocamlgsl-0.3.5/Makefile /tmp/dpep.uLg6Jv/ocamlgsl-0.3.5/Makefile
---- ocamlgsl-0.3.5/Makefile	2004-10-23 15:58:33.000000000 +0200
-+++ /tmp/dpep.uLg6Jv/ocamlgsl-0.3.5/Makefile	2004-12-08 01:06:03.000000000 +0100
-@@ -108,12 +108,18 @@
+diff -urNad ocamlgsl-0.5.1~/Makefile ocamlgsl-0.5.1/Makefile
+--- ocamlgsl-0.5.1~/Makefile	2006-10-05 13:38:14.000000000 +0200
++++ ocamlgsl-0.5.1/Makefile	2006-10-12 01:53:15.000000000 +0200
+@@ -119,13 +119,20 @@
             $(wildcard test/*.ml) $(wildcard ocamlgsl.info*)
- VERSION := 0.3.5
+ VERSION := 0.5.1
  
 -all : stubs gsl.cma gsl.cmxa $(CMI)
 +all-byte: stubs-byte gsl.cma $(CMI)
++ 
++all-opt: all-byte stubs-opt gsl.cmxa $(CMI)
+ 
++all: all-opt
++ 
++stubs-opt: libmlgsl.$(A) 
++stubs-byte:
+ STUBS = libmlgsl.$(A)
 +
-+all-opt: all-byte stubs-opt gsl.cmxa $(CMI)
-+
-+all: all-opt
- 
  ifdef DYNAMIC_LINKING
--stubs : dllmlgsl.$(D) libmlgsl.$(A) 
-+stubs-opt : libmlgsl.$(A) 
+ STUBS += dllmlgsl.$(D)
 +stubs-byte: dllmlgsl.$(D)
- else
--stubs : libmlgsl.$(A)
-+stubs-opt : libmlgsl.$(A)
-+stubs-byte: 
  endif
+-stubs : $(STUBS)
  
  libmlgsl.$(A) : $(SOBJ)
-@@ -136,7 +142,15 @@
+ 	$(call MKLIB,mlgsl,$^)
+@@ -147,7 +154,15 @@
  top : libmlgsl.$(A) gsl.cma
  	ocamlmktop -I . -o ocamlgsl$(EXE) bigarray.cma gsl.cma
  
@@ -63,9 +64,9 @@
 +
 +install-opt: all-opt
  	mkdir -p $(DESTDIR)$(INSTALLDIR)
- 	cp libmlgsl.$(A) dllmlgsl.$(D) gsl.cma gsl.cmxa gsl.$(A) \
+ 	cp $(STUBS) gsl.cma gsl.cmxa gsl.$(A) \
            $(CMI) $(MLOPTOBJ) $(DESTDIR)$(INSTALLDIR)
-@@ -151,6 +165,8 @@
+@@ -162,6 +177,8 @@
          $(OCAMLFIND) install gsl META \
            libmlgsl.$(A) dllmlgsl.$(D) gsl.cma gsl.cmxa gsl.$(A) $(CMI) $(MLOPTOBJ) 
  

Modified: trunk/packages/ocamlgsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlgsl/trunk/debian/rules?rev=3233&op=diff
==============================================================================
--- trunk/packages/ocamlgsl/trunk/debian/rules (original)
+++ trunk/packages/ocamlgsl/trunk/debian/rules Thu Oct 12 00:13:00 2006
@@ -1,70 +1,58 @@
 #!/usr/bin/make -f
+# debian/rules for ocamlgsl package
+# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
-include /usr/share/dpatch/dpatch.make 
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
-OCAMLIBDIR=$(shell ocamlc -where)
-PACKAGE_DEV=libocamlgsl-ocaml-dev
-DESTDIR_DEV=$(CURDIR)/debian/$(PACKAGE_DEV)
-PACKAGE=libocamlgsl-ocaml
-DESTDIR=$(CURDIR)/debian/$(PACKAGE)
-OCAMLABI=$(shell ocamlc -version)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
-debian/control: debian/control.in
-	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+# Taken from ocaml.mk
+OCAMLABI                = $(shell ocamlc -version)
+DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
+OCAML_HAVE_OCAMLOPT    := $(shell if test -x /usr/bin/ocamlopt ; then echo "yes" ; else echo "no" ; fi)
+OCAML_STDLIB_DIR       := $(shell /usr/bin/ocamlc -where)
 
-build: patch-stamp build-stamp
-build-stamp:
-	dh_testdir
-	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
-		$(MAKE) all-opt;\
-	else\
-		$(MAKE) all-byte;\
-	fi
-	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	-$(RM) build-stamp 
-	-$(MAKE) clean
-	dh_clean
+DEB_MAKE_CLEAN_TARGET    := clean
+ifeq ($(OCAML_HAVE_OPT),yes)
+DEB_MAKE_BUILD_TARGET    := all-opt
+DEB_MAKE_INSTALL_TARGET  := install-opt
+else
+DEB_MAKE_BUILD_TARGET    := all-byte
+DEB_MAKE_INSTALL_TARGET  := install-byte
+endif
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	mkdir -p $(DESTDIR)/$(OCAMLIBDIR)/stublibs
-	@if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then\
-		$(MAKE) install-opt DESTDIR="$(DESTDIR_DEV)";\
-	else\
-		$(MAKE) install-byte DESTDIR="$(DESTDIR_DEV)";\
-	fi
-	cp -R doc $(DESTDIR_DEV)/usr/share/doc/$(PACKAGE_DEV)/html
-	$(RM) -r $(DESTDIR_DEV)/$(OCAMLIBDIR)/stublibs
-	mv $(DESTDIR_DEV)/$(OCAMLIBDIR)/gsl/*.so \
-	 $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
+PACKAGE_DEV := libocamlgsl-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+
+PACKAGE := libocamlgsl-ocaml
+DESTDIR := $(CURDIR)/debian/$(PACKAGE)
+
+DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
+
+install/libocamlgsl-ocaml-dev::
 	cp $(CURDIR)/META \
-	 $(DESTDIR_DEV)/$(OCAMLIBDIR)/gsl/META
-	chrpath -d $(DESTDIR)/$(OCAMLIBDIR)/stublibs/*.so
-	  
-binary-indep:
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installchangelogs -a
-	dh_installexamples -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install debian/control
+	 $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/META
+	$(RM) -r $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/stublibs
+	mkdir -p $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs
+	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/*.so \
+	 $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/
+	chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so

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