diff -u firestarter-1.0.3/debian/control firestarter-1.0.3/debian/control --- firestarter-1.0.3/debian/control +++ firestarter-1.0.3/debian/control @@ -1,7 +1,8 @@ Source: firestarter Section: admin Priority: optional -Maintainer: Paul Cupis +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Paul Cupis Build-Depends: debhelper (>= 5.0.51~), libgnome2-dev, libglade2-dev, libgnomeui-dev (>= 2.6.1.1-4), gettext, libpopt-dev, dpatch, autotools-dev, libxml-parser-perl, chrpath Build-Conflicts: dpatch (= 1.21) Standards-Version: 3.9.1 @@ -9,7 +10,7 @@ Package: firestarter Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, iptables (>= 1.2.11), menu, lsb-base (>=3.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, iptables (>= 1.2.11), gksu (>= 0.8.5), lsb-base (>=3.1) Suggests: dhcp3-server Description: GTK program for managing and observing your firewall Firestarter is a complete firewall tool for Linux machines. It diff -u firestarter-1.0.3/debian/changelog firestarter-1.0.3/debian/changelog --- firestarter-1.0.3/debian/changelog +++ firestarter-1.0.3/debian/changelog @@ -1,3 +1,21 @@ +firestarter (1.0.3-9ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #694413) Remaining changes: + - debian/watch: Added for uscan. (Closes: #609065) + - debian/control: Replace gksu dependency with menu to ensure that + su-to-root is available + * debian/patches/23_fix_ftbfs_binutils-gold.dpatch: fix FTBFS + binutils-gold with ld --no-add-needed by adding X11 library + in src/Makefile.* (Closes: #554370) + * debian/patches/24_fix_categories_and_path_desktop_file.dpatch: Removed + extension in icon field, change System;Application; -> System;Security; + (Closes: #611801) + * Drop two patch Ubuntu that landed in Debian: + - debian/patches/21_locales_failing.dpatch. + - debian/patches/22_remove_encoding_from_desktop.dpatch. + + -- Mahyuddin Susanto Wed, 02 Feb 2011 19:54:34 +0700 + firestarter (1.0.3-9) unstable; urgency=low * Update non-routables file from @@ -15,6 +33,14 @@ -- Paul Cupis Sun, 02 Jan 2011 20:53:16 +0000 +firestarter (1.0.3-8ubuntu1) maverick; urgency=low + + * Merge from debian testing (LP: #593012), remaining changes: + - debian/patches/21_locales_failing.dpatch + - debian/patches/22_remove_encoding_from_desktop.dpatch + + -- Roy Jamison Sat, 12 Jun 2010 11:29:56 +0100 + firestarter (1.0.3-8) unstable; urgency=low * Apologies, I thought I had uploaded this version in February. @@ -27,6 +53,47 @@ -- Paul Cupis Sat, 15 Aug 2009 13:02:39 +0100 +firestarter (1.0.3-7ubuntu5) jaunty; urgency=low + + * debian/patches/21_locales_failing.dpatch: + - Add second half of patch by Leo Cacciari (LP: #222038) + * debian/patches/22_remove_encoding_from_desktop.dpatch: + - Remove deprecated Encoding= line from .desktop file. + * debian/watch: Added watch file. + + -- Jonathan Marsden Fri, 17 Apr 2009 18:08:02 -0700 + +firestarter (1.0.3-7ubuntu4) jaunty; urgency=low + + * made looking interface settings independant from locale (LP: #222038) + + -- Leo Cacciari (TheHobbit) Thu, 09 Apr 2009 18:50:57 +0200 + +firestarter (1.0.3-7ubuntu3) jaunty; urgency=low + + * Replace gksu dependency with menu to ensure that su-to-root is available + (LP: #301603). + + -- Iain Lane Mon, 23 Mar 2009 21:29:25 +0000 + +firestarter (1.0.3-7ubuntu2) jaunty; urgency=low + + [ Gabriel Ruiz Manzano ] + * 25_gksu.patch was deleted because it wasn't needed. (LP: #301603) + + [ Iain Lane ] + * debian/control: Add libglade2-dev to build-deps - needed to build + correctly + + -- Gabriel Ruiz Manzano Tue, 24 Feb 2009 22:17:20 -0300 + +firestarter (1.0.3-7ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches/21-gksu.dpatch: use gksu instead of su-to-root. + + -- Luca Falavigna Tue, 04 Nov 2008 22:58:54 +0100 + firestarter (1.0.3-7) unstable; urgency=low * Change menu/desktop file to use su-to-root instead of gksu @@ -46,6 +113,37 @@ -- Paul Cupis Sat, 13 Sep 2008 21:14:27 +0100 +firestarter (1.0.3-6ubuntu4) intrepid; urgency=low + + * debian/patches/19_update_it_po.dpatch: + - Updated italian translation by Milo Casagrande (LP: #198834). + + -- Luca Falavigna Wed, 04 Jun 2008 22:27:52 +0200 + +firestarter (1.0.3-6ubuntu3) hardy; urgency=low + + * debian/patches/18_fix_memleak.dpatch: + - Even more memory leaks added into patch 18 (LP: #120445). + + -- Rob Neild Wed, 09 Apr 2008 23:50:18 +0100 + +firestarter (1.0.3-6ubuntu2) hardy; urgency=low + + * debian/patches/18_fix_memleak.dpatch: + - Free allocated memory properly, patch by RobNeild (LP: #120445). + + -- Matti Lindell Thu, 31 Jan 2008 20:44:24 +0200 + +firestarter (1.0.3-6ubuntu1) gutsy; urgency=low + + * Merge from Debian Unstable, Ubuntu remaining changes: (LP: #132039) + + Adhere to DebianMaintainerField + + debian/rules: call [ ! -f Makefile ] || $(MAKE) distclean instead of + -$(MAKE) distclean + + 11_desktop_file.dpatch: updated to make desktop-file-validate happy. + + -- Lionel Le Folgoc Fri, 31 Aug 2007 19:22:27 +0200 + firestarter (1.0.3-6) unstable; urgency=low * Recover lsb-base dependency lost in last update. @@ -63,6 +161,20 @@ -- Paul Cupis Fri, 24 Aug 2007 16:35:24 +0100 +firestarter (1.0.3-5ubuntu1) gutsy; urgency=low + + * Merge from Debian Unstable, Ubuntu remaining changes: + + debian/postinst: use /bin/bash instead of /bin/sh (possible bashism) + + Don't run browser as root (closes Ubuntu #569) + + Adhere to DebianMaintainerField + + 11_desktop_file.dpatch: updated to make desktop-file-validate happy + + 17_update_docs_uri.dpatch: updated to apply cleanly + + debian/rules: call [ ! -f Makefile ] || $(MAKE) distclean instead of + -$(MAKE) distclean. + * debian/control: add missing lsb-base (>= 3.1) dependency. + + -- Lionel Le Folgoc Tue, 07 Aug 2007 21:14:28 +0200 + firestarter (1.0.3-5) unstable; urgency=low * Fix typo in init script, thanks to Andrea Vettorello (closes: #436196) @@ -70,6 +182,21 @@ -- Paul Cupis Mon, 06 Aug 2007 19:19:42 +0100 +firestarter (1.0.3-4ubuntu1) gutsy; urgency=low + + * Merge from Debian Unstable, Ubuntu remaining changes: + + debian/postinst: use /bin/bash instead of /bin/sh (possible bashism) + + Don't run browser as root (closes Ubuntu #569) + + Adhere to DebianMaintainerField. + * Drop ubuntu changes from 1.0.3-2ubuntu2 and use debian solution instead. + * debian/patches/ + + 11_desktop_file.dpatch: updated to make desktop-file-validate happy + + 17_update_docs_uri.dpatch: updated to apply cleanly. + * debian/rules: call [ ! -f Makefile ] || $(MAKE) distclean instead of + -$(MAKE) distclean. + + -- Lionel Le Folgoc Mon, 06 Aug 2007 22:43:00 +0200 + firestarter (1.0.3-4) unstable; urgency=low * Actually change the Maintainer field - oops. @@ -92,6 +219,31 @@ -- Paul Cupis Sun, 05 Aug 2007 10:11:03 +0100 +firestarter (1.0.3-2ubuntu2) gutsy; urgency=low + + * LP: #42759 + - debian/firestarter.NetworkManagerDispatcher: script to let NetworkManager + start/stop the firewall when the interface goes up/down + - debian/control: suggests network-manager + - debian/rules: installs firestarter.NetworkManagerDispatcher to + /etc/NetworkManager/dispatcher.d/50firestarter + + -- Lionel Le Folgoc Sun, 20 May 2007 12:01:00 +0200 + +firestarter (1.0.3-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable. (fixes removal/purge issue, see LP: #83728) + * Remaining Ubuntu changes: + + Add "GNOME" to .desktop Categories (closes Ubuntu #42452, #42501) + + Don't run browser as root (closes Ubuntu #569) + + debian/firestarter.init: apply patch from Daniel Robitaille adding + lsb-base functions. Thanks also to Lionel Le Folgoc for taking note of + this. (Closes: Malone #34217) + * Adhere to DebianMaintainerField. + * debian/postinst: use /bin/bash instead of /bin/sh (possible bashism). + + -- Lionel Le Folgoc Tue, 10 Apr 2007 11:52:55 +0200 + firestarter (1.0.3-2) unstable; urgency=low * Fix postrm script on purge (closes: #303973, #338550, #375189) @@ -107,6 +259,37 @@ -- Yann Verley Tue, 13 Feb 2007 23:30:42 +0100 +firestarter (1.0.3-1.3ubuntu2) feisty; urgency=low + + * debian/control: + - Add a suggest on dhcp3-server since it's functionality + is on upstreams key features list. + * debian/patches/02_*.dpatch: + - Detect dhcp3 in use via dhcpd.confs location rather than + /etc/dhcp3 existing. dhcp3-client have that directory. + - Added patch to look for and restart dhcp3-server as well. + + Closes: #48006 + + -- Christian Bjälevik Fri, 5 Jan 2007 16:01:50 +0100 + +firestarter (1.0.3-1.3ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + + Changes retained from 1.0.3-1.2ubuntu2 + * Add "GNOME" to .desktop Categories (closes Ubuntu #42452, #42501) + * Don't run browser as root (closes Ubuntu #569) + + Changes retained from 1.0.3-1.1ubuntu[3-4] + * debian/patches/12_firestarter_transparent_icon.dpatch + + Added transparency support. (Closes: Malone #44254) + * debian/firestarter.init: + + Apply patch from Daniel Robitaille adding lsb-base functions. Thanks + also to Lionel Le Folgoc for taking note of this. (Closes: Malone + #34217) + + -- Padmanabhan Palanivelu Fri, 22 Dec 2006 20:30:51 +0530 + firestarter (1.0.3-1.3) unstable; urgency=low * NMU @@ -115,6 +298,25 @@ -- Clint Adams Sun, 10 Sep 2006 16:35:48 -0400 +firestarter (1.0.3-1.2ubuntu3) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Wed, 30 Aug 2006 21:47:43 +0200 + +firestarter (1.0.3-1.2ubuntu2) edgy; urgency=low + + * Add "GNOME" to .desktop Categories (closes Ubuntu #42452, #42501) + * Don't run browser as root (closes Ubuntu #569) + + -- Vassilis Pandis Sat, 12 Aug 2006 04:31:15 +0300 + +firestarter (1.0.3-1.2ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + + -- Jeremie Corbier Tue, 25 Jul 2006 10:55:21 +0000 + firestarter (1.0.3-1.2) unstable; urgency=low * Non-maintainer upload. @@ -123,6 +325,34 @@ -- Josselin Mouette Sun, 18 Jun 2006 12:20:59 +0200 +firestarter (1.0.3-1.1ubuntu4) dapper; urgency=low + + * debian/patches/12_firestarter_transparent_icon.dpatch + + Added transparency support. (Closes: Malone #44254) + + -- Chuck Short Mon, 15 May 2006 20:05:12 -0400 + +firestarter (1.0.3-1.1ubuntu3) dapper; urgency=low + + * debian/firestarter.init: + + Apply patch from Daniel Robitaille adding lsb-base functions. Thanks + also to Lionel Le Folgoc for taking note of this. (Closes: Malone + #34217) + + -- Zak B. Elep Sun, 7 May 2006 06:03:01 -0400 + +firestarter (1.0.3-1.1ubuntu2) dapper; urgency=low + + * Modify desktop file to use gksu (Closes Malone: #5269) + + -- Barry deFreese Sat, 8 Apr 2006 00:18:54 -0400 + +firestarter (1.0.3-1.1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Andrew Mitchell Sat, 28 May 2005 12:09:05 +1200 + firestarter (1.0.3-1.1) unstable; urgency=high * Non-maintainer upload. @@ -142,6 +372,18 @@ -- Yann Verley Sun, 30 Jan 2005 20:29:42 +0100 +firestarter (1.0.1-1ubuntu2) hoary; urgency=low + + * Rebuild without libhowl0 + + -- Jani Monoses Sun, 13 Mar 2005 13:49:16 +0200 + +firestarter (1.0.1-1ubuntu1) hoary; urgency=low + + * gksu -> gksudo + + -- Michael Vogt Wed, 29 Dec 2004 19:56:36 +0100 + firestarter (1.0.1-1) unstable; urgency=low * New upstream release (closes: #284109) @@ -454,0 +697 @@ + diff -u firestarter-1.0.3/debian/patches/00list firestarter-1.0.3/debian/patches/00list --- firestarter-1.0.3/debian/patches/00list +++ firestarter-1.0.3/debian/patches/00list @@ -20,0 +21,2 @@ +23_fix_ftbfs_binutils-gold +24_fix_categories_and_path_desktop_file only in patch2: unchanged: --- firestarter-1.0.3.orig/debian/watch +++ firestarter-1.0.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/firestarter/firestarter-(.+)\.tar\.gz only in patch2: unchanged: --- firestarter-1.0.3.orig/debian/patches/24_fix_categories_and_path_desktop_file.dpatch +++ firestarter-1.0.3/debian/patches/24_fix_categories_and_path_desktop_file.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: Removed extension in icon field, change System;Application; -> System;Security; +## Author: Mahyuddin Susanto +## Bug-Debian: http://bugs.debian.org/611801 + +@DPATCH@ +diff -urNad firestarter-1.0.3-9ubuntu1.broken~/firestarter.desktop.in firestarter-1.0.3-9ubuntu1.broken/firestarter.desktop.in +--- firestarter-1.0.3-9ubuntu1.broken~/firestarter.desktop.in 2011-01-28 00:43:47.287666062 +0700 ++++ firestarter-1.0.3-9ubuntu1.broken/firestarter.desktop.in 2011-01-28 00:44:13.807679778 +0700 +@@ -2,10 +2,10 @@ + _Name=Firestarter + _Comment=Desktop Firewall Tool + Exec=su-to-root -X -c /usr/sbin/firestarter +-Icon=firestarter.png ++Icon=firestarter + Terminal=false + Type=Application + StartupNotify=true +-Categories=System;GNOME;Network;Settings; ++Categories=System;Security; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=firestarter only in patch2: unchanged: --- firestarter-1.0.3.orig/debian/patches/23_fix_ftbfs_binutils-gold.dpatch +++ firestarter-1.0.3/debian/patches/23_fix_ftbfs_binutils-gold.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Description: Fix FTBFS binutils-gold wih ld --no-add-needed by adding X11 library in src/Makefile.* +## Bug-Ubuntu: https://launchpad.net/bugs/694413 +## Bug-Debian: http://bugs.debian.org/554370 +## Author: Mahyuddin Susanto + +@DPATCH@ +diff -urNad firestarter-1.0.3-9ubuntu1~/src/Makefile.am firestarter-1.0.3-9ubuntu1/src/Makefile.am +--- firestarter-1.0.3-9ubuntu1~/src/Makefile.am 2011-01-04 20:18:31.000000000 +0700 ++++ firestarter-1.0.3-9ubuntu1/src/Makefile.am 2011-01-21 01:30:53.242652380 +0700 +@@ -53,6 +53,6 @@ + glade_DATA = \ + preferences.glade + +-firestarter_LDADD = @FIRESTARTER_LIBS@ ++firestarter_LDADD = @FIRESTARTER_LIBS@ -lX11 + + EXTRA_DIST = $(glade_DATA) +diff -urNad firestarter-1.0.3-9ubuntu1~/src/Makefile.in firestarter-1.0.3-9ubuntu1/src/Makefile.in +--- firestarter-1.0.3-9ubuntu1~/src/Makefile.in 2011-01-04 20:18:31.000000000 +0700 ++++ firestarter-1.0.3-9ubuntu1/src/Makefile.in 2011-01-21 01:30:42.788605283 +0700 +@@ -183,7 +183,7 @@ + preferences.glade + + +-firestarter_LDADD = @FIRESTARTER_LIBS@ ++firestarter_LDADD = @FIRESTARTER_LIBS@ -lX11 + + EXTRA_DIST = $(glade_DATA) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs