[Pkg-gpe-maintainers] Ubuntu gpe-soundserver 0.4-3ubuntu1

[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: Sun, 21 Apr 2013 10:54:41 -0400
Source: gpe-soundserver
Binary: gpe-soundserver
Architecture: source
Version: 0.4-3ubuntu1
Distribution: raring
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Daniel T Chen <crimsun at ubuntu.com>
Description: 
 gpe-soundserver - start and stop the GPE sound service
Changes: 
 gpe-soundserver (0.4-3ubuntu1) raring; urgency=low
 .
   * Added missing preprocessor directives, fixing FTBFS.
Checksums-Sha1: 
 39a126620d46528e3b8c72c6c3e74c8d67ef9879 1702 gpe-soundserver_0.4-3ubuntu1.dsc
 36501328bdddc6b44286e4cdcedc07412092fb16 4044 gpe-soundserver_0.4-3ubuntu1.diff.gz
Checksums-Sha256: 
 6376538902ea754452d273cb7bdbec11fca2a7a083dd98afdf7680a833a4ca8e 1702 gpe-soundserver_0.4-3ubuntu1.dsc
 d1f2243cdbe521a625e878098ef689c67c710e8e5e8aef55f9476e9c89d3a18d 4044 gpe-soundserver_0.4-3ubuntu1.diff.gz
Files: 
 a2750571463b787a1bc0207733c8147b 1702 x11 optional gpe-soundserver_0.4-3ubuntu1.dsc
 11911237ea839d7ae21a76c425c97984 4044 x11 optional gpe-soundserver_0.4-3ubuntu1.diff.gz
Original-Maintainer: Neil Williams <codehelp at debian.org>
-------------- next part --------------
diff -pruN 0.4-3/debian/changelog 0.4-3ubuntu1/debian/changelog
--- 0.4-3/debian/changelog	2013-04-21 16:36:52.000000000 +0000
+++ 0.4-3ubuntu1/debian/changelog	2013-04-21 16:36:51.000000000 +0000
@@ -1,3 +1,9 @@
+gpe-soundserver (0.4-3ubuntu1) raring; urgency=low
+
+  * Added missing preprocessor directives, fixing FTBFS.
+
+ -- Daniel T Chen <crimsun at ubuntu.com>  Sun, 21 Apr 2013 10:54:41 -0400
+
 gpe-soundserver (0.4-3) unstable; urgency=low
 
   * Add watch file
diff -pruN 0.4-3/debian/control 0.4-3ubuntu1/debian/control
--- 0.4-3/debian/control	2013-04-21 16:36:52.000000000 +0000
+++ 0.4-3ubuntu1/debian/control	2013-04-21 16:36:51.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gpe-soundserver
 Section: x11
 Priority: optional
-Maintainer: Neil Williams <codehelp at debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Neil Williams <codehelp at debian.org>
 Uploaders: Debian GPE team <pkg-gpe-maintainers at lists.alioth.debian.org>, Moray Allan <moray at debian.org>,
  Phil Blundell <pb at debian.org>, Philippe De Swert <philippedeswert at scarlet.be>
 Build-Depends: cdbs, debhelper (>= 5), libx11-dev
diff -pruN 0.4-3/debian/patches/011-priority.patch 0.4-3ubuntu1/debian/patches/011-priority.patch
--- 0.4-3/debian/patches/011-priority.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.4-3ubuntu1/debian/patches/011-priority.patch	2013-04-21 16:36:51.000000000 +0000
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gpe-soundserver-0.4/wrapesd.c gpe-soundserver-0.4.new/wrapesd.c
+--- gpe-soundserver-0.4/wrapesd.c	2003-09-16 19:34:13.000000000 -0400
++++ gpe-soundserver-0.4.new/wrapesd.c	2013-04-21 10:56:56.408337759 -0400
+@@ -12,6 +12,8 @@
+ #include <sys/signal.h>
+ #include <stdlib.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ 
+ int
+ main (int argc, char *argv[])