libxss: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 6 +++++-
debian/libxss-dev.install | 6 +++---
debian/libxss1.install | 2 +-
debian/rules | 2 ++
5 files changed, 17 insertions(+), 5 deletions(-)
New commits:
commit d4f700220c36d04d5a4be102141c69affe955186
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Thu Aug 11 11:24:59 2011 -0700
releasing version 1:1.2.1-2
diff --git a/debian/changelog b/debian/changelog
index 3f4ffd0..a61e9b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libxss (1:1.2.1-2) UNRELEASED; urgency=low
+libxss (1:1.2.1-2) unstable; urgency=low
* Build for multiarch.
- -- Steve Langasek <vorlon@debian.org> Thu, 11 Aug 2011 18:19:29 +0000
+ -- Steve Langasek <vorlon@debian.org> Thu, 11 Aug 2011 11:24:52 -0700
libxss (1:1.2.1-1) unstable; urgency=low
commit 1f849c11da93bc843d58f9ea81064321e35fe3a5
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Thu Aug 11 11:22:16 2011 -0700
Build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index b47e163..3f4ffd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxss (1:1.2.1-2) UNRELEASED; urgency=low
+
+ * Build for multiarch.
+
+ -- Steve Langasek <vorlon@debian.org> Thu, 11 Aug 2011 18:19:29 +0000
+
libxss (1:1.2.1-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index f48edc6..f1ee58b 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),
+ debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
libxext-dev (>= 1:0.99.1),
x11proto-scrnsaver-dev (>= 1.2.0),
@@ -20,7 +20,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxss.git
Package: libxss1
Section: libs
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Pre-Depends: ${misc:Pre-Depends}
Description: X11 Screen Saver extension library
libXss provides an X Window System client interface to the MIT-SCREEN-SAVER
extension to the X protocol.
@@ -39,6 +41,7 @@ Package: libxss1-dbg
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxss1 (= ${binary:Version})
Description: X11 Screen Saver extension library (debug package)
libXss provides an X Window System client interface to the MIT-SCREEN-SAVER
@@ -60,6 +63,7 @@ Description: X11 Screen Saver extension library (debug package)
Package: libxss-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
${shlibs:Depends},
${misc:Depends},
diff --git a/debian/libxss-dev.install b/debian/libxss-dev.install
index da6eec0..ef6deed 100644
--- a/debian/libxss-dev.install
+++ b/debian/libxss-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libXss.a
-usr/lib/libXss.so
-usr/lib/pkgconfig/xscrnsaver.pc
+usr/lib/*/libXss.a
+usr/lib/*/libXss.so
+usr/lib/*/pkgconfig/xscrnsaver.pc
usr/include
diff --git a/debian/libxss1.install b/debian/libxss1.install
index eb371d6..4825896 100644
--- a/debian/libxss1.install
+++ b/debian/libxss1.install
@@ -1 +1 @@
-usr/lib/libXss.so.1*
+usr/lib/*/libXss.so.1*
diff --git a/debian/rules b/debian/rules
index d168ad5..e3e8631 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
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)
@@ -40,6 +41,7 @@ build-stamp: $(STAMP_DIR)/patch
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
Reply to: