[Pkg-ocaml-maint-commits] r2104 - in trunk/packages/ocamlsdl: .
trunk/debian upstream
Samuel Mimram
smimram-guest at costa.debian.org
Tue Nov 22 22:59:16 UTC 2005
Author: smimram-guest
Date: 2005-11-22 22:59:13 +0000 (Tue, 22 Nov 2005)
New Revision: 2104
Added:
trunk/packages/ocamlsdl/trunk/debian/compat
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs.in
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.install.in
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides.in
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.install.in
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides.in
trunk/packages/ocamlsdl/trunk/debian/svn-deblayout
trunk/packages/ocamlsdl/upstream/
trunk/packages/ocamlsdl/upstream/ocamlsdl_0.7.2.orig.tar.gz
Removed:
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.files
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides
Modified:
trunk/packages/ocamlsdl/trunk/debian/
trunk/packages/ocamlsdl/trunk/debian/changelog
trunk/packages/ocamlsdl/trunk/debian/control
trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.docs
trunk/packages/ocamlsdl/trunk/debian/rules
trunk/packages/ocamlsdl/trunk/debian/watch
Log:
Updated package.
Property changes on: trunk/packages/ocamlsdl/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/packages/ocamlsdl/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/changelog 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/changelog 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1,3 +1,14 @@
+ocamlsdl (0.7.2-3) unstable; urgency=low
+
+ * New maintainer.
+ * Updated package to OCaml 3.09.0.
+ * No longer hardcoding OCaml's ABI in the package.
+ * No longer build-conflicting with ocaml-findlib.
+ * Updated watch file.
+ * Updated standards version to 3.6.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org> Tue, 22 Nov 2005 21:39:25 +0100
+
ocamlsdl (0.7.2-2) unstable; urgency=low
* debian/libsdl-ocaml-dev.doc-base: move documentation from `Devel'
Added: trunk/packages/ocamlsdl/trunk/debian/compat
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/compat 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/compat 2005-11-22 22:59:13 UTC (rev 2104)
@@ -0,0 +1 @@
+4
Modified: trunk/packages/ocamlsdl/trunk/debian/control
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/control 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/control 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1,19 +1,18 @@
Source: ocamlsdl
Section: devel
Priority: optional
-Maintainer: Jerome Marant <jerome at debian.org>
-Build-Depends: debhelper (>> 4.0.0), ocaml-3.08.3, libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, liblablgl-ocaml-dev (>= 1.01-1), dpatch (>= 1.23)
-Build-Conflicts: ocaml-findlib
-Standards-Version: 3.6.1.1
+Maintainer: Samuel Mimram <smimram at debian.org>
+Build-Depends: debhelper (>> 4.0.0), ocaml-nox (>= 3.09.0), libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, liblablgl-ocaml-dev (>= 1.01-1), dpatch (>= 1.23)
+Standards-Version: 3.6.2
Package: libsdl-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-3.08.3, libsdl-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libsdl-ocaml (= ${Source-Version})
Description: OCaml bindings for SDL - development files
SDL (Simple DirectMedia Layer) is a generic API that provides low
level access to audio, keyboard, mouse, and display framebuffer
- across multiple platforms.
+ across multiple platforms.
OCamlSDL is an OCaml interface to SDL that might be used to write
multimedia applications in Objective Caml.
.
@@ -25,11 +24,11 @@
Package: libsdl-ocaml
Section: libs
Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
Description: OCaml bindings for SDL - runtime files
SDL (Simple DirectMedia Layer) is a generic API that provides low
level access to audio, keyboard, mouse, and display framebuffer
- across multiple platforms.
+ across multiple platforms.
OCamlSDL is an OCaml interface to the SDL and might be used to write
multimedia applications in Objective Caml.
.
Deleted: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1,2 +0,0 @@
-usr/share/doc/libsdl-ocaml-dev/html
-usr/share/lintian/overrides
Copied: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs.in (from rev 2097, trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs)
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs 2005-11-22 20:38:29 UTC (rev 2097)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.dirs.in 2005-11-22 22:59:13 UTC (rev 2104)
@@ -0,0 +1,3 @@
+usr/lib/ocaml/@OCamlABI@/sdl
+usr/share/doc/libsdl-ocaml-dev/html
+usr/share/lintian/overrides
Modified: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.docs
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.docs 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.docs 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1 +1,2 @@
+doc/html
README
Added: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.install.in
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.install.in 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.install.in 2005-11-22 22:59:13 UTC (rev 2104)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/@OCamlABI@/sdl/*.a
+usr/lib/ocaml/@OCamlABI@/sdl/*.cm*
+usr/lib/ocaml/@OCamlABI@/sdl/*.ml*
+usr/lib/ocaml/@OCamlABI@/sdl/META
Deleted: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1 +0,0 @@
-libsdl-ocaml-dev: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08.3/sdl/toplevel /usr/lib
Copied: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides.in (from rev 2097, trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides)
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides 2005-11-22 20:38:29 UTC (rev 2097)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides.in 2005-11-22 22:59:13 UTC (rev 2104)
@@ -0,0 +1 @@
+libsdl-ocaml-dev: binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/sdl/toplevel /usr/lib
Deleted: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.files
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.files 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.files 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.08.3/stublibs
Added: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.install.in
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.install.in 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.install.in 2005-11-22 22:59:13 UTC (rev 2104)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/sdl/*.so usr/lib/ocaml/3.09.0/stublibs/
Deleted: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1,5 +0,0 @@
-libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08.3/stublibs/dllsdlstub.so /usr/lib
-libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08.3/stublibs/dllsdlloaderstub.so /usr/lib
-libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08.3/stublibs/dllsdlmixerstub.so /usr/lib
-libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08.3/stublibs/dllsdlttfstub.so /usr/lib
-
Copied: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides.in (from rev 2097, trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides)
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides 2005-11-22 20:38:29 UTC (rev 2097)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides.in 2005-11-22 22:59:13 UTC (rev 2104)
@@ -0,0 +1,4 @@
+libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/stublibs/dllsdlstub.so /usr/lib
+libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/stublibs/dllsdlloaderstub.so /usr/lib
+libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/stublibs/dllsdlmixerstub.so /usr/lib
+libsdl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/stublibs/dllsdlttfstub.so /usr/lib
Modified: trunk/packages/ocamlsdl/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/rules 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/rules 2005-11-22 22:59:13 UTC (rev 2104)
@@ -4,13 +4,11 @@
include /usr/share/dpatch/dpatch.make
-SHELL=/bin/bash
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -24,17 +22,19 @@
INSTALL_PROGRAM += -s
endif
+DESTDIR=$(CURDIR)/debian/tmp/$(shell ocamlc -where)
+
OCAMLSDL=$(CURDIR)/debian/libsdl-ocaml
OCAMLSDLDEV=$(OCAMLSDL)-dev
-OCAMLLIBDIR=$(shell ocamlc -where)
+ocamlinit:
+ for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
-
-build: build-stamp
+build: ocamlinit build-stamp
build-stamp: patch-stamp
dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
$(MAKE)
@@ -43,11 +43,9 @@
clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp
- # Add here commands to clean up after the build process.
-$(MAKE) clean
-
rm -f config.{log,status}
dh_clean
@@ -58,19 +56,13 @@
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/tmp
- DESTDIR=$(OCAMLSDLDEV) $(MAKE) install
+ mkdir -p $(DESTDIR)
+ $(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
- # Install documentation
- install -m 0644 doc/html/*.html $(OCAMLSDLDEV)/usr/share/doc/libsdl-ocaml-dev/html
-
- # Install additional files
- install -m 0644 META $(OCAMLSDLDEV)$(OCAMLLIBDIR)/sdl
-
# Install lintian overrides
- install -m 0644 debian/libsdl-ocaml-dev.overrides\
+ install -m 0644 debian/libsdl-ocaml-dev.overrides \
$(OCAMLSDLDEV)/usr/share/lintian/overrides/libsdl-ocaml-dev
- install -m 0644 debian/libsdl-ocaml.overrides\
+ install -m 0644 debian/libsdl-ocaml.overrides \
$(OCAMLSDL)/usr/share/lintian/overrides/libsdl-ocaml
@@ -82,13 +74,11 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_movefiles -plibsdl-ocaml --sourcedir=debian/libsdl-ocaml-dev
- rm -rf $(OCAMLSDLDEV)$(OCAMLLIBDIR)/stublibs
-
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installdocs
-# dh_installinfo doc/ocamlsdl.info
+ dh_installinfo doc/ocamlsdl.info
dh_installexamples
-# dh_installman
+ dh_installman
dh_installchangelogs NEWS
dh_link
dh_strip
@@ -97,7 +87,7 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
dh_md5sums
dh_builddeb
Added: trunk/packages/ocamlsdl/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/svn-deblayout 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/svn-deblayout 2005-11-22 22:59:13 UTC (rev 2104)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlsdl/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocamlsdl
Modified: trunk/packages/ocamlsdl/trunk/debian/watch
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/watch 2005-11-22 22:48:29 UTC (rev 2103)
+++ trunk/packages/ocamlsdl/trunk/debian/watch 2005-11-22 22:59:13 UTC (rev 2104)
@@ -1,5 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-prdownloads.sourceforge.net /ocamlsdl OCamlSDL-(.*)-src\.tar\.gz debian uupdate
+version=3
+
+http://sf.net/ocamlsdl/ocamlsdl-(.*)\.tar\.gz debian uupdate
Added: trunk/packages/ocamlsdl/upstream/ocamlsdl_0.7.2.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/ocamlsdl/upstream/ocamlsdl_0.7.2.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list