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

[Julien Cristau]

Author: jcristau-guest
Date: 2005-08-30 19:15:28 +0000 (Tue, 30 Aug 2005)
New Revision: 1717

Removed:
   trunk/packages/lablgl/trunk/debian/shlibs.local
Modified:
   trunk/packages/lablgl/trunk/debian/Makefile.config
   trunk/packages/lablgl/trunk/debian/changelog
   trunk/packages/lablgl/trunk/debian/control
Log:
- Completely remove references to libXxf86vm from debian/Makefile.config as well
as debian/control.
- Remove spurious debian/shlibs.local file.
- Document in debian/changelog changes made to debian/control in r1710.


Modified: trunk/packages/lablgl/trunk/debian/Makefile.config
===================================================================
--- trunk/packages/lablgl/trunk/debian/Makefile.config	2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/lablgl/trunk/debian/Makefile.config	2005-08-30 19:15:28 UTC (rev 1717)
@@ -16,7 +16,7 @@
 # Where to find X headers
 XINCLUDES = -I/usr/X11R6/include
 # X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
-XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 -lXxf86vm
+XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11
 
 # Where to find Tcl/Tk headers
 # This must the same version as for LablTk

Modified: trunk/packages/lablgl/trunk/debian/changelog
===================================================================
--- trunk/packages/lablgl/trunk/debian/changelog	2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/lablgl/trunk/debian/changelog	2005-08-30 19:15:28 UTC (rev 1717)
@@ -1,3 +1,11 @@
+lablgl (1.01-7) unstable; urgency=low
+
+  * libXxf86vm is not used by lablgl, so we:
+    + remove libxxf86vm-dev dependency from liblablgl-ocaml-dev.
+    + remove -lXxf86vm from Makefile.config.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Tue, 30 Aug 2005 21:03:36 +0200
+
 lablgl (1.01-6) unstable; urgency=low
 
   * Added a watch file
@@ -4,6 +12,10 @@
   * Added dependency to libglu1-xorg-dev as an alternative to
     xlibmesa-glu-dev.
     (Closes: #319281)
+  * Cleanup Build-depends, with explanations for each of them:
+    replace xlibs-dev with individual library packages, add tcl8.4-dev, remove
+    libncurses5-dev.
+    Also remove libxxf86vm-dev, which is not needed. (Julien Cristau)
   * Upgrade to standards 3.6.2.0 (no change)
 
  -- Sven Luther <luther at debian.org>  Mon, 29 Aug 2005 23:24:14 +0200
@@ -18,7 +30,7 @@
   * changed svn repo structure so that it is compatible with
     svn-buildpackage
 
- -- Stefano Zacchiroli <zack at takhisis.invalid>  Sat, 23 Jul 2005 17:13:43 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 23 Jul 2005 17:13:43 +0200
 
 lablgl (1.01-4) unstable; urgency=medium
 

Modified: trunk/packages/lablgl/trunk/debian/control
===================================================================
--- trunk/packages/lablgl/trunk/debian/control	2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/lablgl/trunk/debian/control	2005-08-30 19:15:28 UTC (rev 1717)
@@ -38,7 +38,7 @@
 Package: liblablgl-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: liblablgl-ocaml (= ${Source-Version}), ocaml-3.08.3, 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, libxxf86vm-dev
+Depends: liblablgl-ocaml (= ${Source-Version}), ocaml-3.08.3, 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
 Conflicts: lablgl, findlib (<< 1.0.2)
 Replaces: lablgl
 Provides: lablgl

Deleted: trunk/packages/lablgl/trunk/debian/shlibs.local
===================================================================
--- trunk/packages/lablgl/trunk/debian/shlibs.local	2005-08-30 18:01:02 UTC (rev 1716)
+++ trunk/packages/lablgl/trunk/debian/shlibs.local	2005-08-30 19:15:28 UTC (rev 1717)
@@ -1,2 +0,0 @@
-libGLU	1	xlibmesa3-glu | xlibmesa3 (<<4.2.1-5) | libglu1
-libGL	1	xlibmesa3-gl | xlibmesa3 (<<4.2.1-5) | libgl1