[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1615 - trunk/debian



Author: branden
Date: 2004-07-10 11:37:31 -0500 (Sat, 10 Jul 2004)
New Revision: 1615

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/control
Log:
Make libxpm-dev rather than xlibs-static-dev provide libxpm4-dev.
Thanks to Daniel Schelper for pointing this out.  (Closes: #256420)


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-07-10 16:35:27 UTC (rev 1614)
+++ trunk/debian/CHANGESETS	2004-07-10 16:37:31 UTC (rev 1615)
@@ -27,4 +27,8 @@
 pointing this out.
     1612
 
+Make libxpm-dev rather than xlibs-static-dev provide libxpm4-dev.
+Thanks to Daniel Schelper for pointing this out.  (Closes: #256420)
+    1615
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-07-10 16:35:27 UTC (rev 1614)
+++ trunk/debian/changelog	2004-07-10 16:37:31 UTC (rev 1615)
@@ -14,8 +14,11 @@
   * Update hyperlink to Debian X FAQ in NEWS file.  Thanks to Calum Mackay for
     pointing this out.
 
- -- Branden Robinson <branden@debian.org>  Sat, 10 Jul 2004 11:29:43 -0500
+  * Make libxpm-dev rather than xlibs-static-dev provide libxpm4-dev.
+    Thanks to Daniel Schelper for pointing this out.  (Closes: #256420)
 
+ -- Branden Robinson <branden@debian.org>  Sat, 10 Jul 2004 11:36:04 -0500
+
 xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
 
   Changes by Branden Robinson:

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2004-07-10 16:35:27 UTC (rev 1614)
+++ trunk/debian/control	2004-07-10 16:37:31 UTC (rev 1615)
@@ -315,6 +315,7 @@
 Depends: libxaw7 (= ${Source-Version}), x-dev, libxmu-dev, libxt-dev, libsm-dev, libice-dev, libxext-dev, libx11-dev, libxpm-dev, libc6-dev | libc-dev
 Conflicts: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev
 Replaces: xlib6g-dev (<< 4.0), libxaw-dev (<< 4.0.3), libxaw6-dev
+Provides: libxpm4-dev
 Description: X Athena widget set library development files
  Xaw header files, a static library, and a manual page documenting new
  features in version 7 of the Athena widget library are provided by this
@@ -1460,7 +1461,7 @@
 Suggests: xspecs
 Conflicts: xdevel, xlib6g-dev (<< 4.0), xlib6g-static, xpm4g-dev, xmanpages, libxfont-xtt-dev
 Replaces: xbase (<< 3.3.2.3a-2), xdevel, xpm4g-dev, xmanpages, xlib6g-dev (<< 4.0), xlib6g-static, libxfont-xtt-dev, xfs-xtt (<< 1:1.3.0.1-15)
-Provides: libxpm4-dev, xmanpages
+Provides: xmanpages
 Description: X Window System client library development files
  xlibs-static-dev provides static versions of the X Window System libraries
  (some of which, but not all, implement extensions to the X protocol) that do



Reply to: