[SCM] a cuddly teddy bear (or other image) for your X desktop branch, master, updated. debian/2.2-1-3-g0e08dcb

[Andreas Tille]

The following commit has been merged in the master branch:
commit 0e08dcb7557efff547beed3d714c86967d4b7127
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 19 15:11:07 2009 +0100

    Uploaded new package hopefully fixing binutils-gold build issue; some minor cleanups

diff --git a/debian/changelog b/debian/changelog
index de2c988..c9f906e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xteddy (2.2-2) UNRELEASED; urgency=low
+xteddy (2.2-2) unstable; urgency=low
 
   * debian/copyright: Changed upstream maintainer address
+  * Adding -lXext to libraries
+    (hopefully) Closes: #556763
+  * Standards-Version: 3.8.3 (no changes needed)
+  * Build-Depends: quilt (README.source)
 
- -- Andreas Tille <tille at debian.org>  Thu, 28 May 2009 13:02:40 +0200
+ -- Andreas Tille <tille at debian.org>  Thu, 19 Nov 2009 13:54:49 +0100
 
 xteddy (2.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 14bba8f..51e25d5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6.0.7), libimlib2-dev, cdbs, pkg-config
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), libimlib2-dev, cdbs, pkg-config, quilt
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-games/xteddy.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/xteddy.git
 
diff --git a/debian/copyright b/debian/copyright
index f527858..6c7587f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,4 +20,4 @@ Copyrights vor the varios pixmaps:
 Xteddy is licensed under GPL.
 
 On Debian systems, the complete text of the GNU General Public
-Licence can be found in /usr/share/common-licenses/GPL file.
+Licence can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/10_libXext.patch b/debian/patches/10_libXext.patch
new file mode 100644
index 0000000..9e3fde1
--- /dev/null
+++ b/debian/patches/10_libXext.patch
@@ -0,0 +1,22 @@
+--- xteddy-2.2.orig/Makefile.am
++++ xteddy-2.2/Makefile.am
+@@ -7,7 +7,7 @@
+ bin_SCRIPTS = xtoys xteddy_test
+ 
+ AM_CFLAGS  = @IMLIB2_CFLAGS@
+-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11
++AM_LDFLAGS = @IMLIB2_LIBS@ -lX11 -lXext
+ 
+ DEFS = -DPIXMAP_PATH=\"@PIXMAP_PATH@\" -Wall
+ 
+--- xteddy-2.2.orig/Makefile.in
++++ xteddy-2.2/Makefile.in
+@@ -184,7 +184,7 @@
+ man_MANS = xteddy.6
+ bin_SCRIPTS = xtoys xteddy_test
+ AM_CFLAGS = @IMLIB2_CFLAGS@
+-AM_LDFLAGS = @IMLIB2_LIBS@ -lX11
++AM_LDFLAGS = @IMLIB2_LIBS@ -lX11 -lXext
+ SUBDIRS = html images
+ EXTRA_DIST = $(man_MANS)  $(bin_SCRIPTS) \
+              README xteddy.README images.credit \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5ad2ab4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_libXext.patch
diff --git a/debian/rules b/debian/rules
index d8ca4a5..ba71deb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # debian/rules for xteddy using cdbs
 # Andreas Tille <tille at debian.org>, GPL
 
-# include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 

-- 
a cuddly teddy bear (or other image) for your X desktop