debian/changelog | 8 ++++++++
debian/rules | 18 +++++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
New commits:
commit 302a7b530f0db632f94f099db642d09a0ddbeb35
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Fri Nov 11 06:52:06 2011 -0800
releasing version 2:1.4.4-4
diff --git a/debian/changelog b/debian/changelog
index 27eff96..da0997e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libx11 (2:1.4.4-4) UNRELEASED; urgency=low
+libx11 (2:1.4.4-4) unstable; urgency=low
* debian/rules: since the documentation is moved to libx11-doc, the
exception handling for libx11-xcb-dev needs to also look at libx11-doc,
not libx11-dev.
- -- Steve Langasek <vor...@debian.org> Thu, 10 Nov 2011 18:56:41 -0800
+ -- Steve Langasek <vor...@debian.org> Fri, 11 Nov 2011 06:51:51 -0800
libx11 (2:1.4.4-3) unstable; urgency=low
commit 7ff742c6683b783b1ee883e467f5c16f26c90e40
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Thu Nov 10 19:05:13 2011 -0800
debian/rules: since the documentation is moved to libx11-doc, the exception
handling for libx11-xcb-dev needs to also look at libx11-doc, not libx11-dev.
diff --git a/debian/changelog b/debian/changelog
index 992a713..27eff96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libx11 (2:1.4.4-4) UNRELEASED; urgency=low
+
+ * debian/rules: since the documentation is moved to libx11-doc, the
+ exception handling for libx11-xcb-dev needs to also look at libx11-doc,
+ not libx11-dev.
+
+ -- Steve Langasek <vor...@debian.org> Thu, 10 Nov 2011 18:56:41 -0800
+
libx11 (2:1.4.4-3) unstable; urgency=low
* Split documentation out from libx11-dev into a separate libx11-doc
diff --git a/debian/rules b/debian/rules
index b17e483..89f3eaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,13 +101,10 @@ binary-arch: build install
dh_installdocs -s NEWS
# Kill *.xml files, we don't need them:
find debian/tmp -name '*.xml' -delete
- # Using exclusions here allows libx11-6.install to use wildcards for
- # headers and manpages, rather than listing every header and manpage
- # other than these.
+ # Using exclusions here allows libx11-dev.install to use wildcards
+ # for headers, rather than listing every header other than this one.
dh_install --sourcedir=debian/tmp -plibx11-dev \
- --exclude=usr/include/X11/Xlib-xcb.h \
- --exclude=usr/share/man/man3/XGetXCBConnection.3 \
- --exclude=usr/share/man/man3/XSetEventQueueOwner.3
+ --exclude=usr/include/X11/Xlib-xcb.h
dh_install --sourcedir=debian/tmp -Nlibx11-dev -s
dh_installchangelogs -s ChangeLog
dh_installman -s
@@ -133,7 +130,14 @@ binary-indep: build install
dh_installdocs -i
dh_installchangelogs -i NEWS
- dh_install --sourcedir=debian/tmp -i
+ # Using exclusions here allows libx11-6.install to use wildcards for
+ # headers and manpages, rather than listing every header and manpage
+ # other than these.
+ dh_install --sourcedir=debian/tmp -plibx11-doc \
+ --exclude=usr/include/X11/Xlib-xcb.h \
+ --exclude=usr/share/man/man3/XGetXCBConnection.3 \
+ --exclude=usr/share/man/man3/XSetEventQueueOwner.3
+ dh_install --sourcedir=debian/tmp -i -Nlibx11-doc
dh_link -i
dh_installman -i
dh_lintian -i
--
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/e1rossm-00025i...@vasks.debian.org
