--- gadmin-openvpn-client-0.1.2.orig/MAKE_TGZ +++ gadmin-openvpn-client-0.1.2/MAKE_TGZ @@ -1,6 +1,6 @@ #!/bin/sh -version='0.1.2' +version='0.1.1' beta='' make clean --- gadmin-openvpn-client-0.1.2.orig/configure.in +++ gadmin-openvpn-client-0.1.2/configure.in @@ -2,7 +2,7 @@ AC_INIT(configure.in) -AM_INIT_AUTOMAKE(gadmin-openvpn-client, 0.1.2) +AM_INIT_AUTOMAKE(gadmin-openvpn-client, 0.1.1) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE --- gadmin-openvpn-client-0.1.2.orig/ChangeLog +++ gadmin-openvpn-client-0.1.2/ChangeLog @@ -1,10 +1,3 @@ - -Version 0.1.2 -------------------------------------------------------------- -Using SYSINIT_SCRIPTS_DIR in the NetworkManager dispatcher script. -Updated Deutsch translation (Manfred Mueller) - - Version 0.1.1 ------------------------------------------------------------- NetworkManager has been fixed so interface adjustments where removed. --- gadmin-openvpn-client-0.1.2.orig/gadmin-openvpn-client.spec +++ gadmin-openvpn-client-0.1.2/gadmin-openvpn-client.spec @@ -3,7 +3,7 @@ Summary: GAdmin-OpenVPN-Client -- A GTK+ administation tool for the OpenVPN client. Name: gadmin-openvpn-client -Version: 0.1.2 +Version: 0.1.1 Release: 0.1.%{dist}.nr License: GPL Group: Applications/System @@ -73,9 +73,6 @@ %{_datadir}/pixmaps/%{name}/*.png %changelog -* Sat Aug 28 2010 Magnus-swe -- Using SYSINIT_SCRIPTS_DIR in the NetworkManager dispatcher script. -- Updated Deutsch translation (Manfred Mueller). * Sat Feb 27 2010 Magnus-swe - NetworkManager has been fixed so interface adjustments where removed. - Press apply to actualize the new settings. --- gadmin-openvpn-client-0.1.2.orig/Autoinstall +++ gadmin-openvpn-client-0.1.2/Autoinstall @@ -12,18 +12,19 @@ # PROC_PATH="/proc" # NETWORKMANAGER_DISPATCH_DIR="/etc/NetworkManager/dispatcher.d" +### Debian/Ubuntu commands for starting the client at boot ### +# export SYSINIT_START_CMD="update-rc.d -f gadmin-openvpn-client defaults" +# export SYSINIT_STOP_CMD="update-rc.d -f gadmin-openvpn-client remove" -### Installation for Redhat/Fedora ### +### RH/Fedora commands for starting the client at boot ### +### This is the defaults for the rpm specfile ### +# export SYSINIT_START_CMD="chkconfig gadmin-openvpn-client on" +# export SYSINIT_STOP_CMD="chkconfig gadmin-openvpn-client off" + +### Configure, make, make install for Fedora ### ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --sbindir=/usr/sbin \ SYSINIT_START_CMD="chkconfig gadmin-openvpn-client on" \ SYSINIT_STOP_CMD="chkconfig gadmin-openvpn-client off" && -make && make install - -### Installation for Debian/Ubuntu ### -# ./configure --prefix=/usr --sysconfdir=/etc \ -# --localstatedir=/var --sbindir=/usr/sbin \ -# SYSINIT_START_CMD="update-rc.d -f gadmin-openvpn-client defaults" \ -# SYSINIT_STOP_CMD="update-rc.d -f gadmin-openvpn-client remove" && -# make && make install - +make && +make install --- gadmin-openvpn-client-0.1.2.orig/configure +++ gadmin-openvpn-client-0.1.2/configure @@ -2338,7 +2338,7 @@ # Define the identity of the package. PACKAGE=gadmin-openvpn-client - VERSION=0.1.2 + VERSION=0.1.1 cat >>confdefs.h <<_ACEOF --- gadmin-openvpn-client-0.1.2.orig/MAKE_RPM +++ gadmin-openvpn-client-0.1.2/MAKE_RPM @@ -1,7 +1,7 @@ #!/bin/sh # Make a Redhat RPM. -version='0.1.2' +version='0.1.1' cd .. ### Adjustment for FC10... ### --- gadmin-openvpn-client-0.1.2.orig/debian/compat +++ gadmin-openvpn-client-0.1.2/debian/compat @@ -0,0 +1 @@ +7 --- gadmin-openvpn-client-0.1.2.orig/debian/gadmin-openvpn-client.manpages +++ gadmin-openvpn-client-0.1.2/debian/gadmin-openvpn-client.manpages @@ -0,0 +1 @@ +debian/manpages/* --- gadmin-openvpn-client-0.1.2.orig/debian/rules +++ gadmin-openvpn-client-0.1.2/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 . + + 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-client install + + # Removing useless files + rm -rf debian/gadmin-openvpn-client/usr/share/icons/gadmin-openvpn-client + + rm -f debian/gadmin-openvpn-client/usr/share/doc/gadmin-openvpn-client/AUTHORS + rm -f debian/gadmin-openvpn-client/usr/share/doc/gadmin-openvpn-client/ChangeLog + rm -f debian/gadmin-openvpn-client/usr/share/doc/gadmin-openvpn-client/COPYING + rm -f debian/gadmin-openvpn-client/usr/share/doc/gadmin-openvpn-client/README + +override_dh_strip: + dh_strip --dbg-package=gadmin-openvpn-client-dbg --- gadmin-openvpn-client-0.1.2.orig/debian/control +++ gadmin-openvpn-client-0.1.2/debian/control @@ -0,0 +1,28 @@ +Source: gadmin-openvpn-client +Section: admin +Priority: optional +Maintainer: Debian QA Group +Build-Depends: + debhelper (>= 7.0.50~), autotools-dev, libgtk2.0-dev, quilt (>= 0.46-7) +Standards-Version: 3.8.4 +Homepage: http://www.gadmintools.org/ +Vcs-Browser: http://git.debian-maintainers.org/?p=gadmintools/gadmin-openvpn-client.git +Vcs-Git: git://git.debian-maintainers.org/git/gadmintools/gadmin-openvpn-client.git + +Package: gadmin-openvpn-client +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, menu, openvpn +Description: GTK+ configuration tool for openvpn (client) + gadmin-openvpn-client is a fast and easy to use GTK+ administration tool for + the OpenVPN client. + +Package: gadmin-openvpn-client-dbg +Section: debug +Priority: extra +Architecture: any +Depends: ${misc:Depends}, gadmin-openvpn-client (= ${binary:Version}) +Description: GTK+ configuration tool for openvpn (debug for client) + gadmin-openvpn-client is a fast and easy to use GTK+ administration tool for + the OpenVPN client. + . + This package contains the debugging symbols. --- gadmin-openvpn-client-0.1.2.orig/debian/changelog +++ gadmin-openvpn-client-0.1.2/debian/changelog @@ -0,0 +1,128 @@ +gadmin-openvpn-client (0.1.2-4) unstable; urgency=low + + * QA upload. + * Revert packaging changes made in the previous version, except the + orphaning. + + -- Mehdi Dogguy Wed, 01 Dec 2010 17:55:58 +0100 + +gadmin-openvpn-client (0.1.2-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 Sun, 28 Nov 2010 19:15:04 +0100 + +gadmin-openvpn-client (0.1.1-2) unstable; urgency=low + + * Adding patch to move logfiles to /var/log (Closes: #604140). + + -- Daniel Baumann Sat, 20 Nov 2010 16:47:05 +0100 + +gadmin-openvpn-client (0.1.1-1) unstable; urgency=low + + * Merging upstream version 0.1.1. + + -- Daniel Baumann Mon, 15 Mar 2010 18:37:31 +0100 + +gadmin-openvpn-client (0.1.0-1) unstable; urgency=low + + * Making build-depends on quilt versioned. + * Merging upstream version 0.1.0. + + -- Daniel Baumann Mon, 15 Mar 2010 07:55:18 +0100 + +gadmin-openvpn-client (0.0.9-1) unstable; urgency=low + + * Adding explicit debian source version 1.0 until switch to 3.0. + * Updating year in copyright file. + * Updating to standards 3.8.4. + * Merging upstream version 0.0.9. + * Updating year in copyright file. + * Sorting dh call in rules to a more common order. + * Updating year and version in manpage. + * Updating README.source. + + -- Daniel Baumann Sun, 14 Mar 2010 12:08:08 +0100 + +gadmin-openvpn-client (0.0.8-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.0.8. + * Moving upstream maintainer field from control to copyright. + + -- Daniel Baumann Mon, 16 Nov 2009 20:49:23 +0100 + +gadmin-openvpn-client (0.0.7-1) unstable; urgency=low + + * Merging upstream version 0.0.7. + + -- Daniel Baumann Sat, 22 Aug 2009 14:52:59 +0200 + +gadmin-openvpn-client (0.0.6-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: #539040). + + -- Daniel Baumann Thu, 20 Aug 2009 09:15:49 +0200 + +gadmin-openvpn-client (0.0.6-3) unstable; urgency=low + + * Adding debug package. + + -- Daniel Baumann Mon, 27 Jul 2009 16:05:14 +0200 + +gadmin-openvpn-client (0.0.6-2) unstable; urgency=low + + * Minimizing rules file. + + -- Daniel Baumann Mon, 27 Jul 2009 15:58:01 +0200 + +gadmin-openvpn-client (0.0.6-1) unstable; urgency=low + + * Merging upstream version 0.0.6. + * Sorting autotools-foo in rules file. + + -- Daniel Baumann Mon, 20 Jul 2009 10:39:37 +0200 + +gadmin-openvpn-client (0.0.5-1) unstable; urgency=low + + * Merging upstream version 0.0.5. + * Updating version and date in manpage header. + + -- Daniel Baumann Tue, 07 Jul 2009 15:22:19 +0200 + +gadmin-openvpn-client (0.0.4-1) unstable; urgency=low + + * Merging upstream version 0.0.4. + * 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 Tue, 07 Jul 2009 15:18:08 +0200 + +gadmin-openvpn-client (0.0.3-1) unstable; urgency=low + + * Initial release. + + -- Daniel Baumann Sun, 16 Nov 2008 08:35:00 +0100 --- gadmin-openvpn-client-0.1.2.orig/debian/gadmin-openvpn-client.install +++ gadmin-openvpn-client-0.1.2/debian/gadmin-openvpn-client.install @@ -0,0 +1,2 @@ +desktop/* /usr/share/applications +debian/pixmaps/* /usr/share/pixmaps --- gadmin-openvpn-client-0.1.2.orig/debian/gadmin-openvpn-client.menu +++ gadmin-openvpn-client-0.1.2/debian/gadmin-openvpn-client.menu @@ -0,0 +1,4 @@ +?package(gadmin-openvpn-client):needs="X11" section="Applications/System/Administration"\ + title="gadmin-openvpn-client" longtitle="GTK+ configuration tool for OpenVPN (client)"\ + description="gadmin-openvpn-client is a fast and easy to use GTK+ administration tool for the OpenVPN client."\ + command="/usr/sbin/gadmin-openvpn-client" icon="/usr/share/pixmaps/gadmin-openvpn-client.xpm" --- gadmin-openvpn-client-0.1.2.orig/debian/copyright +++ gadmin-openvpn-client-0.1.2/debian/copyright @@ -0,0 +1,42 @@ +Upstream-Contact: Magnus Loef +Upstream-Homepage: http://www.gadmintools.org/ +Maintainer-Contact: Debian Gadmintools Maintainers +Maintainer-Homepage: http://gadmintools.debian-maintainers.org/ + +Files: * +Copyright: (C) 2008-2010 Magnus Loef +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 . + . + 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 +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 . + . + 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-client-0.1.2.orig/debian/README.source +++ gadmin-openvpn-client-0.1.2/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-client-0.1.2.orig/debian/manpages/gadmin-openvpn-client.8 +++ gadmin-openvpn-client-0.1.2/debian/manpages/gadmin-openvpn-client.8 @@ -0,0 +1,21 @@ +.TH GADMIN\-OPENVPN\-CLIENT 8 "2010\-03\-14" "0.0.9" "openvpn (client) configuration tool" + +.SH NAME +gadmin\-openvpn\-client \- GTK+ configuration tool for openvpn (client) + +.SH SYNOPSIS +\fBgadmin\-openvpn\-client\fR + +.SH DESCRIPTION +gadmin\-openvpn\-client is a fast and easy to use GTK+ administration tool for the OpenVPN client. + +.SH OPTIONS +gadmin\-openvpn\-client has no options. + +.SH HOMEPAGE +More information about gadmin\-openvpn\-client and the gadmintools project can be found at <\fIhttp://www.gadmintools.org/\fR>. + +.SH AUTHOR +gadmin\-openvpn\-client 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-client-0.1.2.orig/debian/source/format +++ gadmin-openvpn-client-0.1.2/debian/source/format @@ -0,0 +1 @@ +1.0 --- gadmin-openvpn-client-0.1.2.orig/debian/patches/03-logfiles.patch +++ gadmin-openvpn-client-0.1.2/debian/patches/03-logfiles.patch @@ -0,0 +1,41 @@ +Author: Daniel Baumann +Description: Move logfiles to /var/log (Closes: #604140). + +diff -Naurp gadmin-openvpn-client.orig/src/apply_client_settings.c gadmin-openvpn-client/src/apply_client_settings.c +--- gadmin-openvpn-client.orig/src/apply_client_settings.c 2010-02-27 15:35:48.000000000 +0100 ++++ gadmin-openvpn-client/src/apply_client_settings.c 2010-11-20 16:40:55.625480315 +0100 +@@ -603,8 +603,8 @@ void apply_client_settings(struct w *wid + "group ", CLIENT_GROUP, "\n", + "persist-key\n", + "persist-tun\n", +- "log ", OPENVPN_SYSCONF_DIR, "/client/", selected_connection, "/openvpn-client.log\n", +- "status ", OPENVPN_SYSCONF_DIR, "/client/", selected_connection, "/openvpn-client-status.log\n", ++ "log ", "/var/log/gadmin-openvpn/client/", selected_connection, "/openvpn-client.log\n", ++ "status ", "/var/log/gadmin-openvpn/client/", selected_connection, "/openvpn-client-status.log\n", + "verb ", log_level, "\n", + "mute 20\n", + "ping 10\n", +diff -Naurp gadmin-openvpn-client.orig/src/clear_log_tab.c gadmin-openvpn-client/src/clear_log_tab.c +--- gadmin-openvpn-client.orig/src/clear_log_tab.c 2010-02-25 00:58:40.000000000 +0100 ++++ gadmin-openvpn-client/src/clear_log_tab.c 2010-11-20 16:40:16.570468569 +0100 +@@ -38,7 +38,7 @@ void clear_log_tab(struct w *widgets) + { + /* Clears the VPN client log */ + FILE *fp; +- gchar *log_path = g_strdup_printf("%s/client/%s/openvpn-client.log", OPENVPN_SYSCONF_DIR, selected_connection); ++ gchar *log_path = g_strdup_printf("/var/log/gadmin-openvpn/client/%s/openvpn-client.log", selected_connection); + + if((fp=fopen(log_path, "w+"))==NULL) + { +diff -Naurp gadmin-openvpn-client.orig/src/populate_log_tab.c gadmin-openvpn-client/src/populate_log_tab.c +--- gadmin-openvpn-client.orig/src/populate_log_tab.c 2010-02-25 00:58:40.000000000 +0100 ++++ gadmin-openvpn-client/src/populate_log_tab.c 2010-11-20 16:40:58.221479527 +0100 +@@ -48,7 +48,7 @@ void populate_log_tab(struct w *widgets) + + gtk_list_store_clear(widgets->log_store); + +- log_path = g_strdup_printf("%s/client/%s/openvpn-client.log", OPENVPN_SYSCONF_DIR, selected_connection); ++ log_path = g_strdup_printf("/var/log/gadmin-openvpn/client/%s/openvpn-client.log", selected_connection); + + if((fp=fopen(log_path, "r"))==NULL) + { --- gadmin-openvpn-client-0.1.2.orig/debian/patches/01-icondir.patch +++ gadmin-openvpn-client-0.1.2/debian/patches/01-icondir.patch @@ -0,0 +1,87 @@ +Author: Daniel Baumann +Description: Adjusts icon directory. + +diff -Naurp gadmin-openvpn-client.orig/Makefile.am gadmin-openvpn-client/Makefile.am +--- gadmin-openvpn-client.orig/Makefile.am 2008-09-29 20:48:33.000000000 +0000 ++++ gadmin-openvpn-client/Makefile.am 2008-11-16 07:48:37.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-client; \ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/icons; \ + for pixmap in $(srcdir)/pixmaps/*; do \ + if test -f $$pixmap; then \ +- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-client; \ ++ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/icons; \ + fi \ + done \ + fi; +- if test -d $(DESTDIR)$(datadir)/pixmaps; then \ +- cp pixmaps/gadmin-openvpn-client.png $(DESTDIR)$(datadir)/pixmaps/; \ ++ if test -d $(DESTDIR)$(datadir)/icons; then \ ++ cp pixmaps/gadmin-openvpn-client.png $(DESTDIR)$(datadir)/icons/; \ + fi; + if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gadmin-openvpn-client; then \ + ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gadmin-openvpn-client; \ +@@ -52,10 +52,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-client.orig/Makefile.in gadmin-openvpn-client/Makefile.in +--- gadmin-openvpn-client.orig/Makefile.in 2008-11-11 21:59:28.000000000 +0000 ++++ gadmin-openvpn-client/Makefile.in 2008-11-16 07:48:09.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-client; \ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/icons; \ + for pixmap in $(srcdir)/pixmaps/*; do \ + if test -f $$pixmap; then \ +- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/pixmaps/gadmin-openvpn-client; \ ++ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/icons; \ + fi \ + done \ + fi; +- if test -d $(DESTDIR)$(datadir)/pixmaps; then \ +- cp pixmaps/gadmin-openvpn-client.png $(DESTDIR)$(datadir)/pixmaps/; \ ++ if test -d $(DESTDIR)$(datadir)/icons; then \ ++ cp pixmaps/gadmin-openvpn-client.png $(DESTDIR)$(datadir)/icons/; \ + fi; + if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gadmin-openvpn-client; then \ + ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gadmin-openvpn-client; \ +@@ -678,10 +678,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-client.orig/src/create_main_window.c gadmin-openvpn-client/src/create_main_window.c +--- gadmin-openvpn-client.orig/src/create_main_window.c 2008-10-27 23:26:25.000000000 +0000 ++++ gadmin-openvpn-client/src/create_main_window.c 2008-11-16 07:49:10.000000000 +0000 +@@ -53,7 +53,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-client", PACKAGE_DATA_DIR); ++ pixmap_directory = g_strdup_printf("%s/icons", PACKAGE_DATA_DIR); + add_pixmap_directory(pixmap_directory); + g_free(pixmap_directory); + --- gadmin-openvpn-client-0.1.2.orig/debian/patches/series +++ gadmin-openvpn-client-0.1.2/debian/patches/series @@ -0,0 +1,3 @@ +01-icondir.patch +02-desktop.patch +03-logfiles.patch --- gadmin-openvpn-client-0.1.2.orig/debian/patches/02-desktop.patch +++ gadmin-openvpn-client-0.1.2/debian/patches/02-desktop.patch @@ -0,0 +1,18 @@ +Author: Daniel Baumann +Description: Makes use of su-to-root and cleans Categories. + +diff -Naurp gadmin-openvpn-client.orig/desktop/gadmin-openvpn-client.desktop gadmin-openvpn-client/desktop/gadmin-openvpn-client.desktop +--- gadmin-openvpn-client.orig/desktop/gadmin-openvpn-client.desktop 2008-09-23 16:16:24.000000000 +0000 ++++ gadmin-openvpn-client/desktop/gadmin-openvpn-client.desktop 2008-11-16 07:51:07.000000000 +0000 +@@ -15,8 +15,8 @@ Name[ro]=GADMIN-OPENVPN-Client + Name[zh_TW]=GADMIN-OPENVPN-Client + GenericName=GADMIN-OPENVPN-Client + Comment=OpenVPN Client administration +-Exec=gadmin-openvpn-client +-Icon=gadmin-openvpn-client.png ++Exec=su-to-root -X -c /usr/sbin/gadmin-openvpn-client ++Icon=gadmin-openvpn-client + Terminal=false + Type=Application +-Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base; ++Categories=GTK;System; --- gadmin-openvpn-client-0.1.2.orig/debian/pixmaps/gadmin-openvpn-client.xpm +++ gadmin-openvpn-client-0.1.2/debian/pixmaps/gadmin-openvpn-client.xpm @@ -0,0 +1,190 @@ +/* XPM */ +static char * gadmin_openvpn_client_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.>. ", +" ", +" ", +" ", +" ", +" - - - - - - - - - - - - - - - - - - - - ", +" - - - - - - - - - - - - - - - - ", +" - - - - - - - - - - - - - - - - ", +" - - - - - - - - - - - - - - "}; --- gadmin-openvpn-client-0.1.2.orig/po/Makefile.in +++ gadmin-openvpn-client-0.1.2/po/Makefile.in @@ -14,7 +14,7 @@ GETTEXT_PACKAGE = gadmin-openvpn-client PACKAGE = gadmin-openvpn-client -VERSION = 0.1.2 +VERSION = 0.1.1 SHELL = /bin/sh --- gadmin-openvpn-client-0.1.2.orig/po/Makefile +++ gadmin-openvpn-client-0.1.2/po/Makefile @@ -14,7 +14,7 @@ GETTEXT_PACKAGE = gadmin-openvpn-client PACKAGE = gadmin-openvpn-client -VERSION = 0.1.2 +VERSION = 0.1.1 SHELL = /bin/sh --- gadmin-openvpn-client-0.1.2.orig/src/commands.c +++ gadmin-openvpn-client-0.1.2/src/commands.c @@ -113,12 +113,12 @@ "export PATH=/sbin:/usr/sbin:/bin:/usr/bin\n", "\n", "if [ \"$2\" = \"down\" ]; then\n", - " ", SYSINIT_SCRIPTS_DIR, "/gadmin-openvpn-client stop\n", + " /etc/rc.d/init.d/gadmin-openvpn-client stop\n", "fi\n", "\n", "if [ \"$2\" = \"up\" ]; then\n", - " ", SYSINIT_SCRIPTS_DIR, "/gadmin-openvpn-client stop\n", - " ", SYSINIT_SCRIPTS_DIR, "/gadmin-openvpn-client start\n", + " /etc/rc.d/init.d/gadmin-openvpn-client stop\n", + " /etc/rc.d/init.d/gadmin-openvpn-client start\n", "fi\n", "\n", NULL); --- gadmin-openvpn-client-0.1.2.orig/src/Makefile +++ gadmin-openvpn-client-0.1.2/src/Makefile @@ -86,11 +86,11 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/missing --run aclocal-1.11 -AMTAR = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/missing --run tar -AUTOCONF = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/missing --run autoconf -AUTOHEADER = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/missing --run autoheader -AUTOMAKE = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/missing --run automake-1.11 +ACLOCAL = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/missing --run aclocal-1.11 +AMTAR = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/missing --run tar +AUTOCONF = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/missing --run autoconf +AUTOHEADER = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/missing --run autoheader +AUTOMAKE = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/missing --run automake-1.11 AWK = gawk CATALOGS = sv.gmo de.gmo CATOBJEXT = .gmo @@ -125,7 +125,7 @@ LOCALSTATEDIR = /var LTLIBOBJS = MAINT = # -MAKEINFO = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/missing --run makeinfo +MAKEINFO = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/missing --run makeinfo MKDIR_P = /bin/mkdir -p MKINSTALLDIRS = ./mkinstalldirs MSGFMT = /usr/bin/msgfmt @@ -150,12 +150,12 @@ STRIP = SYSCONFDIR = /etc USE_NLS = yes -VERSION = 0.1.2 +VERSION = 0.1.1 XGETTEXT = /usr/bin/xgettext -abs_builddir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/src -abs_srcdir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/src -abs_top_builddir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2 -abs_top_srcdir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2 +abs_builddir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/src +abs_srcdir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/src +abs_top_builddir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1 +abs_top_srcdir = /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1 ac_ct_CC = gcc am__include = include am__leading_dot = . @@ -182,7 +182,7 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.2/install-sh +install_sh = ${SHELL} /root/PROJEKT/gadmin-openvpn/client/gadmin-openvpn-client-0.1.1/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale --- gadmin-openvpn-client-0.1.2.orig/desktop/gadmin-openvpn-client.desktop +++ gadmin-openvpn-client-0.1.2/desktop/gadmin-openvpn-client.desktop @@ -15,7 +15,6 @@ Name[zh_TW]=GADMIN-OPENVPN-Client GenericName=GADMIN-OPENVPN-Client Comment=OpenVPN Client administration -Comment[de]=OpenVPN Klienten-Verwaltung Exec=gadmin-openvpn-client Icon=gadmin-openvpn-client.png Terminal=false