--- gpppon-0.3.orig/gpppon.1
+++ gpppon-0.3/gpppon.1
@@ -1,4 +1,4 @@
-.TH gppon 1 "Version .2" "Debian GNU/Linux"
+.TH gppon 1 "Version 0.3" "Debian GNU/Linux"
 .SH NAME
 gpppon \- a graphical wrapper around pon and poff for controlling ppp
 .SH SYNOPSIS
@@ -24,8 +24,8 @@
 .SH BUGS
 This is beta software.
 .SH SEE ALSO
-pon(1), poff(1), pppconfig(8), pppd(8), /usr/doc/ppp
+pon(1), poff(1), pppconfig(8), pppd(8), /usr/share/doc/ppp
 .SH AUTHOR
 John Hasler (john@dhh.gt.org)
 .SH COPYRIGHT
-This man page may be treated as if it was in the public domain.
\ No newline at end of file
+This man page may be treated as if it was in the public domain.
--- gpppon-0.3.orig/gpppon.c
+++ gpppon-0.3/gpppon.c
@@ -41,7 +41,7 @@
 #define GPPPON "/usr/sbin/pppd"
 #endif
 
-static gchar abouttxt[] = "gpppon version 0.2 Dec 30 1999\n\
+static gchar abouttxt[] = "gpppon version 0.3 Feb 27 2009\n\
 Written by John Hasler <john@dhh.gt.org> based on\n\
 gpppwrap version 0.4, 01 Nov. 1999 by Guido Socher\n\
 (guido.s@writeme.com)\n\
--- gpppon-0.3.orig/Makefile
+++ gpppon-0.3/Makefile
@@ -11,10 +11,10 @@
 # gtk-config is usually installed together with gtk and it should
 # be used when possible:
 LIBS=`pkg-config --libs gtk+-2.0`
-INCLUDES=-I /usr/lib/glib-2.0/include -I /usr/include/glib-2.0 -I /usr/include/gtk-2.0 -I /usr/include/gdk-2.0 -I /usr/include/cairo -I /usr/include/pango-1.0 -I /usr/lib/gtk-2.0/include -I /usr/include/atk-1.0
+INCLUDES=`pkg-config --cflags gtk+-2.0`
 
 gpppon: gpppon.o
-	$(CC) -o gpppon $(LIBS) gpppon.o 
+	$(CC) -o gpppon gpppon.o $(LIBS)
 gpppon.o: gpppon.c
 	$(CC) -c $(CFLAGS) $(INCLUDES) gpppon.c
 
