libxdmcp: Changes to 'debian-unstable'
debian/changelog | 13 +++++++++++++
debian/control | 9 ++++++---
debian/libxdmcp-dev.install | 6 +++---
debian/libxdmcp6-udeb.install | 2 +-
debian/libxdmcp6.install | 2 +-
debian/rules | 2 ++
6 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit ab233e628ded5f6f458e21a914a20aef1024dabf
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 7 20:09:49 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6ef4321..c9908c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxdmcp (1:1.1.0-2) UNRELEASED; urgency=low
+libxdmcp (1:1.1.0-2) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -7,7 +9,7 @@ libxdmcp (1:1.1.0-2) UNRELEASED; urgency=low
* Remove David Nusinow from Uploaders.
* Standards-Version bumped to 3.9.2.
- -- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 19:31:41 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 20:09:40 +0200
libxdmcp (1:1.1.0-1) unstable; urgency=low
commit 6c8838ef6dd3529660ffbaeadffeb24b2dd9aafb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 7 20:07:08 2011 +0200
Standards-Version bumped to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index a42170b..6ef4321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxdmcp (1:1.1.0-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove David Nusinow from Uploaders.
+ * Standards-Version bumped to 3.9.2.
-- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 19:31:41 +0200
diff --git a/debian/control b/debian/control
index f6e3b18..656d808 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
xutils-dev (>= 1:7.5+4),
# doc:
xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxdmcp
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxdmcp.git
commit 1c6928b6280c56e454545f7be4c54f6d4d7dfc29
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 7 19:57:18 2011 +0200
Remove David Nusinow from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 8fa3b7d..a42170b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxdmcp (1:1.1.0-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Remove David Nusinow from Uploaders.
+
-- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 19:31:41 +0200
libxdmcp (1:1.1.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 11b628b..f6e3b18 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxdmcp
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
pkg-config,
commit 88ba7d9c758f1fd502ccc2f71a8e7e4578948005
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 7 19:31:55 2011 +0200
Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index df9e92e..8fa3b7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxdmcp (1:1.1.0-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 19:31:41 +0200
+
libxdmcp (1:1.1.0-1) unstable; urgency=low
* New upstream release.
commit aededa16e1b23a2f0a40c123f9c63549ab0e83e0
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Mar 22 01:47:50 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index ae6e5da..11b628b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
pkg-config,
x11proto-core-dev,
automake,
@@ -20,6 +20,8 @@ Package: libxdmcp6
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 Display Manager Control Protocol library
This package provides the main interface to the X11 display manager control
protocol library, which allows for remote logins to display managers.
@@ -43,6 +45,7 @@ Architecture: any
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxdmcp6 (= ${binary:Version})
+Multi-Arch: same
Description: X11 authorisation library (debug package)
This package provides the main interface to the X11 display manager control
protocol library, which allows for remote logins to display managers.
diff --git a/debian/libxdmcp-dev.install b/debian/libxdmcp-dev.install
index 9be6b38..bddf2d1 100644
--- a/debian/libxdmcp-dev.install
+++ b/debian/libxdmcp-dev.install
@@ -1,7 +1,7 @@
usr/include/X11/*
-usr/lib/libXdmcp.a
-usr/lib/libXdmcp.so
-usr/lib/pkgconfig/xdmcp.pc
+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/libxdmcp6-udeb.install b/debian/libxdmcp6-udeb.install
index e9d049b..32c5a8c 100644
--- a/debian/libxdmcp6-udeb.install
+++ b/debian/libxdmcp6-udeb.install
@@ -1 +1 @@
-usr/lib/libXdmcp.so.6*
+usr/lib/*/libXdmcp.so.6* usr/lib
diff --git a/debian/libxdmcp6.install b/debian/libxdmcp6.install
index e9d049b..e92865e 100644
--- a/debian/libxdmcp6.install
+++ b/debian/libxdmcp6.install
@@ -1 +1 @@
-usr/lib/libXdmcp.so.6*
+usr/lib/*/libXdmcp.so.6*
diff --git a/debian/rules b/debian/rules
index 05b27c9..ea863da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
@@ -43,6 +44,7 @@ build-stamp:
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--with-xmlto --without-fop \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
>$@
Reply to: