libxrender: Changes to 'debian-unstable'
debian/changelog | 12 ++++++++++++
debian/control | 9 ++++++---
debian/libxrender-dev.install | 6 +++---
debian/libxrender1-udeb.install | 2 +-
debian/libxrender1.install | 2 +-
debian/rules | 13 ++++++++++---
6 files changed, 33 insertions(+), 11 deletions(-)
New commits:
commit 65e432ecca55d4bffe7383689aa62632acaa9a64
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 12 00:32:16 2011 +0200
Don't ship debug symbols for the udeb
diff --git a/debian/rules b/debian/rules
index f0b000a..b5a456f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,8 @@ binary-arch: build install
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs ChangeLog
dh_link
- dh_strip --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
commit c73bce69b3b684b70c010fb2e83048984f67de29
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:21:37 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index dca3856..6f76dc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxrender (1:0.9.6-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add build-arch and (empty) build-indep debian/rules targets.
* Remove David Nusinow, Brice Goglin and Andres Salomon from Uploaders.
+ * Bump Standards-Version to 3.9.2.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:18:33 +0200
diff --git a/debian/control b/debian/control
index cef7c7e..363b17a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrender
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrender.git
commit 9d0464e65bc143375090fd4927888b220d942c18
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:21:18 2011 +0200
Remove David Nusinow, Brice Goglin and Andres Salomon from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index b5d7730..dca3856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxrender (1:0.9.6-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add build-arch and (empty) build-indep debian/rules targets.
+ * Remove David Nusinow, Brice Goglin and Andres Salomon from Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:18:33 +0200
diff --git a/debian/control b/debian/control
index 3d1175a..cef7c7e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxrender
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
pkg-config,
commit 8347f6cd44e1c417d09ebe553dd1a3a0394e77dc
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:20:39 2011 +0200
Add build-arch and (empty) build-indep debian/rules targets.
diff --git a/debian/changelog b/debian/changelog
index e323667..b5d7730 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxrender (1:0.9.6-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Add build-arch and (empty) build-indep debian/rules targets.
+
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:18:33 +0200
libxrender (1:0.9.6-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index c2c3239..f0b000a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,11 @@ else
endif
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep:
+.PHONY: build build-arch build-indep
+
build-stamp:
dh_testdir
autoreconf -vfi
@@ -95,4 +99,4 @@ binary-indep: build install
# Nothing to do
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: clean binary-indep binary-arch binary install
commit 895c2f3650e39369fbd62411e709d9c2ee196303
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 23:18:49 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index de1207f..e323667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxrender (1:0.9.6-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 23:18:33 +0200
+
libxrender (1:0.9.6-1) unstable; urgency=low
* New upstream release.
commit 63dd3c54b2bc8ccdc169d7c241012177ce0ed8fe
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed Mar 23 23:22:50 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index 7505e4d..3d1175a 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>, Andres Salomon <dilinger@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
pkg-config,
libx11-dev (>= 2:1.3.3-2),
x11proto-render-dev,
@@ -22,6 +22,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X Rendering Extension client library
The X Rendering Extension (Render) introduces digital image composition as
the foundation of a new rendering model within the X Window System.
@@ -53,6 +55,7 @@ Depends:
libxrender1 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
+Multi-Arch: same
Description: X Rendering Extension client library (unstripped)
The X Rendering Extension (Render) introduces digital image composition as
the foundation of a new rendering model within the X Window System.
diff --git a/debian/libxrender-dev.install b/debian/libxrender-dev.install
index 78df60a..60949c5 100644
--- a/debian/libxrender-dev.install
+++ b/debian/libxrender-dev.install
@@ -1,5 +1,5 @@
usr/include/X11/*
-usr/lib/libXrender.a
-usr/lib/libXrender.so
-usr/lib/pkgconfig/xrender.pc
+usr/lib/*/libXrender.a
+usr/lib/*/libXrender.so
+usr/lib/*/pkgconfig/xrender.pc
usr/share/doc/libXrender/* usr/share/doc/libxrender-dev
diff --git a/debian/libxrender1-udeb.install b/debian/libxrender1-udeb.install
index 598e408..201df86 100644
--- a/debian/libxrender1-udeb.install
+++ b/debian/libxrender1-udeb.install
@@ -1 +1 @@
-usr/lib/libXrender.so.1*
+usr/lib/*/libXrender.so.1* usr/lib
diff --git a/debian/libxrender1.install b/debian/libxrender1.install
index 598e408..326ddcb 100644
--- a/debian/libxrender1.install
+++ b/debian/libxrender1.install
@@ -1 +1 @@
-usr/lib/libXrender.so.1*
+usr/lib/*/libXrender.so.1*
diff --git a/debian/rules b/debian/rules
index a25bb28..c2c3239 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:
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: