--- gadmin-openvpn-server-0.1.5.orig/debian/compat
+++ gadmin-openvpn-server-0.1.5/debian/compat
@@ -0,0 +1 @@
+7
--- gadmin-openvpn-server-0.1.5.orig/debian/gadmin-openvpn-server.manpages
+++ gadmin-openvpn-server-0.1.5/debian/gadmin-openvpn-server.manpages
@@ -0,0 +1 @@
+debian/manpages/*
--- gadmin-openvpn-server-0.1.5.orig/debian/rules
+++ gadmin-openvpn-server-0.1.5/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+%:
+	dh --with quilt ${@}
+
+override_dh_auto_clean:
+	dh_auto_clean
+
+	rm -f config.guess config.sub
+	rm -f po/*.gmo
+
+override_dh_auto_configure:
+	cp -f /usr/share/misc/config.guess .
+	cp -f /usr/share/misc/config.sub .
+
+	OPENVPN_AUTH_PAM_PLUGIN="/usr/lib/openvpn/openvpn-pam-auth.so" SYSINIT_START_CMD="update-rc.d -f openvpn defaults" SYSINIT_STOP_CMD="update-rc.d -f openvpn remove" dh_auto_configure -- --exec-prefix=/usr --sbindir=/usr/sbin --sysconfdir=/etc --localstatedir=/var
+
+override_dh_auto_install:
+	$(MAKE) DESTDIR=$(CURDIR)/debian/gadmin-openvpn-server install
+
+	# Removing useless files
+	rm -rf debian/gadmin-openvpn-server/usr/share/icons/gadmin-openvpn-server
+
+	rm -f debian/gadmin-openvpn-server/usr/share/doc/gadmin-openvpn-server/AUTHORS
+	rm -f debian/gadmin-openvpn-server/usr/share/doc/gadmin-openvpn-server/ChangeLog
+	rm -f debian/gadmin-openvpn-server/usr/share/doc/gadmin-openvpn-server/COPYING
+	rm -f debian/gadmin-openvpn-server/usr/share/doc/gadmin-openvpn-server/README
+
+override_dh_strip:
+	dh_strip --dbg-package=gadmin-openvpn-server-dbg
--- gadmin-openvpn-server-0.1.5.orig/debian/control
+++ gadmin-openvpn-server-0.1.5/debian/control
@@ -0,0 +1,28 @@
+Source: gadmin-openvpn-server
+Section: admin
+Priority: optional
+Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50~), autotools-dev, libgtk2.0-dev, quilt (>= 0.46-7)
+Standards-Version: 3.9.1
+Homepage: http://www.gadmintools.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=gadmintools/gadmin-openvpn-server.git
+Vcs-Git: git://git.debian-maintainers.org/git/gadmintools/gadmin-openvpn-server.git
+
+Package: gadmin-openvpn-server
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, menu, openvpn
+Description: GTK+ configuration tool for openvpn (server)
+ gadmin-openvpn-server is a fast and easy to use GTK+ administration tool for
+ the OpenVPN server.
+
+Package: gadmin-openvpn-server-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, gadmin-openvpn-server (= ${binary:Version})
+Description: GTK+ configuration tool for openvpn (debug for server)
+ gadmin-openvpn-server is a fast and easy to use GTK+ administration tool for
+ the OpenVPN server.
+ .
+ This package contains the debugging symbols.
--- gadmin-openvpn-server-0.1.5.orig/debian/gadmin-openvpn-server.postinst
+++ gadmin-openvpn-server-0.1.5/debian/gadmin-openvpn-server.postinst
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	configure)
+		mkdir -p /var/log/gadmin-openvpn/server
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+
+		;;
+
+	*)
+		echo "postinst called with unknown argument \`${1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- gadmin-openvpn-server-0.1.5.orig/debian/gadmin-openvpn-server.install
+++ gadmin-openvpn-server-0.1.5/debian/gadmin-openvpn-server.install
@@ -0,0 +1,2 @@
+desktop/*		/usr/share/applications
+debian/pixmaps/*	/usr/share/pixmaps
--- gadmin-openvpn-server-0.1.5.orig/debian/gadmin-openvpn-server.postrm
+++ gadmin-openvpn-server-0.1.5/debian/gadmin-openvpn-server.postrm
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	purge)
+		rm -rf /var/log/gadmin-openvpn/server
+		rmdir --ignore-fail-on-non-empty /var/log/gadmin-openvpn
+		;;
+
+	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+		;;
+
+	*)
+		echo "postrm called with unknown argument \`${1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- gadmin-openvpn-server-0.1.5.orig/debian/changelog
+++ gadmin-openvpn-server-0.1.5/debian/changelog
@@ -0,0 +1,138 @@
+gadmin-openvpn-server (0.1.5-3.1) unstable; urgency=low
+
+  * QA upload.
+  * Revert all changes made in the previous upload... except the orphaning.
+  * Fix "03-logfiles.patch" which was introduced to move logfiles from /etc
+    to /var/log (Closes: #602869).
+
+ -- Mehdi Dogguy <mehdi@debian.org>  Wed, 01 Dec 2010 17:06:16 +0100
+
+gadmin-openvpn-server (0.1.5-3) unstable; urgency=low
+
+  * Removing vcs fields.
+  * Updating standards version to 3.9.1.
+  * Updating debhelper version to 8.0.
+  * Switching to dpkg source format 3.0 (quilt).
+  * Simplifying autotools-dev handling in rules.
+  * Orphaning package.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 28 Nov 2010 20:18:21 +0100
+
+gadmin-openvpn-server (0.1.5-2) unstable; urgency=low
+
+  * Updating standards version to 3.9.0.
+  * Adding patch to move logfiles to /var/log (Closes: #602869).
+  * Updating standards version to 3.9.1.
+  * Updating logfiles.patch.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 20 Nov 2010 16:37:36 +0100
+
+gadmin-openvpn-server (0.1.5-1) unstable; urgency=low
+
+  * Merging upstream version 0.1.5.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 15 Mar 2010 18:41:32 +0100
+
+gadmin-openvpn-server (0.1.4-1) unstable; urgency=low
+
+  * Merging upstream version 0.1.4.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 15 Mar 2010 07:58:07 +0100
+
+gadmin-openvpn-server (0.1.3-1) unstable; urgency=low
+
+  * Updating year in copyright file.
+  * Updating to standards 3.8.4.
+  * Merging upstream version 0.1.3.
+  * Making build-depends on quilt versioned.
+  * Updating year in copyright file.
+  * Sorting dh call in rules to more common order.
+  * Updating year and version in manpage.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 14 Mar 2010 12:12:58 +0100
+
+gadmin-openvpn-server (0.1.2-1) unstable; urgency=low
+
+  * Merging upstream version 0.1.2.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 14 Dec 2009 09:03:10 +0100
+
+gadmin-openvpn-server (0.1.1-2) unstable; urgency=low
+
+  * Adjusting openvpn auth pam plugin location (Closes: #560737).
+  * Updating README.source.
+  * Adding explicit debian source version 1.0 until switch to 3.0.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 12 Dec 2009 07:42:04 +0100
+
+gadmin-openvpn-server (0.1.1-1) unstable; urgency=low
+
+  * Adding maintainer homepage field to control.
+  * Marking maintainer homepage field to be also included in binary
+    packages and changelog.
+  * Adding README.source.
+  * Bumping version build-depends on debhelper.
+  * Simplifying autotools handling in rules.
+  * Merging upstream version 0.1.1.
+  * Moving upstream maintainer field from control to copyright.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 16 Nov 2009 20:55:37 +0100
+
+gadmin-openvpn-server (0.1.0-1) unstable; urgency=low
+
+  * Merging upstream version 0.1.0.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 22 Aug 2009 14:55:57 +0200
+
+gadmin-openvpn-server (0.0.9-4) unstable; urgency=low
+
+  * Correcting error in rules file when passing extra arguments to
+    dh_auto_configure.
+  * Updating maintainer field.
+  * Updating vcs fields.
+  * Updating package to standards version 3.8.3.
+  * Sorting depends.
+  * Adding stuff in rules that doesn't get done by dh automatically
+    (Closes: #539329).
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 20 Aug 2009 09:23:45 +0200
+
+gadmin-openvpn-server (0.0.9-3) unstable; urgency=low
+
+  * Adding debug package.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 27 Jul 2009 16:09:10 +0200
+
+gadmin-openvpn-server (0.0.9-2) unstable; urgency=low
+
+  * Minimizing rules file.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 27 Jul 2009 16:01:28 +0200
+
+gadmin-openvpn-server (0.0.9-1) unstable; urgency=low
+
+  * Merging upstream version 0.0.9.
+  * Sorting autotools-foo in rules file.
+  * Removing useless whitespaces.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 20 Jul 2009 10:43:18 +0200
+
+gadmin-openvpn-server (0.0.8-1) unstable; urgency=low
+
+  * Merging upstream version 0.0.8.
+  * Prefixing debhelper files with package name.
+  * Using quilt rather than dpatch.
+  * Updating year in copyright file.
+  * Updating package to standards version 3.8.2.
+  * Updating rules file to current state of the art.
+  * Using debhelper install file to install aditional files, rather than
+    doing it manual in rules.
+  * Completing menu file with longtitle and description.
+
+ -- Daniel Baumann <daniel@debian.org>  Tue, 07 Jul 2009 15:42:03 +0200
+
+gadmin-openvpn-server (0.0.7-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 16 Nov 2008 08:35:00 +0100
--- gadmin-openvpn-server-0.1.5.orig/debian/gadmin-openvpn-server.menu
+++ gadmin-openvpn-server-0.1.5/debian/gadmin-openvpn-server.menu
@@ -0,0 +1,4 @@
+?package(gadmin-openvpn-server):needs="X11" section="Applications/System/Administration"\
+  title="gadmin-openvpn-server" longtitle="GTK+ configuration tool for openvpn (server)"\
+  description="gadmin-openvpn-server is a fast and easy to use GTK+ administration tool for the OpenVPN server."\
+  command="/usr/sbin/gadmin-openvpn-server" icon="/usr/share/pixmaps/gadmin-openvpn-server.xpm"
--- gadmin-openvpn-server-0.1.5.orig/debian/copyright
+++ gadmin-openvpn-server-0.1.5/debian/copyright
@@ -0,0 +1,42 @@
+Upstream-Contact: Magnus Loef <magnus-swe@telia.com>
+Upstream-Homepage: http://www.gadmintools.org/
+Maintainer-Contact: Debian Gadmintools Maintainers <gadmintools@lists.debian-maintainers.org>
+Maintainer-Homepage: http://gadmintools.debian-maintainers.org/
+
+Files: *
+Copyright: (C) 2008-2010 Magnus Loef <magnus-swe@telia.com>
+License: GPL-3+
+ This program 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, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: debian/*
+Copyright: (C) 2008-2010 Daniel Baumann <daniel@debian.org>
+License: GPL-3+
+ This program 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, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-3 file.
--- gadmin-openvpn-server-0.1.5.orig/debian/README.source
+++ gadmin-openvpn-server-0.1.5/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+  $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+  $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+  $ QUILT_PATCHES=debian/patches quilt push -a
+
+More information about Quilt can be found in the quilt package.
--- gadmin-openvpn-server-0.1.5.orig/debian/manpages/gadmin-openvpn-server.8
+++ gadmin-openvpn-server-0.1.5/debian/manpages/gadmin-openvpn-server.8
@@ -0,0 +1,21 @@
+.TH GADMIN\-OPENVPN\-SERVER 8 "2010\-03\-14" "0.1.3" "openvpn (server) configuration tool"
+
+.SH NAME
+gadmin\-openvpn\-server \- GTK+ configuration tool for openvpn (server)
+
+.SH SYNOPSIS
+\fBgadmin\-openvpn\-server\fR
+
+.SH DESCRIPTION
+gadmin\-openvpn\-server is a fast and easy to use GTK+ administration tool for the OpenVPN server.
+
+.SH OPTIONS
+gadmin\-openvpn\-server has no options.
+
+.SH HOMEPAGE
+More information about gadmin\-openvpn\-server and the gadmintools project can be found at <\fIhttp://www.gadmintools.org/\fR>.
+
+.SH AUTHOR
+gadmin\-openvpn\-server was written by Magnus Loef <\fImagnus-swe@telia.com\fR>.
+.PP
+This manual page was written by Daniel Baumann <\fIdaniel@debian.org\fR>, for the Debian project (but may be used by others).
--- gadmin-openvpn-server-0.1.5.orig/debian/source/format
+++ gadmin-openvpn-server-0.1.5/debian/source/format
@@ -0,0 +1 @@
+1.0
--- gadmin-openvpn-server-0.1.5.orig/debian/patches/03-logfiles.patch
+++ gadmin-openvpn-server-0.1.5/debian/patches/03-logfiles.patch
@@ -0,0 +1,60 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Move logfiles to /var/log (Closes: #602869).
+
+--- a/src/apply_server_settings.c
++++ b/src/apply_server_settings.c
+@@ -448,8 +448,8 @@
+     "group ", server_group, "\n",
+     "persist-key\n",
+     "persist-tun\n",
+-    "log    /etc/gadmin-openvpn/server/openvpn-server.log\n",
+-    "status /etc/gadmin-openvpn/server/openvpn-server-status.log\n",
++    "log    /var/log/gadmin-openvpn/server/openvpn-server.log\n",
++    "status /var/log/gadmin-openvpn/server/openvpn-server-status.log\n",
+     "verb ", log_level, "\n",
+     "mute 20\n",
+     client_dns_line,
+@@ -506,8 +506,8 @@
+     "group ", server_group, "\n",
+     "persist-key\n",
+     "persist-tun\n",
+-    "log    /etc/gadmin-openvpn/client/openvpn-client.log\n",
+-    "status /etc/gadmin-openvpn/client/openvpn-client-status.log\n",
++    "log    /var/log/gadmin-openvpn/client/openvpn-client.log\n",
++    "status /var/log/gadmin-openvpn/client/openvpn-client-status.log\n",
+     "verb ", log_level, "\n",
+     "mute 20\n",
+     "ping 10\n",
+--- a/src/clear_log_tab.c
++++ b/src/clear_log_tab.c
+@@ -36,7 +36,7 @@
+ {
+     /* Clears the VPN server log */
+     FILE *fp;
+-    gchar *log_path = g_strdup_printf("%s/server/openvpn-server.log", OPENVPN_SYSCONF_DIR);
++    gchar *log_path = g_strdup_printf("/var/log/gadmin-openvpn/server/openvpn-server.log");
+ 
+     if((fp=fopen(log_path, "w+"))==NULL)
+     {
+--- a/src/populate_conn_tab.c
++++ b/src/populate_conn_tab.c
+@@ -46,7 +46,7 @@
+ 
+     gtk_list_store_clear(widgets->conn_store);
+ 
+-    log_path = g_strdup_printf("%s/server/openvpn-server-status.log", OPENVPN_SYSCONF_DIR);
++    log_path = g_strdup_printf("/var/log/gadmin-openvpn/server/openvpn-server-status.log");
+ 
+     if((fp=fopen(log_path, "r"))==NULL) 
+     {
+--- a/src/populate_log_tab.c
++++ b/src/populate_log_tab.c
+@@ -46,7 +46,7 @@
+ 
+     gtk_list_store_clear(widgets->log_store);
+ 
+-    log_path = g_strdup_printf("%s/server/openvpn-server.log", OPENVPN_SYSCONF_DIR);
++    log_path = g_strdup_printf("/var/log/gadmin-openvpn/server/openvpn-server.log");
+ 
+     if((fp=fopen(log_path, "r"))==NULL) 
+     {
--- gadmin-openvpn-server-0.1.5.orig/debian/patches/01-icondir.patch
+++ gadmin-openvpn-server-0.1.5/debian/patches/01-icondir.patch
@@ -0,0 +1,87 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Adjusts icon directory.
+
+diff -Naurp gadmin-openvpn-server.orig/Makefile.am gadmin-openvpn-server/Makefile.am
+--- gadmin-openvpn-server.orig/Makefile.am	2008-09-23 16:38:31.000000000 +0000
++++ gadmin-openvpn-server/Makefile.am	2008-11-16 08:09:15.000000000 +0000
+@@ -10,15 +10,15 @@ EXTRA_DIST = \
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+ 	if test -d $(srcdir)/pixmaps; then \
+-	   $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
++	   $(mkinstalldirs) $(DESTDIR)$(datadir)/icons; \
+ 	   for pixmap in $(srcdir)/pixmaps/*; do \
+ 	     if test -f $$pixmap; then \
+-	        $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
++	        $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/icons; \
+ 	     fi \
+ 	   done \
+ 	fi;
+-	if test -d $(DESTDIR)$(datadir)/pixmaps; then \
+-	   cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/pixmaps/; \
++	if test -d $(DESTDIR)$(datadir)/icons; then \
++	   cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/icons/; \
+ 	fi;
+ 	if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gadmin-openvpn-server; then \
+ 	   ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gadmin-openvpn-server; \
+@@ -55,10 +55,10 @@ install-data-local:
+ 
+ dist-hook:
+ 	if test -d pixmaps; then \
+-	  mkdir $(DESTDIR)$(distdir)/pixmaps; \
++	  mkdir $(DESTDIR)$(distdir)/icons; \
+ 	  for pixmap in pixmaps/*; do \
+ 	    if test -f $$pixmap; then \
+-	      cp -p $$pixmap $(DESTDIR)$(distdir)/pixmaps; \
++	      cp -p $$pixmap $(DESTDIR)$(distdir)/icons; \
+ 	    fi \
+ 	  done \
+ 	fi
+diff -Naurp gadmin-openvpn-server.orig/Makefile.in gadmin-openvpn-server/Makefile.in
+--- gadmin-openvpn-server.orig/Makefile.in	2008-11-11 22:06:24.000000000 +0000
++++ gadmin-openvpn-server/Makefile.in	2008-11-16 08:08:49.000000000 +0000
+@@ -636,15 +636,15 @@ uninstall-am:
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+ 	if test -d $(srcdir)/pixmaps; then \
+-	   $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
++	   $(mkinstalldirs) $(DESTDIR)$(datadir)/icons; \
+ 	   for pixmap in $(srcdir)/pixmaps/*; do \
+ 	     if test -f $$pixmap; then \
+-	        $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-server; \
++	        $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/icons; \
+ 	     fi \
+ 	   done \
+ 	fi;
+-	if test -d $(DESTDIR)$(datadir)/pixmaps; then \
+-	   cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/pixmaps/; \
++	if test -d $(DESTDIR)$(datadir)/icons; then \
++	   cp pixmaps/gadmin-openvpn-server.png $(DESTDIR)$(datadir)/icons/; \
+ 	fi;
+ 	if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gadmin-openvpn-server; then \
+ 	   ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gadmin-openvpn-server; \
+@@ -681,10 +681,10 @@ install-data-local:
+ 
+ dist-hook:
+ 	if test -d pixmaps; then \
+-	  mkdir $(DESTDIR)$(distdir)/pixmaps; \
++	  mkdir $(DESTDIR)$(distdir)/icons; \
+ 	  for pixmap in pixmaps/*; do \
+ 	    if test -f $$pixmap; then \
+-	      cp -p $$pixmap $(DESTDIR)$(distdir)/pixmaps; \
++	      cp -p $$pixmap $(DESTDIR)$(distdir)/icons; \
+ 	    fi \
+ 	  done \
+ 	fi
+diff -Naurp gadmin-openvpn-server.orig/src/create_main_window.c gadmin-openvpn-server/src/create_main_window.c
+--- gadmin-openvpn-server.orig/src/create_main_window.c	2008-10-05 21:00:22.000000000 +0000
++++ gadmin-openvpn-server/src/create_main_window.c	2008-11-16 08:09:38.000000000 +0000
+@@ -52,7 +52,7 @@ void create_main_window(struct w *widget
+     g_free(info);
+ 
+     /* Set the main window icon */
+-    pixmap_directory = g_strdup_printf("%s/pixmaps/gadmin-openvpn-server", PACKAGE_DATA_DIR);
++    pixmap_directory = g_strdup_printf("%s/icons", PACKAGE_DATA_DIR);
+     add_pixmap_directory(pixmap_directory);
+     g_free(pixmap_directory);
+ 
--- gadmin-openvpn-server-0.1.5.orig/debian/patches/series
+++ gadmin-openvpn-server-0.1.5/debian/patches/series
@@ -0,0 +1,3 @@
+01-icondir.patch
+02-desktop.patch
+03-logfiles.patch
--- gadmin-openvpn-server-0.1.5.orig/debian/patches/02-desktop.patch
+++ gadmin-openvpn-server-0.1.5/debian/patches/02-desktop.patch
@@ -0,0 +1,18 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Makes use of su-to-root and cleans Categories.
+
+diff -Naurp gadmin-openvpn-server.orig/desktop/gadmin-openvpn-server.desktop gadmin-openvpn-server/desktop/gadmin-openvpn-server.desktop
+--- gadmin-openvpn-server.orig/desktop/gadmin-openvpn-server.desktop	2008-09-23 16:34:31.000000000 +0000
++++ gadmin-openvpn-server/desktop/gadmin-openvpn-server.desktop	2008-11-16 08:10:50.000000000 +0000
+@@ -15,8 +15,8 @@ Name[ro]=GADMIN-OPENVPN-Server
+ Name[zh_TW]=GADMIN-OPENVPN-Server
+ GenericName=GADMIN-OPENVPN-Server
+ Comment=OpenVPN server administration
+-Exec=gadmin-openvpn-server
+-Icon=gadmin-openvpn-server.png
++Exec=su-to-root -X -c /usr/sbin/gadmin-openvpn-server
++Icon=gadmin-openvpn-server
+ Terminal=false
+ Type=Application
+-Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base;
++Categories=GTK;System;
--- gadmin-openvpn-server-0.1.5.orig/debian/pixmaps/gadmin-openvpn-server.xpm
+++ gadmin-openvpn-server-0.1.5/debian/pixmaps/gadmin-openvpn-server.xpm
@@ -0,0 +1,190 @@
+/* XPM */
+static char * gadmin_openvpn_server_xpm[] = {
+"32 29 158 2",
+"  	c None",
+". 	c #E8BAFF",
+"+ 	c #E3ACFF",
+"@ 	c #E0A5FF",
+"# 	c #E0A4FF",
+"$ 	c #E0A3FF",
+"% 	c #E2A9FF",
+"& 	c #E5B3FF",
+"* 	c #DA93FF",
+"= 	c #D587FF",
+"- 	c #D586FF",
+"; 	c #D687FF",
+"> 	c #D992FF",
+", 	c #DD9BFF",
+"' 	c #ECC6FF",
+") 	c #DD9CFF",
+"! 	c #D688FF",
+"~ 	c #D88FFF",
+"{ 	c #EBC3FF",
+"] 	c #DA95FF",
+"^ 	c #D083FA",
+"/ 	c #C47BEB",
+"( 	c #C27AEA",
+"_ 	c #C87EF0",
+": 	c #D385FE",
+"< 	c #D487FE",
+"[ 	c #CA7FF3",
+"} 	c #81509E",
+"| 	c #372144",
+"1 	c #1A0F20",
+"2 	c #190E1F",
+"3 	c #22142A",
+"4 	c #633D79",
+"5 	c #BA75E1",
+"6 	c #C47CEE",
+"7 	c #C078E8",
+"8 	c #442954",
+"9 	c #050306",
+"0 	c #392346",
+"a 	c #B471DB",
+"b 	c #D184FC",
+"c 	c #D991FF",
+"d 	c #CE81F8",
+"e 	c #492C5B",
+"f 	c #010102",
+"g 	c #CB80F6",
+"h 	c #9B61BC",
+"i 	c #935BB3",
+"j 	c #070409",
+"k 	c #C67DF0",
+"l 	c #DE9FFF",
+"m 	c #D485FE",
+"n 	c #553469",
+"o 	c #D689FF",
+"p 	c #C97EF2",
+"q 	c #3E264D",
+"r 	c #DB95FF",
+"s 	c #D184FB",
+"t 	c #E5B2FF",
+"u 	c #CC87F1",
+"v 	c #301D3B",
+"w 	c #D183FB",
+"x 	c #432952",
+"y 	c #DFA2FF",
+"z 	c #C37AEB",
+"A 	c #26172F",
+"B 	c #2F1C3A",
+"C 	c #68417F",
+"D 	c #D893FD",
+"E 	c #D284FB",
+"F 	c #D385FD",
+"G 	c #B470D9",
+"H 	c #130B17",
+"I 	c #C37BEC",
+"J 	c #26162E",
+"K 	c #D78CFF",
+"L 	c #A86ACC",
+"M 	c #382246",
+"N 	c #301C3C",
+"O 	c #301D3C",
+"P 	c #9A65B8",
+"Q 	c #030204",
+"R 	c #E6B4FF",
+"S 	c #A466C6",
+"T 	c #0A060D",
+"U 	c #D59DF2",
+"V 	c #57356B",
+"W 	c #DFA3FF",
+"X 	c #6C4284",
+"Y 	c #CF82FA",
+"Z 	c #D588FE",
+"` 	c #E7B7FF",
+" .	c #D68AFF",
+"..	c #B26FD7",
+"+.	c #160C1B",
+"@.	c #BF78E7",
+"#.	c #23152C",
+"$.	c #BB75E3",
+"%.	c #D284FD",
+"&.	c #D88EFF",
+"*.	c #E4B0FF",
+"=.	c #D78BFF",
+"-.	c #D083FB",
+";.	c #56346A",
+">.	c #000000",
+",.	c #EDC7FF",
+"'.	c #E1A9FF",
+").	c #D384FD",
+"!.	c #663E7D",
+"~.	c #020103",
+"{.	c #A96ACE",
+"].	c #E1A7FF",
+"^.	c #8452A2",
+"/.	c #0A050D",
+"(.	c #E9BDFF",
+"_.	c #DE9EFF",
+":.	c #D486FF",
+"<.	c #8F58AE",
+"[.	c #0E0812",
+"}.	c #9C61BD",
+"|.	c #8B56AA",
+"1.	c #120A17",
+"2.	c #EAC1FF",
+"3.	c #D284FC",
+"4.	c #8B56A9",
+"5.	c #170D1D",
+"6.	c #74488D",
+"7.	c #BD77E5",
+"8.	c #694081",
+"9.	c #0F0813",
+"0.	c #5F3A74",
+"a.	c #0C060F",
+"b.	c #281832",
+"c.	c #6A4182",
+"d.	c #A265C4",
+"e.	c #CB7FF3",
+"f.	c #C57BED",
+"g.	c #A466C7",
+"h.	c #6E4387",
+"i.	c #040305",
+"j.	c #E4BAF9",
+"k.	c #D7A1F4",
+"l.	c #CC83F3",
+"m.	c #9D61BE",
+"n.	c #613B78",
+"o.	c #1D1125",
+"p.	c #020102",
+"q.	c #09050C",
+"r.	c #1D1124",
+"s.	c #23142B",
+"t.	c #22142B",
+"u.	c #1C1024",
+"v.	c #0C070F",
+"w.	c #010001",
+"x.	c #67467A",
+"y.	c #2E1C39",
+"z.	c #190E20",
+"A.	c #09050B",
+"              . + @ # # # # # # # # # # # # # $ %               ",
+"          & * = - - - - - - - - - - - - - - - - ; > ,           ",
+"      ' ) = - - - - - - - - - - - - - - - - - - - - ! ~         ",
+"    { ] - - - - ^ / ( ( ( ( ( ( ( ( ( ( ( ( _ : - - - = <       ",
+"    , - - - [ } | 1 2 2 2 2 2 2 2 2 2 2 2 2 3 4 5 - - - - 6     ",
+"  + - - - 7 8 9                                 0 a - - - b     ",
+"  c - - d e f                                       g - - - h   ",
+"% = - - i j                                         k - - - 5   ",
+"l - - m n                                             o - - p q ",
+"r - - s q           t * c c c c c c c u               ~ - - p v ",
+"] - - w x           y - - - - - - - - z A             * - - p B ",
+"c - - m C           D s s s E F - - - G H             > - - I J ",
+"K - - - L           M N N N O P - - - i Q           R o - - S T ",
+"  - - - b                     U - - : V             W - - - X   ",
+"  Y - - - Z                 `  .- - ..+.          t ! - - @.#.  ",
+"  $.%.- - - &.y           *.=.- - -.;.>.      ,.'.o - - ).!.~.  ",
+"    {.F - - - ! ] $ ].# c - - - m ^./.    (._.K - - - :.<.[.    ",
+"      }.b - - - - - - - - - - F |.1.    2.> - - - - 3.4.5.      ",
+"        6.7.m - - - - - - - @.8.9.    (.> - - - :.5 0.a.        ",
+"          b.c.d.( e.e.f.g.h.3 i.  j.k.l.e.e.@.m.n.o.p.          ",
+"              q.r.s.t.u.v.w.    x.y.s.t.t.t.z.A.>.              ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"  - -   -     - -   - - - - -       -   - - - - -   - -   - -   ",
+"        - -       - - - - - - -     - - -       -   - -     -   ",
+"    -   - -     - - - - - - - -     -   -       -   -       -   ",
+"  - -       - - -   - -   - -       -           -   -     - -   "};