[Pkg-gpe-maintainers] Ubuntu gpe-taskmanager 0.20-8ubuntu1

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Mon, 10 Jan 2011 04:56:55 +0000
Source: gpe-taskmanager
Binary: gpe-taskmanager
Architecture: source
Version: 0.20-8ubuntu1
Distribution: natty
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Mahyuddin Susanto <udienz at gmail.com>
Description: 
 gpe-taskmanager - lists windows and kills errant programs
Launchpad-Bugs-Fixed: 700446
Changes: 
 gpe-taskmanager (0.20-8ubuntu1) natty; urgency=low
 .
   * Makefile: fix FTBFS with binutils-gold by adding -lX11 to LDFLAGS
    (LP: #700446)
Checksums-Sha1: 
 57aeb6488d27485d43e07919f2c2747f2d5db33f 1393 gpe-taskmanager_0.20-8ubuntu1.dsc
 d11afa5b9d06a7f2a7789809765f85091ae1d4c1 2993 gpe-taskmanager_0.20-8ubuntu1.diff.gz
Checksums-Sha256: 
 a936626fdef8fc25ca7833c4cb9dacd7b6a68b3028bb639bed8e330bb22222d8 1393 gpe-taskmanager_0.20-8ubuntu1.dsc
 53056faceab3c008b006d6225cc774e6fdf19e04f130010ef6bf563a659ab836 2993 gpe-taskmanager_0.20-8ubuntu1.diff.gz
Files: 
 3cf7368993c840780b47497873577369 1393 utils optional gpe-taskmanager_0.20-8ubuntu1.dsc
 6db5ca8f15d822beb14a92a4297f912a 2993 utils optional gpe-taskmanager_0.20-8ubuntu1.diff.gz
Original-Maintainer: Moray Allan <moray at debian.org>
-------------- next part --------------
diff -pruN 0.20-8/debian/changelog 0.20-8ubuntu1/debian/changelog
--- 0.20-8/debian/changelog	2011-01-10 09:01:28.000000000 +0000
+++ 0.20-8ubuntu1/debian/changelog	2011-01-10 09:01:28.000000000 +0000
@@ -1,3 +1,10 @@
+gpe-taskmanager (0.20-8ubuntu1) natty; urgency=low
+
+  * Makefile: fix FTBFS with binutils-gold by adding -lX11 to LDFLAGS
+   (LP: #700446)
+
+ -- Mahyuddin Susanto <udienz at gmail.com>  Mon, 10 Jan 2011 04:56:55 +0000
+
 gpe-taskmanager (0.20-8) unstable; urgency=low
 
   * Add Homepage field in control file.
diff -pruN 0.20-8/debian/control 0.20-8ubuntu1/debian/control
--- 0.20-8/debian/control	2011-01-10 09:01:28.000000000 +0000
+++ 0.20-8ubuntu1/debian/control	2011-01-10 09:01:28.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gpe-taskmanager
 Section: utils
 Priority: optional
-Maintainer: Moray Allan <moray at debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Moray Allan <moray at debian.org>
 Uploaders: Debian GPE team <pkg-gpe-maintainers at lists.alioth.debian.org>, Phil Blundell <pb at debian.org>, Philippe De Swert <philippedeswert at scarlet.be>, Neil Williams <codehelp at debian.org>
 Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.0.0), libgpewidget-dev, libgpelaunch-dev, intltool
 Standards-Version: 3.7.3
diff -pruN 0.20-8/Makefile 0.20-8ubuntu1/Makefile
--- 0.20-8/Makefile	2011-01-10 09:01:28.000000000 +0000
+++ 0.20-8ubuntu1/Makefile	2011-01-10 09:01:28.000000000 +0000
@@ -11,7 +11,7 @@ MEMBERS = gpe-taskmanager
 
 PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
 PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
-PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -lgpelaunch
+PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -lgpelaunch -lX11
 
 .SUFFIXES: .d