[Pkg-ocaml-maint-commits] r2112 - trunk/packages/ocamlsdl/trunk/debian

[Samuel Mimram]

Author: smimram-guest
Date: 2005-11-23 20:53:17 +0000 (Wed, 23 Nov 2005)
New Revision: 2112

Removed:
   trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides.in
   trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides.in
Modified:
   trunk/packages/ocamlsdl/trunk/debian/changelog
   trunk/packages/ocamlsdl/trunk/debian/control
   trunk/packages/ocamlsdl/trunk/debian/rules
Log:
Added forgottend dependency on ocaml-findlib.

Modified: trunk/packages/ocamlsdl/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/changelog	2005-11-23 19:01:26 UTC (rev 2111)
+++ trunk/packages/ocamlsdl/trunk/debian/changelog	2005-11-23 20:53:17 UTC (rev 2112)
@@ -1,3 +1,11 @@
+ocamlsdl (0.7.2-4) unstable; urgency=low
+
+  * Added forgotten dependency on ocaml-findlib.
+  * Using chrpath to remove rpaths.
+  * Removed lintian overrides.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 23 Nov 2005 21:22:27 +0100
+
 ocamlsdl (0.7.2-3) unstable; urgency=low
 
   * New maintainer.

Modified: trunk/packages/ocamlsdl/trunk/debian/control
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/control	2005-11-23 19:01:26 UTC (rev 2111)
+++ trunk/packages/ocamlsdl/trunk/debian/control	2005-11-23 20:53:17 UTC (rev 2112)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 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)
+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), ocaml-findlib, chrpath
 Standards-Version: 3.6.2
 
 Package: libsdl-ocaml-dev

Deleted: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides.in
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides.in	2005-11-23 19:01:26 UTC (rev 2111)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml-dev.overrides.in	2005-11-23 20:53:17 UTC (rev 2112)
@@ -1 +0,0 @@
-libsdl-ocaml-dev: binary-or-shlib-defines-rpath ./usr/lib/ocaml/@OCamlABI@/sdl/toplevel /usr/lib

Deleted: trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides.in
===================================================================
--- trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides.in	2005-11-23 19:01:26 UTC (rev 2111)
+++ trunk/packages/ocamlsdl/trunk/debian/libsdl-ocaml.overrides.in	2005-11-23 20:53:17 UTC (rev 2112)
@@ -1,4 +0,0 @@
-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-23 19:01:26 UTC (rev 2111)
+++ trunk/packages/ocamlsdl/trunk/debian/rules	2005-11-23 20:53:17 UTC (rev 2112)
@@ -8,7 +8,7 @@
 #export DH_VERBOSE=1
 
 OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES := $(patsubst %.in,%,$(wildcard 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)
@@ -58,14 +58,8 @@
 
 	mkdir -p $(DESTDIR)
 	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+	chrpath -d $(DESTDIR)/sdl/*.so
 
-	# Install lintian overrides
-	install -m 0644 debian/libsdl-ocaml-dev.overrides \
-		$(OCAMLSDLDEV)/usr/share/lintian/overrides/libsdl-ocaml-dev
-	install -m 0644 debian/libsdl-ocaml.overrides \
-		$(OCAMLSDL)/usr/share/lintian/overrides/libsdl-ocaml
-
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.