[Pkg-ocaml-maint-commits] r1478 - in trunk/packages/lablgl: . trunk trunk/debian upstream

[Stefano Zacchiroli]

Author: zack
Date: 2005-07-25 16:14:48 +0000 (Mon, 25 Jul 2005)
New Revision: 1478

Added:
   trunk/packages/lablgl/trunk/debian/svn-deblayout
   trunk/packages/lablgl/upstream/
   trunk/packages/lablgl/upstream/lablgl_1.01.orig.tar.gz
Removed:
   trunk/packages/lablgl/trunk/lablgl_1.01.orig.tar.gz
Modified:
   trunk/packages/lablgl/trunk/debian/
   trunk/packages/lablgl/trunk/debian/Makefile.config
   trunk/packages/lablgl/trunk/debian/changelog
   trunk/packages/lablgl/trunk/debian/control
Log:
- fixed FTBFS with X.org
- changed repo structure, now it is svn-buildpackage compliant



Property changes on: trunk/packages/lablgl/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/lablgl/trunk/debian/Makefile.config
===================================================================
--- trunk/packages/lablgl/trunk/debian/Makefile.config	2005-07-21 22:45:59 UTC (rev 1477)
+++ trunk/packages/lablgl/trunk/debian/Makefile.config	2005-07-25 16:14:48 UTC (rev 1478)
@@ -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
+XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 -lXxf86vm
 
 # 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-07-21 22:45:59 UTC (rev 1477)
+++ trunk/packages/lablgl/trunk/debian/changelog	2005-07-25 16:14:48 UTC (rev 1478)
@@ -1,3 +1,15 @@
+lablgl (1.01-5) unstable; urgency=low
+
+  * debian/Makefile.config
+    - added -lXxf86vm to XLIBS, fixes FTBFS with xorg
+  * debian/control
+    - added build-dep on libxxf86vm-dev
+    - added dep from -dev to libxxf86vm-dev
+  * 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
+
 lablgl (1.01-4) unstable; urgency=medium
 
   * Rebuilt against ocaml 3.08.3.

Modified: trunk/packages/lablgl/trunk/debian/control
===================================================================
--- trunk/packages/lablgl/trunk/debian/control	2005-07-21 22:45:59 UTC (rev 1477)
+++ trunk/packages/lablgl/trunk/debian/control	2005-07-25 16:14:48 UTC (rev 1478)
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sven Luther <luther at debian.org>
-Build-Depends: debhelper (>> 3.0.0), ocaml, ocaml-3.08.3, tk8.4-dev, libncurses5-dev, xlibs-dev, xlibmesa-gl-dev|libgl-dev, xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, dpatch, libglut3-dev
+Build-Depends: debhelper (>> 3.0.0), ocaml, ocaml-3.08.3, tk8.4-dev, libncurses5-dev, xlibs-dev, xlibmesa-gl-dev|libgl-dev, xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, dpatch, libglut3-dev, libxxf86vm-dev
 Standards-Version: 3.6.1
 
 Package: liblablgl-ocaml
@@ -21,7 +21,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, xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, tk8.4-dev 
+Depends: liblablgl-ocaml (= ${Source-Version}), ocaml-3.08.3, xlibmesa-gl-dev|xlibmesa-dev(<<4.2.1-5)|libgl-dev, xlibmesa-glu-dev|xlibmesa-dev(<<4.2.1-5)|libglu-dev, tk8.4-dev, libxxf86vm-dev
 Conflicts: lablgl, findlib (<< 1.0.2)
 Replaces: lablgl
 Provides: lablgl

Added: trunk/packages/lablgl/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/lablgl/trunk/debian/svn-deblayout	2005-07-21 22:45:59 UTC (rev 1477)
+++ trunk/packages/lablgl/trunk/debian/svn-deblayout	2005-07-25 16:14:48 UTC (rev 1478)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/lablgl/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/lablgl

Deleted: trunk/packages/lablgl/trunk/lablgl_1.01.orig.tar.gz
===================================================================
(Binary files differ)

Copied: trunk/packages/lablgl/upstream/lablgl_1.01.orig.tar.gz (from rev 1477, trunk/packages/lablgl/trunk/lablgl_1.01.orig.tar.gz)