X Strike Force X.Org X11 SVN commit: r3115 - branches/7.1/lib/libxau/debian
Author: dnusinow
Date: 2006-08-29 19:50:20 -0400 (Tue, 29 Aug 2006)
New Revision: 3115
Modified:
branches/7.1/lib/libxau/debian/changelog
branches/7.1/lib/libxau/debian/control
branches/7.1/lib/libxau/debian/rules
Log:
Merge libxau from trunk so we can cleanly merge it back
Modified: branches/7.1/lib/libxau/debian/changelog
===================================================================
--- branches/7.1/lib/libxau/debian/changelog 2006-08-29 23:16:30 UTC (rev 3114)
+++ branches/7.1/lib/libxau/debian/changelog 2006-08-29 23:50:20 UTC (rev 3115)
@@ -26,6 +26,19 @@
-- David Nusinow <dnusinow@debian.org> Sun, 2 Jul 2006 21:23:08 -0400
+libxau (1:1.0.0-4) unstable; urgency=low
+
+ * Build with LIB_MAN_SUFFIX=3 so that manual pages have a .3 extension
+ insteod of .3x. Closes: #356545, #368165
+ * Bump Standards-Version: 3.7.2, no changes needed.
+ * Clean out Depends fields in debian/control, drop all ${misc:Depends}
+ substitutions, and libxau-dev does not need ${shlibs:Depends} and
+ x11-common (the latter because it Pre-Depends on it).
+ * Lintian wants libxau-dev Pre-Depends: x11-common (>= 1:7.0.0)
+ so bump x11-common version to this value.
+
+ -- Denis Barbier <barbier@debian.org> Mon, 14 Aug 2006 20:10:31 +0200
+
libxau (1:1.0.0-3) unstable; urgency=low
* Reorder makeshlib command in rules file so that ldconfig is run
Modified: branches/7.1/lib/libxau/debian/control
===================================================================
--- branches/7.1/lib/libxau/debian/control 2006-08-29 23:16:30 UTC (rev 3114)
+++ branches/7.1/lib/libxau/debian/control 2006-08-29 23:50:20 UTC (rev 3115)
@@ -8,7 +8,7 @@
Package: libxau6
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Depends: ${shlibs:Depends}, x11-common
Description: X11 authorisation library
This package provides the main interface to the X11 authorisation handling,
which controls authorisation for X connections, both client-side and
@@ -24,7 +24,7 @@
Package: libxau6-dbg
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxau6 (= ${Source-Version})
+Depends: ${shlibs:Depends}, x11-common, libxau6 (= ${Source-Version})
Description: X11 authorisation library (debug package)
This package provides the main interface to the X11 authorisation handling,
which controls authorisation for X connections, both client-side and
@@ -42,7 +42,7 @@
Package: libxau-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxau6 (= ${Source-Version}), x11proto-core-dev
+Depends: ${shlibs:Depends}, libxau6 (= ${Source-Version}), x11proto-core-dev
Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 authorisation library (development headers)
This package provides the main interface to the X11 authorisation handling,
Modified: branches/7.1/lib/libxau/debian/rules
===================================================================
--- branches/7.1/lib/libxau/debian/rules 2006-08-29 23:16:30 UTC (rev 3114)
+++ branches/7.1/lib/libxau/debian/rules 2006-08-29 23:50:20 UTC (rev 3115)
@@ -40,7 +40,7 @@
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)" LIB_MAN_SUFFIX=3
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
touch build-stamp
Reply to: