libxcursor: Changes to 'debian-unstable'
debian/changelog | 16 ++++++++++++++--
debian/control | 36 ++++++++++++++++++++++++++++--------
debian/libxcursor1-udeb.install | 1 +
debian/rules | 2 +-
4 files changed, 44 insertions(+), 11 deletions(-)
New commits:
commit 4b9e7285c4666d9c4c4e015a733373907bdcb497
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 05:05:55 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 6048a94..be64adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxcursor (1:1.1.10-2) UNRELEASED; urgency=low
+libxcursor (1:1.1.10-2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -16,7 +16,7 @@ libxcursor (1:1.1.10-2) UNRELEASED; urgency=low
* Add myself to Uploaders.
* Add ${misc:Depends} to non-udeb binaries, and wrap Depends.
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:44 +0000
+ -- Cyril Brulebois <kibi@debian.org> Thu, 11 Mar 2010 05:05:33 +0100
libxcursor (1:1.1.10-1) unstable; urgency=low
commit 2bc54e22de9fb62dce0b7d84b907c35206933471
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 05:05:10 2010 +0100
Add ${misc:Depends} to non-udeb binaries, and wrap Depends.
diff --git a/debian/changelog b/debian/changelog
index c68aeb1..6048a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ libxcursor (1:1.1.10-2) UNRELEASED; urgency=low
- libxrender-dev
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
* Add myself to Uploaders.
+ * Add ${misc:Depends} to non-udeb binaries, and wrap Depends.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:44 +0000
diff --git a/debian/control b/debian/control
index 6ff4905..e991968 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcursor.git
Package: libxcursor1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
Description: X cursor management library
Xcursor is a simple library designed to help locate and load cursors for the
X Window System. Cursors can be loaded from files or memory and can exist in
@@ -35,7 +37,8 @@ Package: libxcursor1-udeb
XC-Package-Type: udeb
Section: debian-installer
Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${shlibs:Depends},
Description: X cursor management library
This is a udeb, or a microdeb, for the debian-installer.
@@ -43,7 +46,10 @@ Package: libxcursor1-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libxcursor1 (= ${binary:Version}), ${shlibs:Depends}
+Depends:
+ libxcursor1 (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
Description: X cursor management library (unstripped)
This package provides an unstripped shared object with debugging symbols,
useful to provide a backtrace with symbol names in a debugger; this
@@ -59,7 +65,13 @@ Description: X cursor management library (unstripped)
Package: libxcursor-dev
Section: libdevel
Architecture: any
-Depends: libxcursor1 (= ${binary:Version}), x11proto-core-dev, libx11-dev, libxrender-dev, libxfixes-dev
+Depends:
+ libxcursor1 (= ${binary:Version}),
+ x11proto-core-dev,
+ libx11-dev,
+ libxrender-dev,
+ libxfixes-dev,
+ ${misc:Depends},
Description: X cursor management library (development files)
Header files and a static version of the X cursor management library are
provided by this package.
commit acaef7da538414430ecc5f0b00f75bd7d30b7c8f
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 05:02:53 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 0cbab38..c68aeb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxcursor (1:1.1.10-2) UNRELEASED; urgency=low
- libxfixes-dev
- libxrender-dev
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+ * Add myself to Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:44 +0000
diff --git a/debian/control b/debian/control
index fdd6524..6ff4905 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxcursor
Section: devel
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
x11proto-core-dev (>= 6.2.1+cvs.20050722),
commit dd7c79f8ab6b6bd56924664bb2c1cffd84241624
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Mar 11 05:02:20 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 bd249b3..0cbab38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libxcursor (1:1.1.10-2) UNRELEASED; urgency=low
- libx11-dev
- libxfixes-dev
- libxrender-dev
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:44 +0000
diff --git a/debian/control b/debian/control
index ff63100..fdd6524 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.4+4)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcursor
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcursor.git
commit 5e9da15ded72194cb4b074f99e40a9ff3501175f
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 26 07:22:49 2010 +0100
Use XC-Package-Type to save some memory.
diff --git a/debian/control b/debian/control
index acb9626..ff63100 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Description: X cursor management library
the core X protocol CreateCursor request.
Package: libxcursor1-udeb
-Package-Type: udeb
+XC-Package-Type: udeb
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}
commit 6f4c4180b7df4abd6853e102ddd63f63f6f11c7c
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Feb 7 00:40:53 2010 +0000
Version/Bump some B-D to make sure the udeb gets its dependencies on udebs.
diff --git a/debian/changelog b/debian/changelog
index 9301c4b..bd249b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ libxcursor (1:1.1.10-2) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add udeb needed for the graphical installer: libxcursor1-udeb.
+ * Version/Bump some B-D to make sure the udeb gets its dependencies on
+ the (recently-added) udebs rather than on the libraries:
+ - libx11-dev
+ - libxfixes-dev
+ - libxrender-dev
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:44 +0000
diff --git a/debian/control b/debian/control
index 7ac0f6f..acb9626 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.or
Build-Depends:
debhelper (>= 5.0.0),
x11proto-core-dev (>= 6.2.1+cvs.20050722),
- libx11-dev (>= 1:6.2.1+cvs.20050722),
- libxrender-dev (>= 1:0.9.0),
- libxfixes-dev (>= 1:3.0.0-2),
+ libx11-dev (>= 2:1.3.3-2),
+ libxrender-dev (>= 1:0.9.5-2),
+ libxfixes-dev (>= 1:4.0.4-2),
pkg-config,
quilt,
automake,
commit 9e991207670cfe6083bf0436d8519648b5efd449
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Feb 7 00:38:03 2010 +0000
Add udeb needed for the graphical installer: libxcursor1-udeb.
diff --git a/debian/changelog b/debian/changelog
index 88008ae..9301c4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
libxcursor (1:1.1.10-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ [ Cyril Brulebois ]
+ * Add udeb needed for the graphical installer: libxcursor1-udeb.
+
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:44 +0000
libxcursor (1:1.1.10-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 21fbbd0..7ac0f6f 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,14 @@ Description: X cursor management library
not supported, Xcursor maps the cursor image to a standard X cursor and uses
the core X protocol CreateCursor request.
+Package: libxcursor1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: X cursor management library
+ This is a udeb, or a microdeb, for the debian-installer.
+
Package: libxcursor1-dbg
Section: debug
Priority: extra
diff --git a/debian/libxcursor1-udeb.install b/debian/libxcursor1-udeb.install
new file mode 100644
index 0000000..400d2d7
--- /dev/null
+++ b/debian/libxcursor1-udeb.install
@@ -0,0 +1 @@
+usr/lib/libXcursor.so.*
diff --git a/debian/rules b/debian/rules
index b9e11c1..2c795c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-arch: build install
dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
- dh_makeshlibs -V "libxcursor1 (>> 1.1.2)"
+ dh_makeshlibs -V "libxcursor1 (>> 1.1.2)" --add-udeb=$(PACKAGE)-udeb
dh_shlibdeps
dh_installdeb
dh_gencontrol
Reply to: