[Pkg-gpe-maintainers] Ubuntu gpe-shield 0.31-3ubuntu2

[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: Fri, 11 Dec 2009 23:55:28 -0500
Source: gpe-shield
Binary: gpe-shield
Architecture: source
Version: 0.31-3ubuntu2
Distribution: lucid
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Description: 
 gpe-shield - firewall configuration for GPE
Changes: 
 gpe-shield (0.31-3ubuntu2) lucid; urgency=low
 .
   * Really apply patch by Alfonso Cepeda.
    - debian/patches/040-open-mode.patch:
      open() needs mode if O_CREAT in backend.c to be build
      in GCC 4.4 (LP: #495448)
 .
 gpe-shield (0.31-3ubuntu1) lucid; urgency=low
 .
   * [FTBFS] open() needs mode if O_CREAT in backend.c to be build
     in GCC 4.4 (LP: #495448)
 .
    [Chuck Short]
    * Update maintainer according to spec.
Checksums-Sha1: 
 e366c3abfde4adb5c9fb34fb1e18193eb2a59346 1316 gpe-shield_0.31-3ubuntu2.dsc
 ea729c0d8487474d57c6647ffdb4a5326c5db6d1 15056 gpe-shield_0.31-3ubuntu2.diff.gz
Checksums-Sha256: 
 ea9c5f08bc6d9bcd1b4dd369068349263c517939ac1352e50f2c1fc8ef88bed6 1316 gpe-shield_0.31-3ubuntu2.dsc
 9b491448dee101ee1fe588a9c61bd2a9721046750853df5a250aa53463c0f0bc 15056 gpe-shield_0.31-3ubuntu2.diff.gz
Files: 
 430f358cae365d8a2e33e11a6325da32 1316 utils optional gpe-shield_0.31-3ubuntu2.dsc
 578b0a731f97bdeeb47051c509c464bd 15056 utils optional gpe-shield_0.31-3ubuntu2.diff.gz
Launchpad-Bugs-Fixed: 495448 495448
Original-Maintainer: Neil Williams <codehelp at debian.org>
-------------- next part --------------
diff -pruN 0.31-3/debian/changelog 0.31-3ubuntu2/debian/changelog
--- 0.31-3/debian/changelog	2009-12-22 22:04:36.000000000 +0000
+++ 0.31-3ubuntu2/debian/changelog	2009-12-22 22:04:35.000000000 +0000
@@ -1,3 +1,22 @@
+gpe-shield (0.31-3ubuntu2) lucid; urgency=low
+
+  * Really apply patch by Alfonso Cepeda.
+   - debian/patches/040-open-mode.patch:
+     open() needs mode if O_CREAT in backend.c to be build
+     in GCC 4.4 (LP: #495448)
+
+ -- Andrew Starr-Bochicchio <a.starr.b at gmail.com>  Fri, 11 Dec 2009 23:55:28 -0500
+
+gpe-shield (0.31-3ubuntu1) lucid; urgency=low
+
+  * [FTBFS] open() needs mode if O_CREAT in backend.c to be build
+    in GCC 4.4 (LP: #495448)
+
+   [Chuck Short]
+   * Update maintainer according to spec.
+
+ -- Alfonso Cepeda Caballos <cepeda at gmail.com>  Fri, 11 Dec 2009 12:06:18 +0000
+
 gpe-shield (0.31-3) unstable; urgency=low
 
   * wrong iptables location in init script - break install and removal
diff -pruN 0.31-3/debian/control 0.31-3ubuntu2/debian/control
--- 0.31-3/debian/control	2009-12-22 22:04:36.000000000 +0000
+++ 0.31-3ubuntu2/debian/control	2009-12-22 22:04:35.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gpe-shield
 Section: utils
 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), libgpewidget-dev, libgtk2.0-dev,
diff -pruN 0.31-3/debian/patches/040-open-mode.patch 0.31-3ubuntu2/debian/patches/040-open-mode.patch
--- 0.31-3/debian/patches/040-open-mode.patch	1970-01-01 01:00:00.000000000 +0100
+++ 0.31-3ubuntu2/debian/patches/040-open-mode.patch	2009-12-22 22:04:35.000000000 +0000
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gpe-shield-0.31/backend.c gpe-shield-0.31.new/backend.c
+--- gpe-shield-0.31/backend.c	2004-06-11 13:43:15.000000000 +0000
++++ gpe-shield-0.31.new/backend.c	2009-12-11 12:04:27.000000000 +0000
+@@ -403,7 +403,7 @@
+ 	int fh;
+ 	if (doit)
+ 	{
+-		if ((fh = open(LOADRULES_MARK,O_CREAT | O_RDWR | O_TRUNC)) < 0)
++		if ((fh = open(LOADRULES_MARK,O_CREAT | O_RDWR | O_TRUNC, S_IRUSR|S_IWUSR)) < 0)
+ 			perror("Cannot save setting.");
+ 		else
+ 			close(fh);