X Strike Force X.Org X11 SVN commit: r1303 - in branches/modular/lib/libX11-X11R7.0-1.0.0/debian: . patches
Author: dnusinow
Date: 2006-02-23 23:16:32 -0500 (Thu, 23 Feb 2006)
New Revision: 1303
Added:
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.install.in
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.preinst.in
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/001_no_xkb_in_pc_file.diff
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/series
Removed:
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.install
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.preinst
Modified:
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control
branches/modular/lib/libX11-X11R7.0-1.0.0/debian/rules
Log:
* Add a bunch of depends to libx11-dev from the monolith. Thanks Eugene
Konev for the pointer.
* Add 001_no_xkb_in_pc_file.diff because we don't need x11proto-input-dev.
Thanks Eugene Konev.
Modified: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog 2006-02-24 04:08:36 UTC (rev 1302)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/changelog 2006-02-24 04:16:32 UTC (rev 1303)
@@ -4,12 +4,14 @@
E. Hull.
* Provide versioned build-depends on the X libs. Thanks Kurt Roeckx.
(closes: #354161)
- * Provide libx11-dev dependencies on x11proto-input-core and libxdmcp-dev.
+ * Provide libx11-dev dependencies on libxdmcp-dev.
Thanks Kurt Roeckx. (closes: #354167)
* Add a bunch of depends to libx11-dev from the monolith. Thanks Eugene
Konev for the pointer.
+ * Add 001_no_xkb_in_pc_file.diff because we don't need x11proto-input-dev.
+ Thanks Eugene Konev.
- -- David Nusinow <dnusinow@debian.org> Thu, 23 Feb 2006 23:07:54 -0500
+ -- David Nusinow <dnusinow@debian.org> Thu, 23 Feb 2006 23:13:03 -0500
libx11 (2:1.0.0-1) experimental; urgency=low
Modified: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control 2006-02-24 04:08:36 UTC (rev 1302)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/control 2006-02-24 04:16:32 UTC (rev 1303)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xtrans-dev, x11proto-bigreqs-dev, x11proto-core-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, libxdmcp-dev (>= 1:1.0.0-1), libxau-dev (>= 1:1.0.0-1), x11proto-xcmisc-dev
+Build-Depends: debhelper (>= 4.0.0), pkg-config, xtrans-dev, x11proto-bigreqs-dev, x11proto-core-dev, x11proto-kb-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, libxdmcp-dev (>= 1:1.0.0-1), libxau-dev (>= 1:1.0.0-1), x11proto-xcmisc-dev
Standards-Version: 3.6.1.0
Package: libx11-6
@@ -43,7 +43,7 @@
Package: libx11-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libx11-6 (= ${Source-Version}), libdmcp-dev (>= 1:1.0.0-1), libxext-dev (>= 1:1.0.0-1), libxi-dev (>= 1:1.0.0-1), libxkbfile-dev (>= 1:1.0.0.1-1), x11proto-core-dev (>= 6.8.99.8-1), x11proto-input-dev, x11proto-kb-dev, xtrans-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libx11-6 (= ${Source-Version}), libxau-dev (>= 1:1.0.0-1), libdmcp-dev (>= 1:1.0.0-1), libxext-dev (>= 1:1.0.0-1), libxi-dev (>= 1:1.0.0-1), libxkbfile-dev (>= 1:1.0.0.1-1), x11proto-core-dev (>= 6.8.99.8-1), x11proto-kb-dev, xtrans-dev
Pre-Depends: x11-common (>= 1.0)
Description: X11 client-side library (development headers)
This package provides the main client interface to the X Window System, and is
Deleted: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.install
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.install 2006-02-24 04:08:36 UTC (rev 1302)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.install 2006-02-24 04:16:32 UTC (rev 1303)
@@ -1,5 +0,0 @@
-usr/lib/X11/locale/*
-usr/share/X11/locale/*
-usr/lib/libX11.so.6*
-usr/share/X11/XErrorDB
-usr/share/X11/XKeysymDB
Copied: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.install.in (from rev 1287, branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.install)
Deleted: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.preinst
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.preinst 2006-02-24 04:08:36 UTC (rev 1302)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.preinst 2006-02-24 04:16:32 UTC (rev 1303)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- upgrade)
- if dpkg --compare-versions "$2" le-nl "1:6.2.1+cvs.20050711-1"; then
- if test -L /usr/lib/X11/locale && \
- test "$(readlink /usr/lib/X11/locale)" = "../../share/X11/locale"; then
- echo "Removing /usr/lib/X11/locale symlink."
- rm /usr/lib/X11/locale
- mkdir /usr/lib/X11/locale
- fi
- fi
- ;;
-esac
Copied: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.preinst.in (from rev 1287, branches/modular/lib/libX11-X11R7.0-1.0.0/debian/libx11-6.preinst)
Added: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/001_no_xkb_in_pc_file.diff
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/001_no_xkb_in_pc_file.diff 2006-02-24 04:08:36 UTC (rev 1302)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/001_no_xkb_in_pc_file.diff 2006-02-24 04:16:32 UTC (rev 1303)
@@ -0,0 +1,13 @@
+Index: libX11-X11R7.0-1.0.0/x11.pc.in
+===================================================================
+--- libX11-X11R7.0-1.0.0.orig/x11.pc.in 2005-12-30 14:49:58.000000000 -0500
++++ libX11-X11R7.0-1.0.0/x11.pc.in 2006-02-23 23:12:49.000000000 -0500
+@@ -8,7 +8,7 @@
+ Name: X11
+ Description: X Library
+ Version: @PACKAGE_VERSION@
+-Requires: xproto @XKBPROTO_REQUIRES@
++Requires: xproto
+ Requires.private: xau xdmcp
+ Cflags: -I${includedir} @XTHREAD_CFLAGS@
+ Libs: -L${libdir} -lX11
Added: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/series
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/series 2006-02-24 04:08:36 UTC (rev 1302)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/patches/series 2006-02-24 04:16:32 UTC (rev 1303)
@@ -0,0 +1 @@
+001_no_xkb_in_pc_file.diff
Modified: branches/modular/lib/libX11-X11R7.0-1.0.0/debian/rules
===================================================================
--- branches/modular/lib/libX11-X11R7.0-1.0.0/debian/rules 2006-02-24 04:08:36 UTC (rev 1302)
+++ branches/modular/lib/libX11-X11R7.0-1.0.0/debian/rules 2006-02-24 04:16:32 UTC (rev 1303)
@@ -36,7 +36,7 @@
# so very wrong
CFLAGS += -DLIBXCURSOR=\\\"libXcursor.so.1\\\"
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -49,7 +49,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: