Package: libyaml
Version: 0.1.4-1
Severity: wishlist
Tags: patch

please support multiarch with this package.
Attached a debdiff following [0] enabling it.

An issue is the use of dh_buildinfo which breaks coinstallability (see
bug 620104)
I have removed the dependency in the debdiff.

[0] http://wiki.debian.org/Multiarch/Implementation
diff -u libyaml-0.1.4/debian/libyaml-dev.install 
libyaml-0.1.4/debian/libyaml-dev.install
--- libyaml-0.1.4/debian/libyaml-dev.install
+++ libyaml-0.1.4/debian/libyaml-dev.install
@@ -2,2 +2,2 @@
-usr/lib/*.a
-usr/lib/pkgconfig/*
+usr/lib/*/*.a
+usr/lib/*/pkgconfig/*
diff -u libyaml-0.1.4/debian/changelog libyaml-0.1.4/debian/changelog
--- libyaml-0.1.4/debian/changelog
+++ libyaml-0.1.4/debian/changelog
@@ -1,3 +1,10 @@
+libyaml (0.1.4-2) UNRELEASED; urgency=low
+
+  * convert to multiarch 
+    - remove dh_buildinfo from b-d as it breaks coinstallability
+
+ -- Julian Taylor <[email protected]>  Fri, 30 Dec 2011 17:39:11 +0100
+
 libyaml (0.1.4-1) unstable; urgency=low
 
   * New upstream version 0.1.4.
diff -u libyaml-0.1.4/debian/rules libyaml-0.1.4/debian/rules
--- libyaml-0.1.4/debian/rules
+++ libyaml-0.1.4/debian/rules
@@ -7,0 +8,5 @@
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
+common-install-arch::
+       dh_link -plibyaml-dev usr/lib/$(DEB_HOST_MULTIARCH)/libyaml-0.so 
usr/lib/$(DEB_HOST_MULTIARCH)/libyaml.so
+       dh_link -plibyaml-dev usr/lib/$(DEB_HOST_MULTIARCH)/libyaml-0.so.2 
usr/lib/$(DEB_HOST_MULTIARCH)/libyaml-0.so
diff -u libyaml-0.1.4/debian/control libyaml-0.1.4/debian/control
--- libyaml-0.1.4/debian/control
+++ libyaml-0.1.4/debian/control
@@ -2,10 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Anders Kaseorg <[email protected]>
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.93~),
  autotools-dev,
- debhelper,
- dh-buildinfo
+ debhelper (>= 8.1.3~)
 Standards-Version: 3.9.2
 Homepage: http://pyyaml.org/wiki/LibYAML
 Vcs-Git: git://andersk.mit.edu/libyaml.git
@@ -13,6 +12,8 @@
 
 Package: libyaml-0-2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Fast YAML 1.1 parser and emitter library
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
@@ -22,6 +23,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
 Description: Fast YAML 1.1 parser and emitter library (debugging symbols)
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
@@ -33,6 +35,7 @@
 Package: libyaml-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
 Description: Fast YAML 1.1 parser and emitter library (development)
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
reverted:
--- libyaml-0.1.4/debian/libyaml-dev.links
+++ libyaml-0.1.4.orig/debian/libyaml-dev.links
@@ -1,2 +0,0 @@
-usr/lib/libyaml-0.so usr/lib/libyaml.so
-usr/lib/libyaml-0.so.2 usr/lib/libyaml-0.so
diff -u libyaml-0.1.4/debian/libyaml-0-2.install 
libyaml-0.1.4/debian/libyaml-0-2.install
--- libyaml-0.1.4/debian/libyaml-0-2.install
+++ libyaml-0.1.4/debian/libyaml-0-2.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to