diff -u allegro4.2-4.2.2/debian/control allegro4.2-4.2.2/debian/control --- allegro4.2-4.2.2/debian/control +++ allegro4.2-4.2.2/debian/control @@ -1,9 +1,10 @@ Source: allegro4.2 Section: devel Priority: optional -Maintainer: Debian allegro packages maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian allegro packages maintainers Uploaders: Sam Hocevar (Debian packages) -Build-Depends: debhelper (>= 4.0), quilt, texinfo, libesd0-dev, libxext-dev, libx11-dev, libxpm-dev, libxt-dev, libxcursor-dev, svgalibg1-dev [i386], libasound2-dev (>= 0.9) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libartsc0-dev, libjack0.100.0-dev, libxxf86dga-dev, libxxf86vm-dev +Build-Depends: debhelper (>= 4.0), quilt, texinfo, libesd0-dev, libxext-dev, libx11-dev, libxpm-dev, libxt-dev, libxcursor-dev, svgalibg1-dev [i386], libasound2-dev (>= 0.9) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack0.100.0-dev, libxxf86dga-dev, libxxf86vm-dev Standards-Version: 3.7.3 Package: liballegro4.2 @@ -11,7 +12,7 @@ Architecture: any Depends: ${shlibs:Depends} Recommends: liballegro4.2-plugin-jack -Suggests: timidity-patches, liballegro4.2-plugin-esd | liballegro4.2-plugin-arts +Suggests: timidity-patches, liballegro4.2-plugin-esd Priority: optional Description: portable library for cross-platform game and multimedia development Allegro is a cross-platform library intended for use in computer games @@ -67,20 +68,6 @@ games and other types of multimedia programming. It is used by many DOS games and can be used to port them easily to Linux. -Package: liballegro4.2-plugin-arts -Architecture: any -Section: libs -Priority: optional -Depends: ${shlibs:Depends}, liballegro4.2 (= ${binary:Version}) -Description: aRts audio plugin for the Allegro library - This plugin adds support for the aRts Sound system to the Allegro library. - Programs using Allegro will automatically use this plugin if the aRts - daemon is running. - . - Allegro is a cross-platform library intended for use in computer - games and other types of multimedia programming. It is used by many - DOS games and can be used to port them easily to Linux. - Package: liballegro4.2-plugin-svgalib Architecture: i386 Section: libs diff -u allegro4.2-4.2.2/debian/patches/series allegro4.2-4.2.2/debian/patches/series --- allegro4.2-4.2.2/debian/patches/series +++ allegro4.2-4.2.2/debian/patches/series @@ -10,0 +11 @@ +060_asm_fixes.diff diff -u allegro4.2-4.2.2/debian/rules allegro4.2-4.2.2/debian/rules --- allegro4.2-4.2.2/debian/rules +++ allegro4.2-4.2.2/debian/rules @@ -38,6 +38,7 @@ --mandir=/usr/share/man --infodir=/usr/share/info \ --enable-shared --enable-static \ --enable-pentiumopts=no --enable-asm=yes \ + --enable-artsdigi=no \ $(ARCH_CONFIG_FLAGS) touch configure-stamp @@ -64,8 +65,6 @@ usr/lib/allegro/$(fullver) usr/share/doc dh_installdirs -pliballegro$(ver)-plugin-esd \ usr/lib/allegro/$(fullver) usr/share/doc - dh_installdirs -pliballegro$(ver)-plugin-arts \ - usr/lib/allegro/$(fullver) usr/share/doc dh_installdirs -pliballegro$(ver)-plugin-svgalib \ usr/lib/allegro/$(fullver) usr/share/doc dh_installdirs -pliballegro-doc \ @@ -119,7 +118,7 @@ dh_builddeb -i # Build architecture-dependent files here. -binary-arch: liballegro$(ver) allegro-demo allegro-examples liballegro$(ver)-dev liballegro$(ver)-plugin-jack liballegro$(ver)-plugin-esd liballegro$(ver)-plugin-arts $(ARCH_PACKAGES) +binary-arch: liballegro$(ver) allegro-demo allegro-examples liballegro$(ver)-dev liballegro$(ver)-plugin-jack liballegro$(ver)-plugin-esd $(ARCH_PACKAGES) dh_strip -s dh_compress -s dh_fixperms -s @@ -167,10 +166,6 @@ mv `pwd`/debian/liballegro$(ver)/usr/lib/allegro/$(fullver)/alleg-esddigi.so `pwd`/debian/liballegro$(ver)-plugin-esd/usr/lib/allegro/$(fullver)/ ln -sf liballegro$(ver) `pwd`/debian/liballegro$(ver)-plugin-esd/usr/share/doc/liballegro$(ver)-plugin-esd -liballegro$(ver)-plugin-arts: install - mv `pwd`/debian/liballegro$(ver)/usr/lib/allegro/$(fullver)/alleg-artsdigi.so `pwd`/debian/liballegro$(ver)-plugin-arts/usr/lib/allegro/$(fullver)/ - ln -sf liballegro$(ver) `pwd`/debian/liballegro$(ver)-plugin-arts/usr/share/doc/liballegro$(ver)-plugin-arts - liballegro$(ver)-plugin-svgalib: install mv `pwd`/debian/liballegro$(ver)/usr/lib/allegro/$(fullver)/alleg-svgalib.so `pwd`/debian/liballegro$(ver)-plugin-svgalib/usr/lib/allegro/$(fullver)/ ln -sf liballegro$(ver) `pwd`/debian/liballegro$(ver)-plugin-svgalib/usr/share/doc/liballegro$(ver)-plugin-svgalib diff -u allegro4.2-4.2.2/debian/changelog allegro4.2-4.2.2/debian/changelog --- allegro4.2-4.2.2/debian/changelog +++ allegro4.2-4.2.2/debian/changelog @@ -1,3 +1,17 @@ +allegro4.2 (2:4.2.2-2ubuntu1) jaunty; urgency=low + + * Remove arts from dependencies. (LP: #320915) + - debian/control: + - Remove libartsc0-dev from build depends + - Don't build package liballegro4.2-plugin-arts + - Remove liballegro4.2-plugin-arts from suggests of liballegro4.2 + - debian/rules: + + Add --enable-artsdigi=no to ./configure + - Remove all lines specific to liballegro4.2-plugin-arts + - Add 060_asm_fixes.diff to fix asm related FTBFS + + -- Andreas Wenning Mon, 02 Feb 2009 18:17:48 +0100 + allegro4.2 (2:4.2.2-2) unstable; urgency=low * debian/control: only in patch2: unchanged: --- allegro4.2-4.2.2.orig/debian/patches/060_asm_fixes.diff +++ allegro4.2-4.2.2/debian/patches/060_asm_fixes.diff @@ -0,0 +1,13 @@ +Index: allegro4.2-4.2.2/src/i386/icpus.s +=================================================================== +--- allegro4.2-4.2.2.orig/src/i386/icpus.s 2009-02-02 17:35:00.000000000 +0100 ++++ allegro4.2-4.2.2/src/i386/icpus.s 2009-02-02 17:35:11.000000000 +0100 +@@ -67,7 +67,7 @@ + + fninit + movl $0x5A5A, %eax +- fnstsw %eax ++ fnstsw %ax + cmpl $0, %eax + jne is_fpu_not_found +