r15806 - in /packages/unstable/libcm/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Sat May  3 10:30:37 2008
New Revision: 15806

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15806
Log:
Allow libgl-dev and libglu-dev as alternative dependencies for 
libcm-dev. Closes: #478887.

Modified:
    packages/unstable/libcm/debian/changelog
    packages/unstable/libcm/debian/control
    packages/unstable/libcm/debian/control.in

Modified: packages/unstable/libcm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcm/debian/changelog?rev=15806&op=diff
==============================================================================
--- packages/unstable/libcm/debian/changelog (original)
+++ packages/unstable/libcm/debian/changelog Sat May  3 10:30:37 2008
@@ -1,3 +1,10 @@
+libcm (0.1.1-4) UNRELEASED; urgency=low
+
+  * Allow libgl-dev and libglu-dev as alternative dependencies for 
+    libcm-dev. Closes: #478887.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 03 May 2008 12:29:55 +0200
+
 libcm (0.1.1-3) unstable; urgency=low
 
   [ Kilian Krause ]

Modified: packages/unstable/libcm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcm/debian/control?rev=15806&op=diff
==============================================================================
--- packages/unstable/libcm/debian/control (original)
+++ packages/unstable/libcm/debian/control Sat May  3 10:30:37 2008
@@ -1,7 +1,7 @@
 Source: libcm
 Priority: optional
 Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Kilian Krause <kilian at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: debhelper (>= 5),
                autotools-dev,
                libglib2.0-dev,
@@ -41,8 +41,8 @@
          libxcomposite-dev,
          libxdamage-dev,
          libxtst-dev,
-         libgl1-mesa-dev,
-         libglu1-mesa-dev,
+         libgl1-mesa-dev | libgl-dev,
+         libglu1-mesa-dev | libglu-dev,
          libxext-dev
 Description: Support code for compositing managers - development files
  Compositing managers such as xcompmgr and compiz allow X clients to render

Modified: packages/unstable/libcm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcm/debian/control.in?rev=15806&op=diff
==============================================================================
--- packages/unstable/libcm/debian/control.in (original)
+++ packages/unstable/libcm/debian/control.in Sat May  3 10:30:37 2008
@@ -41,8 +41,8 @@
          libxcomposite-dev,
          libxdamage-dev,
          libxtst-dev,
-         libgl1-mesa-dev,
-         libglu1-mesa-dev,
+         libgl1-mesa-dev | libgl-dev,
+         libglu1-mesa-dev | libglu-dev,
          libxext-dev
 Description: Support code for compositing managers - development files
  Compositing managers such as xcompmgr and compiz allow X clients to render