ChangeLog | 12 ++++++++++++
configure.ac | 4 ++--
debian/changelog | 13 +++++++++++++
debian/control | 7 +++++--
debian/libpixman-1-0-udeb.install | 2 +-
debian/libpixman-1-0.install | 2 +-
debian/libpixman-1-dev.install | 6 +++---
debian/rules | 8 ++++++--
8 files changed, 43 insertions(+), 11 deletions(-)
New commits:
commit 9d5bef2fcf18c9dc745cb2194771df500b0ab5a4
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 17:02:08 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 804540a..bba59bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-pixman (0.22.0-1) UNRELEASED; urgency=low
+pixman (0.22.0-1) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -7,7 +9,7 @@ pixman (0.22.0-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.2.
* New upstream release (no changes from 0.21.8 except for the version bump).
- -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 17:00:52 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 17:02:01 +0200
pixman (0.21.8-1) unstable; urgency=low
commit 90f71ced400928d6e1ddb6f3876b6ed339522632
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 17:01:38 2011 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 69d93cb..5469ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit 918a544406df8f428056daff8a634ad6eadf67c9
+Author: Søren Sandmann Pedersen <s...@redhat.com>
+Date: Mon May 2 05:06:33 2011 -0400
+
+ Pre-release version bump to 0.22.0
+
+commit 71b2e2745be31e7d18a11f8c2cba8f6031ace17c
+Author: Søren Sandmann Pedersen <s...@redhat.com>
+Date: Tue Apr 19 00:22:29 2011 -0400
+
+ Post-release version bump to 0.21.9
+
commit 89868e93bd8d66f0fac0f0b42cf7718756992e4e
Author: Søren Sandmann Pedersen <s...@redhat.com>
Date: Tue Apr 19 00:00:37 2011 -0400
diff --git a/debian/changelog b/debian/changelog
index c1ac7cc..804540a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-pixman (0.21.8-2) UNRELEASED; urgency=low
+pixman (0.22.0-1) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
[ Julien Cristau ]
* Bump Standards-Version to 3.9.2.
+ * New upstream release (no changes from 0.21.8 except for the version bump).
- -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 16:57:47 +0200
+ -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 17:00:52 +0200
pixman (0.21.8-1) unstable; urgency=low
commit 105c2e866411e65644f4c4952020e7b604149e8a
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 16:59:43 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index c40ee01..c1ac7cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ pixman (0.21.8-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Bump Standards-Version to 3.9.2.
+
-- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 16:57:47 +0200
pixman (0.21.8-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7897b07..c2735a6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
pkg-config,
quilt,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/pixman
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/pixman.git
commit 3bb65959eee4f80fc9a12525f37033ef968705bd
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 16:58:06 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index b14d5e2..c40ee01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pixman (0.21.8-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 16:57:47 +0200
+
pixman (0.21.8-1) unstable; urgency=low
* New upstream release.
commit f7a60c64ac4592dabbce27c72468e9e8e683ac3c
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 16:57:28 2011 +0200
Don't ship debug symbols for the udeb
diff --git a/debian/rules b/debian/rules
index 75a0808..f1ac6f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,8 @@ override_dh_install:
# Debug package:
override_dh_strip:
- dh_strip --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -N$(PACKAGE)
# Shlibs:
override_dh_makeshlibs:
commit 918a544406df8f428056daff8a634ad6eadf67c9
Author: Søren Sandmann Pedersen <s...@redhat.com>
Date: Mon May 2 05:06:33 2011 -0400
Pre-release version bump to 0.22.0
diff --git a/configure.ac b/configure.ac
index ef8162f..40cca58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
#
m4_define([pixman_major], 0)
-m4_define([pixman_minor], 21)
-m4_define([pixman_micro], 9)
+m4_define([pixman_minor], 22)
+m4_define([pixman_micro], 0)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
commit 71b2e2745be31e7d18a11f8c2cba8f6031ace17c
Author: Søren Sandmann Pedersen <s...@redhat.com>
Date: Tue Apr 19 00:22:29 2011 -0400
Post-release version bump to 0.21.9
diff --git a/configure.ac b/configure.ac
index 0d51bd0..ef8162f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 21)
-m4_define([pixman_micro], 8)
+m4_define([pixman_micro], 9)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
commit c6ce22e73a77dca5897b4ddd2911ad47a9b74150
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sat Mar 26 00:28:55 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index f5a882c..0f60702 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Cyril Brulebois
<k...@debian.org>
-Build-Depends: debhelper (>= 5), automake, autoconf, libtool, pkg-config, quilt
+Build-Depends: debhelper (>= 8.1.3), automake, autoconf, libtool, pkg-config,
quilt
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/pixman
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/pixman.git
@@ -14,6 +14,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: pixel-manipulation library for X and cairo
A library for manipulating pixel regions -- a set of Y-X banded
rectangles, image compositing using the Porter/Duff model
@@ -38,6 +40,7 @@ Architecture: any
Depends:
libpixman-1-0 (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: pixel-manipulation library for X and cairo (debugging symbols)
Debugging symbols for the Cairo/X pixel manipulation library. This is
needed to debug programs linked against libpixman0.
diff --git a/debian/libpixman-1-0-udeb.install
b/debian/libpixman-1-0-udeb.install
index 44c3b82..43128b2 100644
--- a/debian/libpixman-1-0-udeb.install
+++ b/debian/libpixman-1-0-udeb.install
@@ -1 +1 @@
-usr/lib/libpixman-1.so.*
+usr/lib/*/libpixman-1.so.* /usr/lib
diff --git a/debian/libpixman-1-0.install b/debian/libpixman-1-0.install
index 44c3b82..bbd4571 100644
--- a/debian/libpixman-1-0.install
+++ b/debian/libpixman-1-0.install
@@ -1 +1 @@
-usr/lib/libpixman-1.so.*
+usr/lib/*/libpixman-1.so.*
diff --git a/debian/libpixman-1-dev.install b/debian/libpixman-1-dev.install
index 9e6bb44..3972ed2 100644
--- a/debian/libpixman-1-dev.install
+++ b/debian/libpixman-1-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libpixman-1.so
-usr/lib/libpixman-1.a
-usr/lib/pkgconfig
+usr/lib/*/libpixman-1.so
+usr/lib/*/libpixman-1.a
+usr/lib/*/pkgconfig
usr/include/pixman-1
diff --git a/debian/rules b/debian/rules
index c938be2..c7384ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,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)
@@ -43,6 +44,7 @@ config-stamp: autogen-stamp
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
$(confflags) \
CFLAGS="$(CFLAGS)"
touch $@
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qvmnz-0006z2...@vasks.debian.org
