Package: sdl-ttf2.0
Version: 2.0.9-1.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Hi Samuel,

Please find attached a patch to sdl-ttf2.0 to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.  This patch has been
tested and included in Ubuntu Precise.

sdl-ttf does not appear to be part of ia32-libs in Debian, but it is in
Ubuntu; I don't know why specifically but we can safely assume that someone
requested this, and that it would therefore be useful to Debian users to
have this library cross-installable as well.

Thanks for considering the patch.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
=== modified file 'debian/control'
--- debian/control	2007-07-23 14:39:46 +0000
+++ debian/control	2011-12-30 00:23:54 +0000
@@ -4,10 +4,12 @@
 Maintainer: Samuel Mimram <smim...@debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+...@zoy.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev (>= 1.2.4), libfreetype6-dev, dpatch (>= 1.23)
+Build-Depends: debhelper (>> 8.1.3~), libsdl1.2-dev (>= 1.2.4), libfreetype6-dev, dpatch (>= 1.23)
 
 Package: libsdl-ttf2.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}
 Description: ttf library for Simple DirectMedia Layer with FreeType 2 support
  SDL_ttf is a sample TrueType font library. It allows you to use
@@ -16,6 +18,7 @@
 Package: libsdl-ttf2.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libsdl-ttf2.0-0 (= ${binary:Version}), libc6-dev | libc-dev, libsdl1.2-dev (>= 1.2.4), libfreetype6-dev
 Conflicts: libsdl-ttf1.2-dev
 Description: development files for SDL ttf library (version 2.0)

=== modified file 'debian/libsdl-ttf2.0-0.install'
--- debian/libsdl-ttf2.0-0.install	2005-11-23 22:04:06 +0000
+++ debian/libsdl-ttf2.0-0.install	2011-12-30 00:01:17 +0000
@@ -1 +1 @@
-usr/lib/libSDL_ttf-2.0.so.*
+usr/lib/*/libSDL_ttf-2.0.so.*

=== modified file 'debian/libsdl-ttf2.0-dev.install'
--- debian/libsdl-ttf2.0-dev.install	2011-09-28 20:12:07 +0000
+++ debian/libsdl-ttf2.0-dev.install	2011-12-30 00:01:25 +0000
@@ -1,3 +1,3 @@
 usr/include/SDL
-usr/lib/libSDL_ttf.a
-usr/lib/libSDL_ttf.so
+usr/lib/*/libSDL_ttf.a
+usr/lib/*/libSDL_ttf.so

=== modified file 'debian/rules'
--- debian/rules	2007-07-23 14:39:46 +0000
+++ debian/rules	2011-12-30 00:00:49 +0000
@@ -5,13 +5,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 include /usr/share/dpatch/dpatch.make
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 	touch configure-stamp
 

Reply via email to