debian/changelog | 18 ++++++++++++++++++ debian/control | 54 +++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 57 insertions(+), 15 deletions(-)
New commits: commit 8e25388db21c6a730ddce9716b80ae644eca947b Author: Julien Cristau <jcris...@debian.org> Date: Sun Feb 6 23:07:25 2011 +0100 Bump Standards-Version to 3.9.1. diff --git a/debian/changelog b/debian/changelog index 1abad61..5bae434 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libx11 (2:1.4.1-4) UNRELEASED; urgency=low + + * Bump Standards-Version to 3.9.1. + + -- Julien Cristau <jcris...@debian.org> Sun, 06 Feb 2011 23:07:12 +0100 + libx11 (2:1.4.1-3) unstable; urgency=low * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for all your diff --git a/debian/control b/debian/control index dd676b9..dc758b4 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-Depends: ghostscript, netpbm, psutils, -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git commit 8e3d22acb049086214b29ff0ea356cff2827f452 Author: Julien Cristau <jcris...@debian.org> Date: Sun Feb 6 22:42:46 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index b9aece5..1abad61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libx11 (2:1.4.1-3) UNRELEASED; urgency=low +libx11 (2:1.4.1-3) unstable; urgency=low * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for all your work! @@ -6,8 +6,9 @@ libx11 (2:1.4.1-3) UNRELEASED; urgency=low Pre-Depends on x11-common (needed for upgrades from sarge), and Conflicts against pre-XCB libx11-6. * Wrap debian/control Depends fields. + * Upload to unstable. - -- Julien Cristau <jcris...@debian.org> Sun, 06 Feb 2011 22:33:49 +0100 + -- Julien Cristau <jcris...@debian.org> Sun, 06 Feb 2011 22:42:28 +0100 libx11 (2:1.4.1-2) experimental; urgency=low commit 7f5016408f9ea1503aac24daca1cb36a5b1d23fa Author: Julien Cristau <jcris...@debian.org> Date: Sun Feb 6 22:40:43 2011 +0100 Wrap debian/control Depends fields. diff --git a/debian/changelog b/debian/changelog index 7adc1aa..b9aece5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libx11 (2:1.4.1-3) UNRELEASED; urgency=low * Drop Conflicts on sarge-era xlibs-data, Replaces on sarge-era libx11-6, Pre-Depends on x11-common (needed for upgrades from sarge), and Conflicts against pre-XCB libx11-6. + * Wrap debian/control Depends fields. -- Julien Cristau <jcris...@debian.org> Sun, 06 Feb 2011 22:33:49 +0100 diff --git a/debian/control b/debian/control index c46c9cc..dd676b9 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git Package: libx11-6 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-data +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libx11-data, Description: X11 client-side library This package provides a client interface to the X Window System, otherwise known as 'Xlib'. It provides a complete API for the basic functions of the @@ -50,13 +53,16 @@ Package: libx11-6-udeb XC-Package-Type: udeb Section: debian-installer Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: X11 client-side library This is a udeb, or a microdeb, for the debian-installer. Package: libx11-data Architecture: all -Depends: ${misc:Depends} +Depends: + ${misc:Depends}, Breaks: libx11-6 (<< 2:1.4.1) Description: X11 client-side library This package provides the locale data files for libx11. @@ -71,7 +77,10 @@ Package: libx11-6-dbg Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-6 (= ${binary:Version}) +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libx11-6 (= ${binary:Version}), Description: X11 client-side library (debug package) This package provides a client interface to the X Window System, otherwise known as 'Xlib'. It provides a complete API for the basic functions of the @@ -89,7 +98,17 @@ Description: X11 client-side library (debug package) Package: libx11-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-6 (= ${binary:Version}), libxau-dev (>= 1:1.0.0-1), libxdmcp-dev (>= 1:1.0.0-1), x11proto-core-dev (>= 6.8.99.8-1), x11proto-input-dev, x11proto-kb-dev, xtrans-dev, libxcb1-dev +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libx11-6 (= ${binary:Version}), + libxau-dev (>= 1:1.0.0-1), + libxdmcp-dev (>= 1:1.0.0-1), + x11proto-core-dev (>= 6.8.99.8-1), + x11proto-input-dev, + x11proto-kb-dev, + xtrans-dev, + libxcb1-dev, Description: X11 client-side library (development headers) This package provides a client interface to the X Window System, otherwise known as 'Xlib'. It provides a complete API for the basic functions of the @@ -107,7 +126,9 @@ Description: X11 client-side library (development headers) Package: libx11-xcb1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: Xlib/XCB interface library libX11-xcb provides functions needed by clients which take advantage of Xlib/XCB to mix calls to both Xlib and XCB over the same X connection. @@ -125,7 +146,10 @@ Package: libx11-xcb1-dbg Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-xcb1 (= ${binary:Version}) +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libx11-xcb1 (= ${binary:Version}), Description: Xlib/XCB interface library (debug package) libX11-xcb provides functions needed by clients which take advantage of Xlib/XCB to mix calls to both Xlib and XCB over the same X connection. @@ -145,7 +169,12 @@ Description: Xlib/XCB interface library (debug package) Package: libx11-xcb-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-xcb1 (= ${binary:Version}), libxcb1-dev (>= 0.9.92), libx11-dev +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libx11-xcb1 (= ${binary:Version}), + libxcb1-dev (>= 0.9.92), + libx11-dev, Description: Xlib/XCB interface library (development headers) libX11-xcb provides functions needed by clients which take advantage of Xlib/XCB to mix calls to both Xlib and XCB over the same X connection. commit 2f2d92c8aaddcfbab2e6c3d589bf6c39bcef66b8 Author: Julien Cristau <jcris...@debian.org> Date: Sun Feb 6 22:38:13 2011 +0100 Prune obsolete package relationships Drop Conflicts on sarge-era xlibs-data, Replaces on sarge-era libx11-6, Pre-Depends on x11-common (needed for upgrades from sarge), and Conflicts against pre-XCB libx11-6. diff --git a/debian/changelog b/debian/changelog index 6b25ddd..7adc1aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ libx11 (2:1.4.1-3) UNRELEASED; urgency=low * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for all your work! + * Drop Conflicts on sarge-era xlibs-data, Replaces on sarge-era libx11-6, + Pre-Depends on x11-common (needed for upgrades from sarge), and Conflicts + against pre-XCB libx11-6. -- Julien Cristau <jcris...@debian.org> Sun, 06 Feb 2011 22:33:49 +0100 diff --git a/debian/control b/debian/control index 27be0a9..c46c9cc 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,6 @@ Package: libx11-6 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-data -Conflicts: xlibs-data (<< 1:7.0.0) Description: X11 client-side library This package provides a client interface to the X Window System, otherwise known as 'Xlib'. It provides a complete API for the basic functions of the @@ -58,7 +57,6 @@ Description: X11 client-side library Package: libx11-data Architecture: all Depends: ${misc:Depends} -Replaces: libx11-6 (<= 2:1.0.0-1) Breaks: libx11-6 (<< 2:1.4.1) Description: X11 client-side library This package provides the locale data files for libx11. @@ -91,7 +89,6 @@ Description: X11 client-side library (debug package) Package: libx11-dev Section: libdevel Architecture: any -Pre-Depends: x11-common (>= 1:7.0.0) Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-6 (= ${binary:Version}), libxau-dev (>= 1:1.0.0-1), libxdmcp-dev (>= 1:1.0.0-1), x11proto-core-dev (>= 6.8.99.8-1), x11proto-input-dev, x11proto-kb-dev, xtrans-dev, libxcb1-dev Description: X11 client-side library (development headers) This package provides a client interface to the X Window System, otherwise @@ -111,7 +108,6 @@ Package: libx11-xcb1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libx11-6 (<< 2:1.1) Description: Xlib/XCB interface library libX11-xcb provides functions needed by clients which take advantage of Xlib/XCB to mix calls to both Xlib and XCB over the same X connection. @@ -150,7 +146,6 @@ Package: libx11-xcb-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libx11-xcb1 (= ${binary:Version}), libxcb1-dev (>= 0.9.92), libx11-dev -Pre-Depends: x11-common (>= 1:7.0.0) Description: Xlib/XCB interface library (development headers) libX11-xcb provides functions needed by clients which take advantage of Xlib/XCB to mix calls to both Xlib and XCB over the same X connection. commit 65d619a4f9ad8bf45b343da7c9716320841e3f07 Author: Julien Cristau <jcris...@debian.org> Date: Sun Feb 6 22:34:09 2011 +0100 Remove David Nusinow and Brice Goglin from Uploaders. Thanks for all your work! diff --git a/debian/changelog b/debian/changelog index 281edfd..6b25ddd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libx11 (2:1.4.1-3) UNRELEASED; urgency=low + + * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for all your + work! + + -- Julien Cristau <jcris...@debian.org> Sun, 06 Feb 2011 22:33:49 +0100 + libx11 (2:1.4.1-2) experimental; urgency=low * Make libx11-data break earlier versions of libx11-6, since those rely diff --git a/debian/control b/debian/control index ef179a0..27be0a9 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libx11 Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois <k...@debian.org> +Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.15.3), -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pmclv-0006pd...@alioth.debian.org