rev 14407 - in kde-extras/kvpnc/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Wed Apr 15 11:00:35 UTC 2009
Author: fabo
Date: 2009-04-15 11:00:35 +0000 (Wed, 15 Apr 2009)
New Revision: 14407
Added:
kde-extras/kvpnc/trunk/debian/patches/
kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff
kde-extras/kvpnc/trunk/debian/patches/13_add_kuser_issuperuser.diff
kde-extras/kvpnc/trunk/debian/patches/series
Modified:
kde-extras/kvpnc/trunk/debian/README.Debian
kde-extras/kvpnc/trunk/debian/changelog
kde-extras/kvpnc/trunk/debian/control
kde-extras/kvpnc/trunk/debian/copyright
kde-extras/kvpnc/trunk/debian/rules
Log:
Merge my kvpnc changes:
* Refresh debian/patches:
- 10_su-to-root_usage.diff
- 13_add_kuser_issuperuser.diff
* Update debian/copyright - use versionned licenses
* Update Section field - move to utils
* Switch from cdbs to debhelper only
Modified: kde-extras/kvpnc/trunk/debian/README.Debian
===================================================================
--- kde-extras/kvpnc/trunk/debian/README.Debian 2009-04-14 23:49:18 UTC (rev 14406)
+++ kde-extras/kvpnc/trunk/debian/README.Debian 2009-04-15 11:00:35 UTC (rev 14407)
@@ -29,4 +29,4 @@
Exec=sudo kvpnc
X-KDE-SubstituteUID=false
- -- Fathi Boudra <fboudra at free.fr>, Thu, 18 May 2006 15:17:52 +0100
+ -- Fathi Boudra <fabo at debian.org> Tue, 14 Apr 2009 21:37:05 +0200
Modified: kde-extras/kvpnc/trunk/debian/changelog
===================================================================
--- kde-extras/kvpnc/trunk/debian/changelog 2009-04-14 23:49:18 UTC (rev 14406)
+++ kde-extras/kvpnc/trunk/debian/changelog 2009-04-15 11:00:35 UTC (rev 14407)
@@ -2,9 +2,15 @@
* New upstream release (KDE4 is here)
* Add Build-Depends cmake and pkg-kde-tools
- * Remove obsolete quilt and debian/patches
+ * Remove obsolete debian/patches
+ * Refresh debian/patches:
+ - 10_su-to-root_usage.diff
+ - 13_add_kuser_issuperuser.diff
* Cleanup debian/rules - simple under KDE4
* Update debian/watch for KDE4 version
+ * Update debian/copyright - use versionned licenses
+ * Update Section field - move to utils
+ * Switch from cdbs to debhelper only
-- Mark Purcell <msp at debian.org> Wed, 15 Apr 2009 08:40:41 +1000
Modified: kde-extras/kvpnc/trunk/debian/control
===================================================================
--- kde-extras/kvpnc/trunk/debian/control 2009-04-14 23:49:18 UTC (rev 14406)
+++ kde-extras/kvpnc/trunk/debian/control 2009-04-15 11:00:35 UTC (rev 14407)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), cmake, pkg-kde-tools, kdelibs5-dev,
+Build-Depends: debhelper (>= 7), quilt, cmake, pkg-kde-tools, kdelibs5-dev,
libgcrypt11-dev
Standards-Version: 3.8.1
Homepage: http://home.gna.org/kvpnc
Modified: kde-extras/kvpnc/trunk/debian/copyright
===================================================================
--- kde-extras/kvpnc/trunk/debian/copyright 2009-04-14 23:49:18 UTC (rev 14406)
+++ kde-extras/kvpnc/trunk/debian/copyright 2009-04-15 11:00:35 UTC (rev 14407)
@@ -1,30 +1,43 @@
-This package was debianized by Fathi Boudra <fboudra at free.fr> on
-Thu, 26 Jan 2006 11:49:10 +0100.
+This package was debianized by:
-It was downloaded from http://home.gna.org/kvpnc
+ Fathi Boudra <fboudra at free.fr> on Thu, 26 Jan 2006 11:49:10 +0100
-Copyright Holder: Christoph Thielecke <crissi99 at gmx.de>
+It was downloaded from:
+ http://home.gna.org/kvpnc
+
+Upstream Author:
+
+ Christoph Thielecke <crissi99 at gmx.de>
+
+Copyright:
+
+ © 2004-2009 Christoph Thielecke <crissi99 at gmx.de>
+
Copyright for ciscopasswddecoder :
- (C) 2005 hal9000 <hal9000 at evilscientists.de>
- (C) 2005 Maurice Massar <vpnc at unix-ag.uni-kl.de>
- (C) 2005 Christoph Thielecke <crissi99 at gmx.de>
+ © 2005 hal9000 <hal9000 at evilscientists.de>
+ © 2005 Maurice Massar <vpnc at unix-ag.uni-kl.de>
+
Copyright for openvpn-kde-dialogs.pl:
- Alon Bar-Lev <alon.barlev at gmail.com>
+ © Alon Bar-Lev <alon.barlev at gmail.com>
+
kvpnc contains parts of code from klcc project:
- Peter Simonsson <psn at linux.se>
+ © Peter Simonsson <psn at linux.se>
+
Copyright for kfeedback (user feedback form and mailing utilities) and
parts of code from kdirstat project:
- Stefan Hundhammer <sh at suse.de>
+ © Stefan Hundhammer <sh at suse.de>
+
preferencesdialog contains parts of code from konversation project
(konvisettingsdialog.cpp)
- (C) 2006 John Tapsell <johnflux at gmail.com>
- (C) 2006 Eike Hein <hein at kde.org>
+ © 2006 John Tapsell <johnflux at gmail.com>
+ © 2006 Eike Hein <hein at kde.org>
+
kfeedback license:
This package is free software; you can redistribute it and/or
@@ -42,24 +55,32 @@
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'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2'
+and `/usr/share/common-licenses/LGPL-3'.
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 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.
+ 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
+ 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'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'
+and `/usr/share/common-licenses/GPL-3'.
+The Debian packaging is:
+
+ Copyright (C) 2006-2009 Fathi Boudra <fabo at debian.org>
+
+and is licensed under the GPL version 2,
+see `/usr/share/common-licenses/GPL-2'.
Added: kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff (rev 0)
+++ kde-extras/kvpnc/trunk/debian/patches/10_su-to-root_usage.diff 2009-04-15 11:00:35 UTC (rev 14407)
@@ -0,0 +1,11 @@
+--- a/src/kvpnc.desktop
++++ b/src/kvpnc.desktop
+@@ -43,7 +43,7 @@ GenericName[uk]=ÐнÑеÑÑÐµÐ¹Ñ Ð´Ð»Ñ
+ GenericName[x-test]=xxVPN Client GUIxx
+
+ Categories=Network;RemoteAccess;KDE;Qt;
+-Exec=kvpnc
++Exec=su-to-root -X -c /usr/bin/kvpnc
+ X-KDE-SubstituteUID=true
+ Icon=kvpnc
+ Type=Application
Added: kde-extras/kvpnc/trunk/debian/patches/13_add_kuser_issuperuser.diff
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/13_add_kuser_issuperuser.diff (rev 0)
+++ kde-extras/kvpnc/trunk/debian/patches/13_add_kuser_issuperuser.diff 2009-04-15 11:00:35 UTC (rev 14407)
@@ -0,0 +1,27 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -24,6 +24,7 @@
+ #include <kmessagebox.h>
+ #include <kmainwindow.h>
+ #include <kapplication.h>
++#include <kuser.h>
+ #include <klocale.h>
+ #include <QtCore/QString>
+ #include <../config-kvpnc.h>
+@@ -126,11 +127,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 (!KUser().isSuperUser())
++ {
++ KMessageBox::error( 0L, i18n( "Kvpnc must be started as root!" ) );
++ exit(0);
++ }
+
+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
Added: kde-extras/kvpnc/trunk/debian/patches/series
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/series (rev 0)
+++ kde-extras/kvpnc/trunk/debian/patches/series 2009-04-15 11:00:35 UTC (rev 14407)
@@ -0,0 +1,2 @@
+10_su-to-root_usage.diff
+13_add_kuser_issuperuser.diff
Modified: kde-extras/kvpnc/trunk/debian/rules
===================================================================
--- kde-extras/kvpnc/trunk/debian/rules 2009-04-14 23:49:18 UTC (rev 14406)
+++ kde-extras/kvpnc/trunk/debian/rules 2009-04-15 11:00:35 UTC (rev 14407)
@@ -1,4 +1,72 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+include /usr/share/quilt/quilt.make
+
+builddir/Makefile: $(QUILT_STAMPFN)
+ dh_testdir
+
+ mkdir -p builddir
+ cd builddir && cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_C_FLAGS="$(CFLAGS)" \
+ -DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+ -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ $(DEB_CMAKE_KDE4_FLAGS)
+
+build: build-stamp
+build-stamp: builddir/Makefile
+ dh_testdir
+
+ $(MAKE) -C builddir
+
+ touch $@
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ rm -rf builddir
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ $(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/kvpnc install
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+# dh_install
+ dh_installmenu
+ dh_installman debian/kvpnc.1
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
More information about the pkg-kde-commits
mailing list