[Pkg-ocaml-maint-commits] r5375 - in /trunk/packages/ocaml-magic/trunk/debian: changelog control.in libmagic-ocaml-dev.docs libmagic-ocaml-dev.install.in libmagic-ocaml.install.in patches/ rules
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Sun Mar 23 17:51:21 UTC 2008
Author: toots
Date: Sun Mar 23 17:51:21 2008
New Revision: 5375
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5375
Log:
Updated ocaml-magic to latest release
Added:
trunk/packages/ocaml-magic/trunk/debian/control.in
Removed:
trunk/packages/ocaml-magic/trunk/debian/patches/
Modified:
trunk/packages/ocaml-magic/trunk/debian/changelog
trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.docs
trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.install.in
trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml.install.in
trunk/packages/ocaml-magic/trunk/debian/rules
Modified: trunk/packages/ocaml-magic/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/changelog?rev=5375&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-magic/trunk/debian/changelog Sun Mar 23 17:51:21 2008
@@ -1,3 +1,11 @@
+ocaml-magic (0.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Better build system: patch removed
+ * Switched to cdbs
+
+ -- Romain Beauxis <toots at rastageeks.org> Wed, 19 Mar 2008 11:32:04 +0100
+
ocaml-magic (0.6-3) unstable; urgency=low
* Fixed previous patch when compiling native code module binary.
Added: trunk/packages/ocaml-magic/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/control.in?rev=5375&op=file
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/control.in (added)
+++ trunk/packages/ocaml-magic/trunk/debian/control.in Sun Mar 23 17:51:21 2008
@@ -1,0 +1,31 @@
+Source: ocaml-magic
+Section: devel
+Priority: optional
+Maintainer: Liquidsoap Debian Packaging <savonet-debian at lists.sourceforge.net>
+Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
+Build-Depends: @cdbs@, libmagic-dev
+Standards-Version: 3.7.3
+Homepage: http://sourceforge.net/projects/ocaml-magic/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/
+
+Package: libmagic-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Description: OCaml bindings for the File type determination library
+ Libmagic is a library for classifying files according to magic number tests.
+ This package provides OCaml interface to the C library.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libmagic-ocaml-dev
+Architecture: any
+Section: libdevel
+Depends: ocaml-nox-${F:OCamlABI}, libmagic-dev, libmagic-ocaml (= ${binary:Version})
+Description: OCaml bindings for the File type determination library
+ Libmagic is a library for classifying files according to magic number tests.
+ This package provides OCaml interface to the C library.
+ .
+ This package contains all the development stuff you need to develop
+ OCaml programs which use libmagic.
Modified: trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.docs?rev=5375&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.docs (original)
+++ trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.docs Sun Mar 23 17:51:21 2008
@@ -1,2 +1,2 @@
README
-html
+doc/html
Modified: trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.install.in?rev=5375&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.install.in (original)
+++ trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml-dev.install.in Sun Mar 23 17:51:21 2008
@@ -1,1 +1,1 @@
-META *.a *.cm* usr/lib/ocaml/@OCamlABI@/magic/
+src/META src/*.a src/*.cm* usr/lib/ocaml/@OCamlABI@/magic/
Modified: trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml.install.in?rev=5375&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml.install.in (original)
+++ trunk/packages/ocaml-magic/trunk/debian/libmagic-ocaml.install.in Sun Mar 23 17:51:21 2008
@@ -1,1 +1,1 @@
-dllmagic_stub.so usr/lib/ocaml/@OCamlABI@/stublibs/
+src/dllmagic_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/
Modified: trunk/packages/ocaml-magic/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-magic/trunk/debian/rules?rev=5375&op=diff
==============================================================================
--- trunk/packages/ocaml-magic/trunk/debian/rules (original)
+++ trunk/packages/ocaml-magic/trunk/debian/rules Sun Mar 23 17:51:21 2008
@@ -1,75 +1,16 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+# In order to regenerate 'debian/control' :
+# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+# Then check manually if everything's ok
DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where)
+DEB_MAKE_INSTALL_TARGET := -C src libinstall OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-CFLAGS = "-O2 -g -fPIC"
-
-ocamlinit:
- for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-build: patch ocamlinit build-stamp
-build-stamp:
- dh_testdir
- if [ -x /usr/bin/ocamlopt ]; then\
- $(MAKE) CFLAGS=$(CFLAGS);\
- else\
- $(MAKE) CFLAGS=$(CFLAGS) byte;\
- fi
-
- touch build-stamp
-
-clean: clean-local unpatch
-
-clean-local:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Workaround for dirty clean target..
- chmod -x $(CURDIR)/debian/rules
- [ ! -f Makefile ] || $(MAKE) dist-clean
- chmod +x $(CURDIR)/debian/rules
- rm -rf $(CURDIR)/html
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
+build/libmagic-ocaml-dev::
mkdir -p $(DESTDIR)
-# $(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
- $(MAKE) doc
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install --list-missing
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums
- dh_builddeb
-
-binary-indep:
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+ make doc
More information about the Pkg-ocaml-maint-commits
mailing list