--- gpppon-0.3.orig/patch
+++ gpppon-0.3/patch
@@ -0,0 +1,12 @@
+--- Makefile.orig	2011-04-19 18:24:42.032513881 +0200
++++ Makefile	2011-04-19 18:25:00.132474570 +0200
+@@ -11,7 +11,7 @@
+ # gtk-config is usually installed together with gtk and it should
+ # be used when possible:
+ LIBS=`pkg-config --libs gtk+-2.0`
+-INCLUDES=-I /usr/lib/glib-2.0/include -I /usr/include/glib-2.0 -I /usr/include/gtk-2.0 -I /usr/include/gdk-2.0 -I /usr/include/cairo -I /usr/include/pango-1.0 -I /usr/lib/gtk-2.0/include -I /usr/include/atk-1.0
++INCLUDES=`pkg-config --cflags gtk+-2.0`
+ 
+ gpppon: gpppon.o
+ 	$(CC) -o gpppon $(LIBS) gpppon.o 
+
--- gpppon-0.3.orig/debian/postrm
+++ gpppon-0.3/debian/postrm
@@ -0,0 +1,38 @@
+#! /bin/sh
+# postrm script for gpppon
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+                                # update the menu system
+#        if [ -x /usr/bin/update-menus ]; then update-menus; fi
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+
--- gpppon-0.3.orig/debian/prerm
+++ gpppon-0.3/debian/prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# You may treat this program as if it was in the public domain.
+
+
+
+set -e
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \
+    -a -L /usr/doc/gpppon ]; then
+    rm -f /usr/doc/gpppon
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
--- gpppon-0.3.orig/debian/dirs
+++ gpppon-0.3/debian/dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/share
+usr/share/man
+usr/share/man/man1
--- gpppon-0.3.orig/debian/compat
+++ gpppon-0.3/debian/compat
@@ -0,0 +1,2 @@
+7
+
--- gpppon-0.3.orig/debian/copyright
+++ gpppon-0.3/debian/copyright
@@ -0,0 +1,28 @@
+This package was debianized by John Hasler <john@dhh.gt.org> on
+Fri, 31 Dec 1999 23:09:24 -0600.
+
+No ftp or Web site.
+
+Author: John Hasler <john@dhh.gt.org> 
+
+Gpppon is based on gpppwrap by Guido Socher <guido.s@writeme.com>).
+
+Copyright John Hasler 1999-2008, Guido Socher 1999.
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+ 
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in '/usr/share/common-licenses/GPL-2'.
--- gpppon-0.3.orig/debian/postinst
+++ gpppon-0.3/debian/postinst
@@ -0,0 +1,47 @@
+#! /bin/sh
+# postinst script for gpppon
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- gpppon-0.3.orig/debian/control
+++ gpppon-0.3/debian/control
@@ -0,0 +1,16 @@
+Source: gpppon
+Section: net
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: John G. Hasler <jhasler@newsguy.com>
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), libgtk2.0-dev
+
+Package: gpppon
+Architecture: any
+Depends: ${shlibs:Depends}, ppp, ${misc:Depends}
+Recommends: gksu
+Description: graphical wrapper around pon and poff
+ gpppon is an utility that reads the names of the configured providers
+ from /etc/ppp/peers and calls the pon and poff scripts with the
+ selected provider as argument.
--- gpppon-0.3.orig/debian/menu
+++ gpppon-0.3/debian/menu
@@ -0,0 +1,2 @@
+?package(gpppon):needs="X11" section="Applications/Network/Communication"\
+  title="gpppon" command="/usr/bin/gpppon"
--- gpppon-0.3.orig/debian/changelog
+++ gpppon-0.3/debian/changelog
@@ -0,0 +1,131 @@
+gpppon (0.3-2ubuntu1) oneiric; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add proper licensing information to debian/copyright.
+    - Do not say it's an applet in the Description, it isn't one.
+    - Remove deprecated dh_suidregister call.
+    - Use $(CURDIR) and dh_install in debian/rules.
+    - Add "#DEBHELPER#" to debian/prerm.
+    - Use dh_installman instead of dh_installmanpages, and use it to
+      install the manpage instead of doing it with install.
+    - Change gpppon.1 to mention version "0.3" instead of ".2", and
+      "/usr/share/doc/ppp" instead of "/usr/doc/ppp".
+    - Add "gksudo" to the .desktop file, as gpppon must run as root but
+      GTK+ doesn't support SUID; add a Recommends on gksu.
+  * Makefile: Reorder placement of libs so that the binary links
+    correctly. Fixes FTBFS. (LP: #770880)
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Wed, 14 Sep 2011 16:45:19 -0400
+
+gpppon (0.3-2) unstable; urgency=low
+
+  * Added gtk-config.
+    Used patch from Josselin Mouette.
+
+ -- John G. Hasler <jhasler@newsguy.com>  Thu, 21 Apr 2011 20:20:46 -0500
+
+gpppon (0.3-1ubuntu2) maverick; urgency=low
+
+  * Makefile: Correctly use pkg-config for gtk+-2.0 CFLAGS, fixing FTBFS
+
+ -- Iain Lane <laney@ubuntu.com>  Sun, 08 Aug 2010 11:27:00 +0100
+
+gpppon (0.3-1ubuntu1) karmic; urgency=low
+
+  * Merge with Debian unstable; remaining changes:
+     - Add proper licensing information to debian/copyright.
+     - Do not say it's an applet in the Description, it isn't one.
+     - Remove deprecated dh_suidregister call.
+     - Use $(CURDIR) and dh_install in debian/rules.
+  * Add "#DEBHELPER#" to debian/prerm.
+  * Use dh_installman instead of dh_installmanpages, and use it to
+    install the manpage instead of doing it with install.
+  * Change gpppon.1 to mention version "0.3" instead of ".2", and
+    "/usr/share/doc/ppp" instead of "/usr/doc/ppp".
+  * Add "gksudo" to the .desktop file, as gpppon must run as root but
+    GTK+ doesn't support SUID; add a Recommends on gksu.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Fri, 12 Jun 2009 12:54:54 +0200
+
+gpppon (0.3-1) unstable; urgency=low
+
+  * Ported to GTK 2.0
+  
+  Closes: Bug#515290: Depends on GTK 1.2
+
+ -- John Hasler <jhasler@debian.org>  Mon, 16 Feb 2009 11:07:23 -0600
+
+gpppon (0.2.2-1) unstable; urgency=low
+
+  * No longer Debian-native.
+
+ -- John Hasler <john@dhh.gt.org>  Sun, 10 Nov 2002 19:00:00 -0600
+
+gpppon (0.2.1-4) unstable; urgency=low
+ 
+  * Fixed segfault reported in 160431 by handling failure of opendir.
+    Left bug open because I still don't know why opendir failed.
+  * No longer Debian-native.
+  
+ -- John Hasler <john@dhh.gt.org>  Sun, 10 Nov 2002 19:00:00 -0600
+
+gpppon (0.2-4ubuntu1) hardy; urgency=low
+
+  [Lars Friedrichs]
+  * Makefile: Update to use gtk2.0 libs
+  * debian/control: Update Build-Depends to libgtk2.0-dev
+
+  [David Futcher]
+  * Add .desktop file (LP: #196870) (Thanks to Daniel Dickinson)
+  * debian/control:
+    - Bump Debian standards version to 3.7.3
+    - Update Build-Depends to debhelper >= 5
+    - Update Maintainer field to match the DebianMaintainerField specification
+    - Correct long and short descriptions
+  * debian/rules:
+    - Move DH_COMPAT to debian/compat and bump to version 5
+    - Replace 'install' with 'dh_install'
+    - Remove dh_suidregister as it is obsolete
+  * debian/copyright:
+    - Add GPL Header and Link to /usr/share/common-licenses/GPL
+    - Change "Author(s)" to "Author" to make lintian happy
+  * debian/menu:
+    - Add quotes around "section" and "needs" string to placate lintian
+    - Change section to the new "Applications/Network" format
+
+ -- David Futcher <bobbocanfly@gmail.com>  Sun, 02 Mar 2008 13:59:46 +0000
+
+gpppon (0.2-4build1) hardy; urgency=low
+
+  * Rebuild for libglib1.2 -> libglib1.2ldbl transition.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Wed, 05 Dec 2007 11:16:07 +1100
+
+gpppon (0.2.1-4) unstable; urgency=low
+ 
+  * Fixed segfault reported in 160431 by handling failure of opendir.
+    Left bug open because I still don't know why opendir failed.
+  * No longer Debian-native.
+  
+ -- John Hasler <john@dhh.gt.org>  Sun, 10 Nov 2002 19:00:00 -0600
+
+gpppon (0.2-3) unstable; urgency=low
+  
+  * Added   libgtk1.2-dev to build-dep.
+  * Closes: #127137
+  
+ -- John Hasler <john@dhh.gt.org>  Sun, 30 Dec 2001 19:00:00 -0600
+
+gpppon (0.2-2) unstable; urgency=low
+
+  * Removed spurious README.debian file.
+    Closes: #119241
+
+ -- John Hasler <john@dhh.gt.org>  Mon, 12 Nov 2001 16:00:00 -0600
+
+gpppon (0.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- John Hasler <john@dhh.gt.org>  Fri, 31 Dec 1999 23:09:24 -0600
+
--- gpppon-0.3.orig/debian/gpppon.desktop
+++ gpppon-0.3/debian/gpppon.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=GNOME PPPon
+Categories=Network;
+Comment=Start a PPP connection
+Exec=gksudo gpppon
+Icon=gnome-modem-monitor-applet
+Terminal=false
+Type=Application
--- gpppon-0.3.orig/debian/rules
+++ gpppon-0.3/debian/rules
@@ -0,0 +1,64 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) clean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# Add here commands to install the package into debian/gpppon.
+
+	dh_install gpppon usr/bin
+	dh_install debian/gpppon.desktop usr/share/applications
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installmenu
+	dh_installman gpppon.1
+	dh_installchangelogs 
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	chmod 755 $(CURDIR)/debian/gpppon/usr/bin/gpppon
+	chown root:dip $(CURDIR)/debian/gpppon/usr/bin/gpppon
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- gpppon-0.3.orig/debian/docs
+++ gpppon-0.3/debian/docs
@@ -0,0 +1 @@
+README