diff -u libggi-2.2.2/debian/changelog libggi-2.2.2/debian/changelog --- libggi-2.2.2/debian/changelog +++ libggi-2.2.2/debian/changelog @@ -1,3 +1,10 @@ +libggi (1:2.2.2-5ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - - Remove svga support. + + -- Charlie Smotherman Fri, 20 Nov 2009 01:05:24 -0500 + libggi (1:2.2.2-5) unstable; urgency=low * Change arch line of correct package. @@ -14,6 +21,13 @@ -- Bradley Smith Mon, 17 Aug 2009 19:25:58 +0100 +libggi (1:2.2.2-3ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - Remove svga support. + + -- Luca Falavigna Mon, 10 Nov 2008 22:40:40 +0100 + libggi (1:2.2.2-3) unstable; urgency=low * Change maintainer email. @@ -21,6 +35,13 @@ -- Bradley Smith Sat, 08 Nov 2008 15:40:45 +0000 +libggi (1:2.2.2-2ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - Remove svga support. + + -- Luca Falavigna Sat, 08 Nov 2008 02:14:07 +0100 + libggi (1:2.2.2-2) unstable; urgency=low * Remove obsolete dependency on devfsd. @@ -28,6 +49,14 @@ -- Bradley Smith Sat, 12 Jul 2008 18:39:09 +0100 +libggi (1:2.2.2-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - Remove svga support. + - Update Maintainer field as per spec. + + -- Luca Falavigna Wed, 18 Jun 2008 13:50:25 +0200 + libggi (1:2.2.2-1) unstable; urgency=low * New Maintainer. Closes: #460145. @@ -55,6 +84,23 @@ -- Bradley Smith Sun, 08 Jun 2008 21:24:43 +0100 +libggi (1:2.2.1-5ubuntu2) intrepid; urgency=low + + * debian/control: + - Update Maintainer field as per spec (LP: #230350). + + -- Luca Falavigna Wed, 11 Jun 2008 22:09:01 +0200 + +libggi (1:2.2.1-5ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - Rip out svgalib-using package. + * Ubuntu changes dropped: + - s/CLK_TCK/CLOCKS_PER_SEC/g in programs/check/speed.c + + -- Steve Kowalik Fri, 10 Nov 2006 19:18:24 +1100 + libggi (1:2.2.1-5) unstable; urgency=medium * configure will die if the aa target is not built. @@ -68,6 +114,18 @@ -- Anibal Monsalve Salazar Tue, 17 Oct 2006 15:35:53 +1000 +libggi (1:2.2.1-4ubuntu1) edgy; urgency=low + + * Update from Debian unstable. + * Ubuntu changes: + - Rip out svgalib-using package. + - s/CLK_TCK/CLOCKS_PER_SEC/g in programs/check/speed.c + * Ubuntu changes dropped: + - libaa1-dev Build-Depends change + - Various gcc hackery, should be fixed upstream. + + -- Steve Kowalik Sat, 9 Sep 2006 23:06:13 +1000 + libggi (1:2.2.1-4) unstable; urgency=low * Fixed FTBFS on powerpc. Closes: #380163. @@ -104,6 +162,12 @@ -- Anibal Monsalve Salazar Tue, 25 Jul 2006 13:12:44 +1000 +libggi (1:2.0.5-1.2ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Gauvain Pocentek Mon, 03 Jul 2006 21:30:59 +0100 + libggi (1:2.0.5-1.2) unstable; urgency=high * Non-maintainer upload. @@ -114,6 +178,21 @@ -- Steinar H. Gunderson Sun, 4 Jun 2006 11:21:24 +0200 +libggi (1:2.0.5-1.1ubuntu2) dapper; urgency=low + + * Build-Depends: + - Remove xlibs-static-pic + - Add libxmu-dev + Closes Malone #30365 + + -- Gauvain Pocentek Sat, 6 May 2006 18:27:38 +0200 + +libggi (1:2.0.5-1.1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Michael Vogt Fri, 2 Dec 2005 14:35:41 +0100 + libggi (1:2.0.5-1.1) unstable; urgency=low * Build-depends on libaa1-dev instead of aalib1-dev (closes: bug#320881, @@ -123,6 +202,31 @@ -- Aurelien Jarno Tue, 6 Sep 2005 14:39:25 +0200 +libggi (1:2.0.5-1ubuntu4) breezy; urgency=low + + * Update build-deps to build against libaa1-dev instead of + aalib1-dev. Ubuntu #13685. + + -- Tollef Fog Heen Fri, 2 Sep 2005 13:43:53 +0200 + +libggi (1:2.0.5-1ubuntu3) breezy; urgency=low + + * Build using gcc-3.4 as a workaround (gcc PR 21497). + + -- Matthias Klose Wed, 11 May 2005 09:41:44 +0200 + +libggi (1:2.0.5-1ubuntu2) breezy; urgency=low + + * Applied amd64/gcc-4.0 patch from debian (closes: ubuntu #9020) + + -- Charles Majola Wed, 4 May 2005 20:01:44 +1000 + +libggi (1:2.0.5-1ubuntu1) hoary; urgency=low + + * Remove svgalib support entirely + + -- Matt Zimmerman Sun, 28 Nov 2004 17:59:57 -0800 + libggi (1:2.0.5-1) unstable; urgency=low * New upstream source: X-target, focus, doc, build, libtool. @@ -687,0 +792 @@ + reverted: --- libggi-2.2.2/debian/libggi-target-svgalib.install +++ libggi-2.2.2.orig/debian/libggi-target-svgalib.install @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/ggi/display/vgagl.so usr/lib/ggi/display -debian/tmp/usr/lib/ggi/display/svgalib.so usr/lib/ggi/display - diff -u libggi-2.2.2/debian/control libggi-2.2.2/debian/control --- libggi-2.2.2/debian/control +++ libggi-2.2.2/debian/control @@ -1,7 +1,8 @@ Source: libggi Section: libs Priority: optional -Maintainer: Bradley Smith +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Bradley Smith Standards-Version: 3.8.3 Build-Depends: debhelper (>= 7), quilt, libgii1-dev (>= 1:1.0.1-2), libaa1-dev, libncurses5-dev, libxxf86dga-dev, libxxf86vm-dev, libx11-dev, libxext-dev, libxt-dev, x11proto-core-dev, x11-utils, libsvga1-dev [amd64 i386], autotools-dev Homepage: http://www.ggi-project.org/ @@ -196,27 +197,6 @@ . "xlib" does no longer exist! -Package: libggi-target-svgalib -Architecture: i386 amd64 -Section: libs -Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libggi-target -Conflicts: libggi-targets-svgalib -Replaces: libggi-targets-svgalib -Enhances: libggi2 -Description: General Graphics Interface SVGAlib display target - "General Graphics Interface" - a fast, portable graphics environment. - . - This package contains the driver for the "svga" target, enabling libGGI - (and therefore any program using libGGI) to display its output on the - Linux console via SVGAlib. - . - Because SVGAlib needs direct access to hardware, any program using - it must be run SetUID root. Programs using libGGI are not normally - installed SetUID root, so you will have to arrange that if you want to - use this target. - Package: libggi-target-lcd823 Architecture: powerpc Section: libs reverted: --- libggi-2.2.2/debian/libggi-target-svgalib.manpages +++ libggi-2.2.2.orig/debian/libggi-target-svgalib.manpages @@ -1 +0,0 @@ -debian/tmp/usr/share/man/man7/display-svgalib.7