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

Bug#632943: marked as done (pixman: Please allow easier backports)

Your message dated Fri, 2 Dec 2011 09:33:26 +0100
with message-id <20111202083325.GG23047@mraw.org>
and subject line Re: Bug#632943: pixman: Please allow easier backports
has caused the Debian Bug report #632943,
regarding pixman: Please allow easier backports
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
632943: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632943
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: pixman
Version: 0.22.0-1
Severity: wishlist

Since the switch to multi-arch, the pixman package doesn't build out of the
box in a squeeze-backports environment.

The attached patch allows that.

Mike

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u pixman-0.22.0/debian/rules pixman-0.22.0/debian/rules
--- pixman-0.22.0/debian/rules
+++ pixman-0.22.0/debian/rules
@@ -5,6 +5,16 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+PREPROCESS_FILES := $(wildcard debian/*.in)
+
+$(PREPROCESS_FILES:.in=): %: %.in
+	sed 's,@DEB_HOST_MULTIARCH@/,$(DEB_HOST_MULTIARCH:=/),g' $< > $@
+
+ifneq (,$(DEB_HOST_MULTIARCH))
+override_dh_gencontrol:
+	dh_gencontrol -- -Vmisc:Multi-Arch=same
+endif
+
 # Disable Gtk+ autodetection:
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-gtk \
@@ -15,7 +25,7 @@
 	dh_auto_install --destdir=debian/tmp
 
 # Kill *.la files, and forget no-one:
-override_dh_install:
+override_dh_install: $(PREPROCESS_FILES:.in=)
 	find debian/tmp -name '*.la' -delete
 	dh_install --fail-missing
 
diff -u pixman-0.22.0/debian/control pixman-0.22.0/debian/control
--- pixman-0.22.0/debian/control
+++ pixman-0.22.0/debian/control
@@ -19,7 +19,7 @@
  ${shlibs:Depends},
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
+Multi-Arch: ${misc:Multi-Arch}
 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
@@ -44,7 +44,7 @@
 Depends:
  libpixman-1-0 (= ${binary:Version}),
  ${misc:Depends},
-Multi-Arch: same
+Multi-Arch: ${misc:Multi-Arch}
 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.
reverted:
--- pixman-0.22.0/debian/libpixman-1-0-udeb.install
+++ pixman-0.22.0.orig/debian/libpixman-1-0-udeb.install
@@ -1 +0,0 @@
-usr/lib/*/libpixman-1.so.* /usr/lib
reverted:
--- pixman-0.22.0/debian/libpixman-1-dev.install
+++ pixman-0.22.0.orig/debian/libpixman-1-dev.install
@@ -1,4 +0,0 @@
-usr/lib/*/libpixman-1.so
-usr/lib/*/libpixman-1.a
-usr/lib/*/pkgconfig
-usr/include/pixman-1
reverted:
--- pixman-0.22.0/debian/libpixman-1-0.install
+++ pixman-0.22.0.orig/debian/libpixman-1-0.install
@@ -1 +0,0 @@
-usr/lib/*/libpixman-1.so.*
diff -u pixman-0.22.0/debian/changelog pixman-0.22.0/debian/changelog
--- pixman-0.22.0/debian/changelog
+++ pixman-0.22.0/debian/changelog
@@ -1,3 +1,10 @@
+pixman (0.22.0-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules, debian/control, debian/*.install: Allow easy backport.
+
+ -- Mike Hommey <glandium@debian.org>  Thu, 07 Jul 2011 10:35:46 +0200
+
 pixman (0.22.0-1) unstable; urgency=low
 
   * Team upload.
only in patch2:
unchanged:
--- pixman-0.22.0.orig/debian/libpixman-1-dev.install.in
+++ pixman-0.22.0/debian/libpixman-1-dev.install.in
@@ -0,0 +1,4 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libpixman-1.so
+usr/lib/@DEB_HOST_MULTIARCH@/libpixman-1.a
+usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig
+usr/include/pixman-1
only in patch2:
unchanged:
--- pixman-0.22.0.orig/debian/libpixman-1-0-udeb.install.in
+++ pixman-0.22.0/debian/libpixman-1-0-udeb.install.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libpixman-1.so.* /usr/lib
only in patch2:
unchanged:
--- pixman-0.22.0.orig/debian/libpixman-1-0.install.in
+++ pixman-0.22.0/debian/libpixman-1-0.install.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libpixman-1.so.*

--- End Message ---
--- Begin Message --- 
Mike Hommey <mh+reportbug@glandium.org> (07/07/2011):
> Package: pixman
> Version: 0.22.0-1
> Severity: wishlist
> 
> Since the switch to multi-arch, the pixman package doesn't build out of the
> box in a squeeze-backports environment.
> 
> The attached patch allows that.

Closing as I'm uploading pixman 0.24.0-1~bpo60+1 to squeeze-backports.
Thanks for the patch, but I'll stay away from preprocessed files on this
one.

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: