libxdmcp: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++++
debian/control | 1 +
debian/libxdmcp-dev.install | 2 --
debian/rules | 2 +-
4 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit e021239c68364dac1609623ea00b57cf08c5cdb5
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Nov 8 20:30:44 2011 -0800
release 1:1.1.0-4
diff --git a/debian/changelog b/debian/changelog
index ae0428e..50c48c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxdmcp (1:1.1.0-4) UNRELEASED; urgency=low
+libxdmcp (1:1.1.0-4) unstable; urgency=low
* Drop /usr/share/doc/libxdmcp-dev/xdmcp.html from the package; the
autogenerated contents with random node numbers mean that this is not
@@ -6,7 +6,7 @@ libxdmcp (1:1.1.0-4) UNRELEASED; urgency=low
xdmcp.txt.gz.
* Mark libxdmcp-dev Multi-Arch: same.
- -- Steve Langasek <vorlon@debian.org> Tue, 08 Nov 2011 20:29:10 -0800
+ -- Steve Langasek <vorlon@debian.org> Tue, 08 Nov 2011 20:30:37 -0800
libxdmcp (1:1.1.0-3) unstable; urgency=low
commit c05303fd06b91c70c91026cc795728c6838988a3
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Nov 8 20:30:34 2011 -0800
Mark libxdmcp-dev Multi-Arch: same.
diff --git a/debian/changelog b/debian/changelog
index c5ce464..ae0428e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxdmcp (1:1.1.0-4) UNRELEASED; urgency=low
autogenerated contents with random node numbers mean that this is not
multiarch-friendly, and the same information is available in
xdmcp.txt.gz.
+ * Mark libxdmcp-dev Multi-Arch: same.
-- Steve Langasek <vorlon@debian.org> Tue, 08 Nov 2011 20:29:10 -0800
diff --git a/debian/control b/debian/control
index 656d808..35e6b6a 100644
--- a/debian/control
+++ b/debian/control
@@ -61,6 +61,7 @@ Description: X11 authorisation library (debug package)
Package: libxdmcp-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libxdmcp6 (= ${binary:Version}), x11proto-core-dev
Description: X11 authorisation library (development headers)
commit 77743d22372521a1c4b136a542a78d44786d5c1f
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Nov 8 20:30:12 2011 -0800
Drop /usr/share/doc/libxdmcp-dev/xdmcp.html from the package; the autogenerated contents with random node numbers mean that this is not multiarch-friendly, and the same information is available in xdmcp.txt.gz.
diff --git a/debian/changelog b/debian/changelog
index d36138e..c5ce464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libxdmcp (1:1.1.0-4) UNRELEASED; urgency=low
+
+ * Drop /usr/share/doc/libxdmcp-dev/xdmcp.html from the package; the
+ autogenerated contents with random node numbers mean that this is not
+ multiarch-friendly, and the same information is available in
+ xdmcp.txt.gz.
+
+ -- Steve Langasek <vorlon@debian.org> Tue, 08 Nov 2011 20:29:10 -0800
+
libxdmcp (1:1.1.0-3) unstable; urgency=low
* Team upload.
diff --git a/debian/libxdmcp-dev.install b/debian/libxdmcp-dev.install
index bddf2d1..7f901be 100644
--- a/debian/libxdmcp-dev.install
+++ b/debian/libxdmcp-dev.install
@@ -2,6 +2,4 @@ usr/include/X11/*
usr/lib/*/libXdmcp.a
usr/lib/*/libXdmcp.so
usr/lib/*/pkgconfig/xdmcp.pc
-usr/share/doc/libXdmcp/*.html usr/share/doc/libxdmcp-dev
-usr/share/doc/libXdmcp/*.css usr/share/doc/libxdmcp-dev
usr/share/doc/libXdmcp/*.txt usr/share/doc/libxdmcp-dev
diff --git a/debian/rules b/debian/rules
index e47a12d..6702406 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXdmcp.la
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXdmcp.la --exclude .html --exclude .css
dh_installchangelogs ChangeLog
dh_link
dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
Reply to: