Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

13 files changed, 287 insertions, 0 deletions

diff --git a/ubuntu/maverick/applications/kvpnc/debian/README.Debian b/ubuntu/maverick/applications/kvpnc/debian/README.Debian
new file mode 100644
index 000000000..a65e1a72c
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/README.Debian
@@ -0,0 +1,32 @@
+kvpnc for Debian
+----------------
+
+kvpnc for Debian uses su-to-root from menu package instead kdesu.
+
+Howto setup kvpnc for use without root password using sudo:
+
+ * Install sudo
+
+   aptitude install sudo
+
+ * Edit /etc/sudoers
+
+   # Cmnd alias specification
+   Cmnd_Alias KVPNC = /usr/bin/kvpnc
+
+   # User privilege specification
+   ALL ALL=NOPASSWD:KVPNC
+
+ * Edit desktop link /usr/share/applications/kde/Internet/kvpnc.desktop
+
+   * replace the folling lines:
+
+     Exec=su-to-root -X -c /usr/bin/kvpnc
+     X-KDE-SubstituteUID=true
+
+     with:
+
+     Exec=sudo kvpnc
+     X-KDE-SubstituteUID=false
+
+ -- Fathi Boudra <fboudra@free.fr>, Thu, 18 May 2006 15:17:52 +0100
diff --git a/ubuntu/maverick/applications/kvpnc/debian/changelog b/ubuntu/maverick/applications/kvpnc/debian/changelog
new file mode 100644
index 000000000..f8be4973c
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/changelog
@@ -0,0 +1,6 @@
+kvpnc-trinity (0.9.6a-1) lucid; urgency=low
+
+  * Initial build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 06 Dec 2011 12:26:00 -0600
+
diff --git a/ubuntu/maverick/applications/kvpnc/debian/compat b/ubuntu/maverick/applications/kvpnc/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/kvpnc/debian/control b/ubuntu/maverick/applications/kvpnc/debian/control
new file mode 100644
index 000000000..7b8ade852
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/control
@@ -0,0 +1,20 @@
+Source: kvpnc-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, libgcrypt11-dev, automake, autoconf, libtool, libltdl-dev
+Standards-Version: 3.8.4
+
+Package: kvpnc-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, menu, net-tools, psmisc, tdebase-trinity-bin | gksu | sux, module-init-tools | modutils
+Suggests: iptables, openssl, openvpn, racoon, vpnc, pptp-linux, openswan, xl2tpd, openct, opensc
+Description: vpn clients frontend for TDE
+ KVpnc is a TDE frontend for various vpn clients.
+ .
+ It supports :
+   * Cisco-compatible VPN client (vpnc)
+   * IPSec (freeswan, openswan, racoon)
+   * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
+   * Virtual Private Network daemon (openvpn)
diff --git a/ubuntu/maverick/applications/kvpnc/debian/copyright b/ubuntu/maverick/applications/kvpnc/debian/copyright
new file mode 100644
index 000000000..d6c60aaf4
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/copyright
@@ -0,0 +1,65 @@
+This package was debianized by Fathi Boudra <fboudra@free.fr> on
+Thu, 26 Jan 2006 11:49:10 +0100.
+
+It was downloaded from http://home.gna.org/kvpnc
+
+Copyright Holder: Christoph Thielecke <crissi99@gmx.de>
+
+Copyright for ciscopasswddecoder :
+   (C) 2005 hal9000 <hal9000@evilscientists.de>
+   (C) 2005 Maurice Massar <vpnc@unix-ag.uni-kl.de>
+   (C) 2005 Christoph Thielecke <crissi99@gmx.de>
+
+Copyright for openvpn-kde-dialogs.pl:
+   Alon Bar-Lev <alon.barlev@gmail.com>
+
+kvpnc contains parts of code from klcc project:
+   Peter Simonsson <psn@linux.se>
+
+Copyright for kfeedback (user feedback form and mailing utilities) and
+parts of code from kdirstat project:
+   Stefan Hundhammer <sh@suse.de>
+
+preferencesdialog contains parts of code from konversation project
+(konvisettingsdialog.cpp)
+   (C) 2006 John Tapsell <johnflux@gmail.com>
+   (C) 2006 Eike Hein <hein@kde.org>
+
+kfeedback license:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser 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 systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+kvpnc 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; either version 2 of the License, or
+   (at your option) any later version.
+
+   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 systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/ubuntu/maverick/applications/kvpnc/debian/docs b/ubuntu/maverick/applications/kvpnc/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
diff --git a/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1 b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1
new file mode 100644
index 000000000..4111d5ff4
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/kvpnc-trinity.1
@@ -0,0 +1,69 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KVPNC 1 "novembre 16, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kvpnc \- vpn clients frontend for KDE
+.SH SYNOPSIS
+.B kvpnc
+.RI [ options ]
+.br
+.SH DESCRIPTION
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBkvpnc\fP is a KDE frontend for various vpn clients.
+.br
+It supports :
+.br
+ * Cisco-compatible VPN client (vpnc)
+.br
+ * IPSec (freeswan, openswan, racoon)
+.br
+ * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux)
+.br
+ * Virtual Private Network daemon (openvpn)
+.SH OPTIONS
+All KDE and Qt programs accept some common command\-line options.
+.br
+Kvpnc has no application\-specific options.
+.PP
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.SH AUTHOR
+kvpnc was written by Christoph Thielecke <crissi99@gmx.de>.
+.PP
+This manual page was written by Fathi Boudra <fboudra@free.fr>,
+for the Debian project (but may be used by others).
diff --git a/ubuntu/maverick/applications/kvpnc/debian/menu b/ubuntu/maverick/applications/kvpnc/debian/menu
new file mode 100644
index 000000000..1f3e59d31
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/menu
@@ -0,0 +1,6 @@
+?package(kvpnc):\
+  needs="X11"\
+  section="Applications/Network/Communication"\
+  title="kvpnc"\
+  hints="KDE"\
+  command="su-to-root -X -c kvpnc"
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
new file mode 100644
index 000000000..9630fd3f8
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/10_su-to-root_usage.diff
@@ -0,0 +1,11 @@
+--- a/src/kvpnc.desktop
++++ b/src/kvpnc.desktop
+@@ -18,7 +18,7 @@
+ GenericName[xx]=xxVPN Client GUIxx
+ 
+ Categories=Network;RemoteAccess;KDE;Qt
+-Exec=kvpnc
++Exec=su-to-root -X -c /opt/trinity/bin/kvpnc
+ X-KDE-SubstituteUID=true
+ Icon=kvpnc
+ Type=Application
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
new file mode 100644
index 000000000..70fd0192e
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/13_add_kuser_issuperuser.diff
@@ -0,0 +1,29 @@
+diff --git a/src/main.cpp b/src/main.cpp
+index 7c45fcf..b933832 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -24,6 +24,7 @@
+ #include <kmessagebox.h>
+ #include <kmainwindow.h>
+ #include <kapp.h>
++#include <kuser.h>
+ 
+ #include <klocale.h>
+ #include <dcopclient.h>
+@@ -134,11 +135,11 @@ int main ( int argc, char *argv[] )
+ 	}
+ 	else
+ 	{
+-// 		if (getenv("USER") != "root")
+-// 		{
+-// 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
+-// 			exit(0);
+-// 		}
++ 		if (getenv("USER") != "root")
++ 		{
++ 			KMessageBox::error( 0, I18N_NOOP( "Kvpnc must be started as root!" ) );
++ 			exit(0);
++ 		}
+ 
+ 		KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ 
diff --git a/ubuntu/maverick/applications/kvpnc/debian/patches/series b/ubuntu/maverick/applications/kvpnc/debian/patches/series
new file mode 100644
index 000000000..09040ada9
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/patches/series
@@ -0,0 +1,2 @@
+10_su-to-root_usage.diff
+13_add_kuser_issuperuser.diff
diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules
new file mode 100755
index 000000000..8e7f6fc6f
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/rules
@@ -0,0 +1,42 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+
+makebuilddir/kvpnc-trinity::
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+install/kvpnc-trinity::
+	# fix script-not-executable
+	chmod 0755 debian/kvpnc-trinity/opt/trinity/share/apps/kvpnc/ping_check.sh
+
+	# remove uneeded dir
+	rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/kde/HTML/kvpnc
+
+	# install desktop file in applications
+	install -D -p -m0644 src/kvpnc.desktop \
+	  debian/kvpnc-trinity/opt/trinity/share/applications/kde/kvpnc.desktop
+
+binary-post-install/kvpnc-trinity::
+	rm -rf debian/kvpnc-trinity/opt/trinity/share/applnk/
+
+clean::
+	rm -f config.status config.log
+	find . -type f -name '*.gmo' | xargs rm -f
diff --git a/ubuntu/maverick/applications/kvpnc/debian/watch b/ubuntu/maverick/applications/kvpnc/debian/watch
new file mode 100644
index 000000000..5c0ec1d76
--- /dev/null
+++ b/ubuntu/maverick/applications/kvpnc/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.gna.org/kvpnc/kvpnc-(0.*)\.tar\.bz2 debian svn-upgrade