[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libx11: Changes to 'debian-multiarch'



 debian/control               |    4 +++-
 debian/libx11-6-udeb.install |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bbadca777d5dd10d5f638c61662f6bd1e8c7d6ef
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date:   Mon Mar 21 23:35:44 2011 -0700

    install udeb contents to /usr/lib only, not to the multiarch path

diff --git a/debian/libx11-6-udeb.install b/debian/libx11-6-udeb.install
index f85cbb1..e148c78 100644
--- a/debian/libx11-6-udeb.install
+++ b/debian/libx11-6-udeb.install
@@ -1,5 +1,5 @@
 # from libx11-6:
-usr/lib/*/libX11.so.6*
+usr/lib/*/libX11.so.6* usr/lib
 
 # from libx11-data:
 usr/share/X11/XErrorDB

commit 9daeb18c9ffa71023e3a2249126b54e1ece434fd
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date:   Mon Mar 21 23:34:50 2011 -0700

    bump dpkg-dev multiarch b-d; add missing Pre-Depends:

diff --git a/debian/control b/debian/control
index fde8113..67e4cd9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Cyril Brulebois <kibi@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
- dpkg-dev (>= 1.15.8.10ubuntu1+multiarch.1),
+ dpkg-dev (>= 1.16.0),
  pkg-config,
  xtrans-dev,
  x11proto-core-dev (>= 7.0.13),
@@ -33,6 +33,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  libx11-data,
+Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: X11 client-side library
  This package provides a client interface to the X Window System, otherwise
@@ -127,6 +128,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Xlib/XCB interface library
  libX11-xcb provides functions needed by clients which take advantage of


Reply to: