[Pkg-ocaml-maint-commits] r2190 - trunk/packages/lablgl/trunk/debian

[Julien Cristau]

Author: jcristau-guest
Date: 2005-11-30 18:53:31 +0000 (Wed, 30 Nov 2005)
New Revision: 2190

Removed:
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.override
   trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override.in
Modified:
   trunk/packages/lablgl/trunk/debian/changelog
   trunk/packages/lablgl/trunk/debian/control.in
   trunk/packages/lablgl/trunk/debian/rules
Log:
* Various cleanups and fixes in control
* Removed lintian overrides and delete rpath from stublibs


Modified: trunk/packages/lablgl/trunk/debian/changelog
===================================================================
--- trunk/packages/lablgl/trunk/debian/changelog	2005-11-30 18:45:05 UTC (rev 2189)
+++ trunk/packages/lablgl/trunk/debian/changelog	2005-11-30 18:53:31 UTC (rev 2190)
@@ -1,3 +1,14 @@
+lablgl (1.01-9) unstable; urgency=low
+
+  * Build-dep on chrpath and delete the rpath from the stub libraries.
+  * Drop lintian overrides.
+  * Add myself to Uploaders.
+  * liblablgl-ocaml-dev depends on libxmu-dev (Closes: #336128) and
+    freeglut3-dev (Closes: #295969).
+  * Use freeglut3-dev instead of libglut3-dev in Build-Depends.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Wed, 30 Nov 2005 19:46:16 +0100
+
 lablgl (1.01-8) unstable; urgency=low
 
   * Rebuilt for ocaml 3.09.0.

Modified: trunk/packages/lablgl/trunk/debian/control.in
===================================================================
--- trunk/packages/lablgl/trunk/debian/control.in	2005-11-30 18:45:05 UTC (rev 2189)
+++ trunk/packages/lablgl/trunk/debian/control.in	2005-11-30 18:53:31 UTC (rev 2190)
@@ -2,8 +2,8 @@
 Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Sven Luther <luther at debian.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 3.0.0), ocaml (>= #OcamlABI#), tcl8.4-dev, tk8.4-dev, xlibmesa-gl-dev|libgl-dev, libglu1-xorg-dev|libglu-dev, libglut3-dev, x-dev, libxmu-dev, libx11-dev, dpatch
+Uploaders: Sven Luther <luther at debian.org>, Samuel Mimram <smimram at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>
+Build-Depends: debhelper (>> 3.0.0), ocaml (>= #OcamlABI#), tcl8.4-dev, tk8.4-dev, xlibmesa-gl-dev|libgl-dev, libglu1-xorg-dev|libglu-dev, freeglut3-dev, x-dev, libxmu-dev, libx11-dev, dpatch, chrpath
 Standards-Version: 3.6.2.0
 
 # Reasons for Build-Depends:
@@ -15,7 +15,7 @@
 # libgl-dev: #include <GL/gl.h>
 #            #include <GL/glx.h>
 # libglu-dev: #include <GL/glu.h>
-# libglut3-dev: #include <GL/glut.h>
+# freeglut3-dev: #include <GL/glut.h>
 #               #include <GLUT/*>
 # x-dev: #include <X11/Xatom.h>
 # libxmu-dev: #include <X11/Xmu/StdCmap.h>
@@ -39,7 +39,7 @@
 Package: liblablgl-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: liblablgl-ocaml (= ${Source-Version}), ocaml-${F:OCamlABI}, xlibmesa-gl-dev|xlibmesa-dev(<<4.2.1-5)|libgl-dev, libglu1-xorg-dev|xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, tk8.4-dev
+Depends: liblablgl-ocaml (= ${Source-Version}), ocaml-${F:OCamlABI}, xlibmesa-gl-dev|xlibmesa-dev(<<4.2.1-5)|libgl-dev, libglu1-xorg-dev|xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, tk8.4-dev, libxmu-dev, freeglut3-dev
 Conflicts: lablgl, findlib (<< 1.0.2)
 Replaces: lablgl
 Provides: lablgl

Deleted: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.override
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.override	2005-11-30 18:45:05 UTC (rev 2189)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml-dev.override	2005-11-30 18:53:31 UTC (rev 2190)
@@ -1,2 +0,0 @@
-liblablgl-ocaml-dev: binary-without-manpage lablgl
-liblablgl-ocaml-dev: binary-without-manpage lablglut

Deleted: trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override.in
===================================================================
--- trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override.in	2005-11-30 18:45:05 UTC (rev 2189)
+++ trunk/packages/lablgl/trunk/debian/liblablgl-ocaml.override.in	2005-11-30 18:53:31 UTC (rev 2190)
@@ -1,2 +0,0 @@
-liblablgl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/#OcamlABI#/stublibs/dlllablgl.so /usr/X11R6/lib
-liblablgl-ocaml: binary-or-shlib-defines-rpath ./usr/lib/ocaml/#OcamlABI#/stublibs/dlltogl.so /usr/X11R6/lib

Modified: trunk/packages/lablgl/trunk/debian/rules
===================================================================
--- trunk/packages/lablgl/trunk/debian/rules	2005-11-30 18:45:05 UTC (rev 2189)
+++ trunk/packages/lablgl/trunk/debian/rules	2005-11-30 18:53:31 UTC (rev 2190)
@@ -8,7 +8,7 @@
 
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
-PACKAGE = ocaml
+PACKAGE = lablgl
 
 OCAMLABI = ${shell ocamlc -version}
 
@@ -69,15 +69,12 @@
 		BINDIR=$(CURDIR)/debian/liblablgl-ocaml-dev/usr/bin
 
 	cp debian/META $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_LIBDIR)/lablgl
-	install -m 644 debian/liblablgl-ocaml-dev.override \
-		$(CURDIR)/debian/liblablgl-ocaml-dev/usr/share/lintian/overrides/liblablgl-ocaml-dev
 
-
 	# And now move the liblablgl-ocaml files into their own package.
 	dh_movefiles -pliblablgl-ocaml --sourcedir=debian/liblablgl-ocaml-dev
-	install -m 644 debian/liblablgl-ocaml.override \
-		$(CURDIR)/debian/liblablgl-ocaml/usr/share/lintian/overrides/liblablgl-ocaml
 	ln -sf $(OCAML_LIBDIR)/lablgl $(CURDIR)/debian/liblablgl-ocaml-dev$(OCAML_LIBDIR)/lablGL
+	# ocaml sets an unneeded rpath in the stublibs
+	chrpath -d $(CURDIR)/debian/liblablgl-ocaml$(OCAML_LIBDIR)/stublibs/*.so
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.