libx11: Changes to 'debian-unstable'
debian/changelog | 11 +++++++++--
debian/control | 14 +++++++++++---
debian/libx11-6-udeb.install | 8 ++++++++
debian/rules | 3 ++-
4 files changed, 30 insertions(+), 6 deletions(-)
New commits:
commit a83a4ebea9d68a5efe06f05b6e24db58c0a16a57
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 01:06:13 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f8230db..113f9a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.3.3-2) UNRELEASED; urgency=low
+libx11 (2:1.3.3-2) unstable; urgency=low
[ Julien Cristau ]
* Update debian/copyright from upstream COPYING.
@@ -14,7 +14,7 @@ libx11 (2:1.3.3-2) UNRELEASED; urgency=low
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
* Add myself to Uploaders.
- -- Julien Cristau <jcristau@debian.org> Sun, 17 Jan 2010 10:09:53 +0000
+ -- Cyril Brulebois <kibi@debian.org> Thu, 11 Mar 2010 01:06:06 +0100
libx11 (2:1.3.3-1) unstable; urgency=low
commit 78bdf340cda8de27796de0165c58bd01165eefb9
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 01:06:02 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 343650d..f8230db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libx11 (2:1.3.3-2) UNRELEASED; urgency=low
* Bump the B-D on libxcb1-dev to ensure libx11-6-udeb gets a dependency
on libxcb1-udeb.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Add myself to Uploaders.
-- Julien Cristau <jcristau@debian.org> Sun, 17 Jan 2010 10:09:53 +0000
diff --git a/debian/control b/debian/control
index adbc6bc..eb654b3 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 <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
dpkg-dev (>= 1.15.3),
commit 67950eda6f42c0ba134647beb8d739cdca2c71f0
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 01:02:09 2010 +0100
Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 9624e98..343650d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libx11 (2:1.3.3-2) UNRELEASED; urgency=low
* Add udeb needed for the graphical installer: libx11-6-udeb.
* Bump the B-D on libxcb1-dev to ensure libx11-6-udeb gets a dependency
on libxcb1-udeb.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcristau@debian.org> Sun, 17 Jan 2010 10:09:53 +0000
diff --git a/debian/control b/debian/control
index c12040d..adbc6bc 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
ghostscript,
netpbm,
psutils,
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git
commit 2d2acdd275da325a7faf8d485c41e54c3ca13f58
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 6 19:14:24 2010 +0000
Bump the B-D on libxcb1-dev to ensure libx11-6-udeb gets a dependency on libxcb1-udeb.
diff --git a/debian/changelog b/debian/changelog
index 71aa7d5..9624e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libx11 (2:1.3.3-2) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add udeb needed for the graphical installer: libx11-6-udeb.
+ * Bump the B-D on libxcb1-dev to ensure libx11-6-udeb gets a dependency
+ on libxcb1-udeb.
-- Julien Cristau <jcristau@debian.org> Sun, 17 Jan 2010 10:09:53 +0000
diff --git a/debian/control b/debian/control
index 6185ed0..c12040d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
x11proto-input-dev,
x11proto-xext-dev,
x11proto-xf86bigfont-dev,
- libxcb1-dev (>= 1.1.92),
+ libxcb1-dev (>= 1.5-3),
quilt,
automake,
libtool,
commit 2f4065acd7c1569455d5f79b66b20f922aa6c356
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 6 18:43:41 2010 +0000
Add udeb needed for the graphical installer: libx11-6-udeb.
TODO: libx11-6-udeb.install could be trimmed down.
diff --git a/debian/changelog b/debian/changelog
index f46844b..71aa7d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ libx11 (2:1.3.3-2) UNRELEASED; urgency=low
[ Brice Goglin ]
* Remove Jamey Sharp and Josh Triplett from Uploaders, closes: #568274.
+ [ Cyril Brulebois ]
+ * Add udeb needed for the graphical installer: libx11-6-udeb.
+
-- Julien Cristau <jcristau@debian.org> Sun, 17 Jan 2010 10:09:53 +0000
libx11 (2:1.3.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 73d6f3e..6185ed0 100644
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,14 @@ Description: X11 client-side library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libX11
+Package: libx11-6-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+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}
diff --git a/debian/libx11-6-udeb.install b/debian/libx11-6-udeb.install
new file mode 100644
index 0000000..987ba4d
--- /dev/null
+++ b/debian/libx11-6-udeb.install
@@ -0,0 +1,8 @@
+# from libx11-6:
+usr/lib/libX11.so.6*
+
+# from libx11-data:
+usr/share/X11/locale
+usr/share/X11/XErrorDB
+usr/share/X11/XKeysymDB
+usr/share/man/man5
diff --git a/debian/rules b/debian/rules
index cfa5502..14af03c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,8 @@ binary-arch: build install
dh_strip -Nlibx11-6 -Nlibx11-xcb1
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -s -- -c4
+ dh_makeshlibs -s -plibx11-6 --add-udeb=libx11-6-udeb -- -c4
+ dh_makeshlibs -s -Nlibx11-6 -- -c4
dh_shlibdeps -s
dh_installdeb -s
dh_gencontrol -s
Reply to: