diff options
| author | Robert Xu <robxu9@gmail.com> | 2011-08-20 19:02:33 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2011-08-20 19:02:33 -0400 |
| commit | 6507e11446a26cf7882ecc8658e505b6adce8e61 (patch) | |
| tree | 6fddf797d72efd2218a9251d88cd78421d29cf11 | |
| parent | 15f0f9d002ddecf5cc794a7a5bdd78a971b31ee6 (diff) | |
| parent | ff90ca42326263cc8f50263efb91a4592c89e84c (diff) | |
| download | tde-packaging-6507e11446a26cf7882ecc8658e505b6adce8e61.tar.gz tde-packaging-6507e11446a26cf7882ecc8658e505b6adce8e61.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
63 files changed, 2202 insertions, 261 deletions
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/README.source b/debian/lenny/applications/knetworkmanager.cmake/debian/README.source new file mode 100644 index 000000000..96fb271ab --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/README.source @@ -0,0 +1,3 @@ +This package uses the quilt patch management system. + +Please refer to /usr/share/doc/quilt/README.source for further information. diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/buildvars.mk b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# 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 2, 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..888f4be38 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,98 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# 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 2, 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/team-members b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/uploaders.mk b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/changelog b/debian/lenny/applications/knetworkmanager.cmake/debian/changelog new file mode 100644 index 000000000..ed0d32a81 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/changelog @@ -0,0 +1,373 @@ +knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low + + * UI tweaks for discoverability + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 26 Oct 2009 17:44:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low + + * Fixed VPN reauthentication request dialog failure when used with the permanent storage option + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 06 Oct 2009 19:31:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low + + * Fixed various minor glitches + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 03 Oct 2009 12:29:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low + + * Repaired poor usability for new wireless connections + * Repaired poor usability for connection management + * VPN connections now remember login information when asked + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 29 Sep 2009 09:39:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low + + * Repaired VPN plugins + * VPNC now allows hashed group password + * PPTP repaired and enabled + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 28 Sep 2009 14:51:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low + + * Patched backend for new NM0.8 API + * Repaired poor usability in the "new connection" tasktray menu + * Repaired poor usability in the available devices tasktray menu + * Moved to /opt/trinity + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 22 Aug 2009 23:34:00 -0600 + +knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low + + * Updated SVN snapshot (r941706). + * debian/patches/04-dbus_access.patch + - Most of the relevant changes have been merged upstream. The patch now + only contains the Debian specific group "netdev" section. + * debian/control + - Bump Standards-Version to 3.8.1. No further changes. + + -- Michael Biebl <biebl@debian.org> Fri, 20 Mar 2009 22:59:51 +0100 + +knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low + + * debian/patches/05-no_blank_psk.patch + - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails + to validate them. Closes: #517213 + Patch by Dan Williams, thanks! + + -- Michael Biebl <biebl@debian.org> Tue, 03 Mar 2009 00:34:15 +0100 + +knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low + + * Merge experimental branch into unstable. Remaining changes: + - Remove 07-indicate_manual_config.patch, obsolete. + * debian/control + - Wrap Build-Depends. + - Bump Build-Depends on debhelper to (>= 7). + * debian/compat + - Bump debhelper compat level to 7. + * debian/rules + - Include debhelper.mk before any other files as recommended by the cdbs + documentation. + * Update SVN snapshot to r931033. + + -- Michael Biebl <biebl@debian.org> Wed, 25 Feb 2009 10:54:39 +0100 + +knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low + + * debian/patches/04-dbus_access.patch + - Update D-Bus names and interfaces for NM 0.7. Closes: #511526 + - Remove bare send_interface directives to avoid non-deterministic allow + messages with no interface. Closes: #510757 + - Do not allow unpriviledged processes to ask for a users' connections. + - Allow introspection by default. + + -- Michael Biebl <biebl@debian.org> Thu, 05 Feb 2009 01:52:22 +0100 + +knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low + + * Updated SVN snapshot (r908338). + * debian/rules + - Stop moving icons around, fixed upstream. + * debian/patches/01-configure_package_name.patch + - Make sure we set the correct PACKAGE name when generating the build + system so the translations are installed properly. + * debian/network-manager-kde.lintian-overrides + - Updated for the latest lintian changes. + + -- Michael Biebl <biebl@debian.org> Sun, 11 Jan 2009 06:52:06 +0100 + +knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low + + * SVN snapshot of the upcoming 0.7 release (for NM 0.7). + * debian/control + - Add Build-Depends on pkg-config. + - Bump Build-Depends on nm-* packages to (>= 0.7.0). + - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1). + - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian. + - Bump Depends on network-manager to (>= 0.7.0). + - Bump Standards-Version to 3.8.0. Add README.source as recommended by the + new policy. + * debian/rules + - Install autostart desktop file into /usr/share/autostart/. + - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them. + Closes: #487303 + - Add support for both libtool 1.x and 2.x. + * Switch patch management system to quilt. + * debian/patches/04-dbus_access.patch + - Refresh and update. + + -- Michael Biebl <biebl@debian.org> Tue, 16 Dec 2008 04:18:10 +0100 + +knetworkmanager (1:0.2.2-2) unstable; urgency=low + + * debian/patches/07-indicate_manual_config.patch + - manual-means-online: If there are interfaces that are not managed by + NetworkManager because they have custom configuration in + /etc/network/interfaces, we assume to be online and show a wired network + icon indicating manual network configuration. + * debian/control + - Add Build-Depends on pkg-config. + + -- Michael Biebl <biebl@debian.org> Wed, 14 Jan 2009 08:22:11 +0100 + +knetworkmanager (1:0.2.2-1) unstable; urgency=low + + * New upstream release. + - Improved tray icon animation using mng files. Closes: #394815 + - Improved LEAP security. Closes: #470709 + * Removed patches + - debian/patches/01-fix_french_translation.patch (merged upstream) + - debian/patches/02-linux_types.patch (obsolete) + - debian/patches/03-awk_path.patch (fixed upstream) + - debian/patches/05-desktop_file_fixes.patch (merged upstream) + * debian/knetworkmanager.linda + - Remove the linda override file, linda is dead. + * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides} + - Rename the lintian override file so it is automatically installed by + dh_lintian. + * debian/rules + - Drop the no longer required install rules for the override files. + - Drop the install rule for the autostart file. It's provided by upstream + now. + * debian/copyright + - Update the authors list. + * debian/control + - Bump Build-Depends on libnl-dev (>= 1.1). + - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper + admin/ directory again. + * debian/watch + - New download location at ftp.kde.org. + + -- Michael Biebl <biebl@debian.org> Fri, 04 Apr 2008 19:41:02 +0200 + +knetworkmanager (1:0.2-3) unstable; urgency=low + + * debian/control + - Use the new "Homepage:" field to specify the upstream URL. + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Bump Standards-Version to 3.7.3. No further changes required. + - Fix a few capitalization errors in the package description. + + -- Michael Biebl <biebl@debian.org> Fri, 11 Jan 2008 02:08:24 +0100 + +knetworkmanager (1:0.2-2) unstable; urgency=low + + * Rebuild against network-manager 0.6.5 to enable phase2 and leap + authentication support. + * debian/rules + - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is + built twice in a row. Closes: #442621 + * debian/control + - Add Build-Conflicts: autoconf2.13. Closes: #441046 + * debian/menu + - Set section to Applications/Network/Monitoring which seems to be the + most appropriate amongst the available sections. + * debian/patches/05-desktop_file_fixes.patch + - Fix the *.desktop files to be compliant to the fd.o menu and desktop + entry spec. + + -- Michael Biebl <biebl@debian.org> Sun, 16 Sep 2007 21:01:25 +0200 + +knetworkmanager (1:0.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches/05-leap_support.patch + - Removed, merged upstream. + * debian/patches/06-version_check.patch + - Removed, merged upstream. + * The upstream tarball does not ship an admin/ directory. Build-Depend on + kapptemplate, so we can copy it from there. + * debian/menu + - Update to new menu hierarchy and add a longtitle. + + -- Michael Biebl <biebl@debian.org> Wed, 25 Jul 2007 17:10:36 +0200 + +knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low + + * debian/patches/06-version_check.patch + - Added. Fixes the problem with knetworkmanager no longer connecting + automatically upon login. Closes: #431255 + If you are upgrading from a previous 0.2 svn snapshot, you may have to + clear the list of trusted networks in the configuration dialog. + + -- Michael Biebl <biebl@debian.org> Sun, 01 Jul 2007 11:47:00 +0200 + +knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low + + * debian/patches/02-linux_types.patch + - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined + in linux-libc-dev for ANSI C/C89. Closes: #430795 + + -- Michael Biebl <biebl@debian.org> Thu, 28 Jun 2007 06:08:04 +0200 + +knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low + + * SVN snapshot of the upcoming 0.2 release which has native VPN plugin + support. Closes: #415742 + * debian/control + - Add XS-Vcs-* fields. + - Add Recommends: network-manager-vpnc, network-manager-openvpn. + * debian/rules + - Compile with openvpn and vpnc support. + + * Removed patches that were merged upstream: + - debian/patches/05-no_deserialize.patch + - debian/patches/06-pretty_notification.patch + - debian/patches/07-overlay_icon_vpn.patch + - debian/patches/08-disable_sm.patch + - debian/patches/09-dbus_bool_t.patch + + * debian/patches/02-linux_types.patch + - Added. Needed to workaround a problem in libnl. + * debian/patches/03-awk_path.patch + - Added. In Debian awk is installed in /usr/bin. + * debian/patches/04-dbus_access.patch + - Do not remove the dbus at_console access check but make it an + alternative to the Debian netdev group policy. Closes: #426467 + * debian/patches/05-leap_support.patch + - Added. Do not fail to compile if LEAP support is not available. + + -- Michael Biebl <biebl@debian.org> Fri, 22 Jun 2007 21:08:32 +0100 + +knetworkmanager (1:0.1-4) unstable; urgency=low + + * Actually install the autostart file for knetworkmanager. + Thanks to Yannick Roehlly for spotting this glitch. + + -- Michael Biebl <biebl@debian.org> Fri, 12 Jan 2007 11:26:28 +0100 + +knetworkmanager (1:0.1-3) unstable; urgency=low + + * Pull some features and bug fixes from svn: + - debian/patches/05-no_deserialize.patch + + Don't call deserialize on encryption object to avoid warning of + libnm-util. Closes: #391486 + - debian/patches/06-pretty_notification.patch + + Prettify notification messages. + - debian/patches/07-overlay_icon_vpn.patch + + Show overlay icon (lock) for active VPN connections. + - debian/patches/08-disable_sm.patch + + Disable session management to avoid a deadlock when accessing kwallet. + Install an autostart file into /usr/share/autostart/ instead. + Closes: #406162 + - debian/patches/09-dbus_bool_t.patch + + Use dbus_bool_t instead of bool. Closes: #398974 + * debian/patches/01-fix_french_translation.patch + - Added patch from Emmanuel Bouthenot which fixes some errors in the + French translation. Closes: #402285 + + -- Michael Biebl <biebl@debian.org> Tue, 9 Jan 2007 16:31:52 +0100 + +knetworkmanager (1:0.1-2) unstable; urgency=low + + * Update maintainer email address to biebl@debian.org. + + -- Michael Biebl <biebl@debian.org> Fri, 20 Oct 2006 00:02:03 +0200 + +knetworkmanager (1:0.1-1) unstable; urgency=low + + * Finally the 0.1 release. Woohoo! + - Use an epoch to fix the versioning scheme I managed to mess up. + - Fixes a crash when removing network objects for a nonexistent network + interface. Closes: #390052 + * debian/patches/01-no_network_status.patch + - Removed, fixed upstream. + * debian/patches/03-configure.patch + - Removed, fixed upstream. + * Dropped the build-dep on kapptemplate. The upstream tarball now ships a + proper admin/ directory. + * debian/patches/02-dialup.patch + - Removed. Also dropped the Recommends: pppconfig. pppconfig can't + generate entries for /etc/network/interfaces yet. + + -- Michael Biebl <biebl@teco.edu> Fri, 29 Sep 2006 19:18:08 +0200 + +knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low + + * Updated to svn revision 586773. + * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man + page. Closes: #385642 + + -- Michael Biebl <biebl@teco.edu> Wed, 20 Sep 2006 19:46:52 +0200 + +knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low + + * Updated to svn revision 577960. + - Access KWallet on demand, not on startup. Closes: #379606 + * Added a Recommends: pppconfig. Closes: #380316 + + -- Michael Biebl <biebl@teco.edu> Mon, 28 Aug 2006 01:14:29 +0200 + +knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium + + * Updated to svn revision 560817. + * Removed 04-gnome_keyring_daemon.patch, fixed upstream. + * Added 04-dbus_access.patch. Fixes D-Bus access rights. + Closes: #379309, #379364 + * Enabled dial up support. Set pppconfig as configuration utility. + Closes: #376071 + * Reload D-Bus after installation. Closes: #379307 + * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820 + + -- Michael Biebl <biebl@teco.edu> Tue, 25 Jul 2006 23:33:31 +0200 + +knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low + + * Updated to svn revision 550737. + * Added 01-no_network_status.patch which removes a build dependency on + networkstatus. + * Removed 03-configure_notifications.patch, merged upstream. + * This version does not ship an admin/ directory. Added a build dependency + on kapptemplate and modified debian/rules to copy it from kapptemplate. + * Bumped Standards-Version to 3.7.2, no further changes required. + * Updated homepage URL. + * Added 04-gnome_keyring_daemon.patch which sets the correct path to the + gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store + their passwords. + + -- Michael Biebl <biebl@teco.edu> Wed, 14 Jun 2006 17:16:07 +0200 + +knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low + + * New upstream release. + * Removed 01-xdg_app.patch, merged upstream. + * Added 03-configure_notifications.patch, this patch modifies the context + menu of the systray applet to provide quick access to the notification + settings. + * Added a "Provides: knetworkmanager" to make the package installable by its + upstream name. + * Initial upload. Closes: #351069 + + -- Michael Biebl <biebl@teco.edu> Thu, 27 Apr 2006 08:01:39 +0200 + +knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low + + * Initial release. + + -- Michael Biebl <biebl@teco.edu> Tue, 7 Feb 2006 21:43:56 +0100 + diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/compat b/debian/lenny/applications/knetworkmanager.cmake/debian/compat new file mode 100644 index 000000000..7f8f011eb --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/control b/debian/lenny/applications/knetworkmanager.cmake/debian/control new file mode 100644 index 000000000..d1389862e --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/control @@ -0,0 +1,34 @@ +Source: knetworkmanager-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: cdbs, + debhelper (>= 7), + pkg-config, + kdelibs4-trinity-dev, + libnm-util-dev (>= 0.7.0), + libnm-glib-dev (>= 0.7.0), + network-manager-dev (>= 0.7.0), + libhal-dev, + libdbus-1-tqt-dev (>= 0.8.1), + libiw-dev, + libnl-dev (>= 1.1), + quilt, + network-manager-vpnc, + network-manager-openvpn, + network-manager-strongswan, + network-manager-pptp, + libtool, libltdl-dev, cmake +Standards-Version: 3.8.3 +Homepage: http://opensuse.org/Projects/KNetworkManager + +Package: network-manager-tde +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) +Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Provides: knetworkmanager-trinity +Conflicts: network-manager-kde +Description: KDE systray applet for controlling NetworkManager [Trinity] + Systray applet for controlling network connections managed by + NetworkManager. It is mainly written for KDE3 but also works for + other desktop environments like GNOME or Xfce. diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/control.in b/debian/lenny/applications/knetworkmanager.cmake/debian/control.in new file mode 100644 index 000000000..c31b9f8b1 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/control.in @@ -0,0 +1,36 @@ +Source: knetworkmanager-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: cdbs, + debhelper (>= 7), + pkg-config, + kdelibs4-trinity-dev, + libnm-util-dev (>= 0.7.0), + libnm-glib-dev (>= 0.7.0), + network-manager-dev (>= 0.7.0), + libhal-dev, + libdbus-1-qt3-dev (>= 0.8.1), + libiw-dev, + libnl-dev (>= 1.1), + quilt, + network-manager-vpnc, + network-manager-openvpn, + network-manager-strongswan, + network-manager-pptp, + automake1.11-trinity, autoconf2.63, libtool, libltdl-dev +Standards-Version: 3.8.3 +Homepage: http://opensuse.org/Projects/KNetworkManager + +Package: network-manager-kde-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) +Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Provides: knetworkmanager-trinity +Conflicts: network-manager-kde +Description: KDE systray applet for controlling NetworkManager [Trinity] + Systray applet for controlling network connections managed by + NetworkManager. It is mainly written for KDE3 but also works for + other desktop environments like GNOME or Xfce. diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/copyright b/debian/lenny/applications/knetworkmanager.cmake/debian/copyright new file mode 100644 index 000000000..2490de254 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Michael Biebl <biebl@teco.edu> on +Fri, 3 Feb 2006 05:53:06 +0100. + +It was downloaded from http://www.opensuse.org + +Upstream Authors: + Timo Hoenig <thoenig@suse.de> + Will Stephenson <wstephenson@suse.de> + Stefan Bogner <sbogner@suse.de> + Helmut Schaa <hschaa@suse.de> + Valentine Sinitsyn <e_val@inbox.ru> + +Copyright: + Copyright (C) 2005, 2006 Novell, Inc. + +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'. + diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/knetworkmanager.1 b/debian/lenny/applications/knetworkmanager.cmake/debian/knetworkmanager.1 new file mode 100644 index 000000000..3cd261c89 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/knetworkmanager.1 @@ -0,0 +1,145 @@ +.\" This file was generated by kdemangen.pl +.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE" +.SH NAME +knetworkmanager +\- A NetworkManager front-end for KDE +.SH SYNOPSIS +knetworkmanager [Qt\-options] [KDE\-options] +.SH DESCRIPTION +A NetworkManager front-end for KDE +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.TP +.B \-\-nofork +Don't run in the background. +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +-nograb, use -dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS + +.SH SEE ALSO +.BR networkmanager (1) +.SH AUTHORS +.nf +Timo Hoenig <thoenig@suse.de> +.br +Stefan Bogner <sbogner@suse.de> +.br +Will Stephenson <wstephenson@suse.de> +.br + diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/manpages b/debian/lenny/applications/knetworkmanager.cmake/debian/manpages new file mode 100644 index 000000000..e2859341f --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/manpages @@ -0,0 +1 @@ +debian/knetworkmanager.1 diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/menu b/debian/lenny/applications/knetworkmanager.cmake/debian/menu new file mode 100644 index 000000000..9775e9c7c --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/menu @@ -0,0 +1,6 @@ +?package(network-manager-kde): \ + needs="X11" \ + section="Applications/Network/Monitoring" \ + title="KNetworkManager" \ + longtitle="A KDE frontend for NetworkManager" \ + command="/opt/trinity/bin/knetworkmanager" diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides new file mode 100644 index 000000000..9ae01a92b --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides @@ -0,0 +1,2 @@ +network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager +network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst b/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst new file mode 100644 index 000000000..fdd4e51ca --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + # Ask D-Bus to reload the config file + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/patches/series b/debian/lenny/applications/knetworkmanager.cmake/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/patches/series diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/rules b/debian/lenny/applications/knetworkmanager.cmake/debian/rules new file mode 100755 index 000000000..5043dd652 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk + +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ +-DWITH_OPENVPN="ON" -DWITH_VPNC="ON" -DWITH_PPTP="ON" + +DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO + +binary-install/network-manager-kde-trinity:: + # Install autostart file + install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \ + debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/watch b/debian/lenny/applications/knetworkmanager.cmake/debian/watch new file mode 100644 index 000000000..36d51ca53 --- /dev/null +++ b/debian/lenny/applications/knetworkmanager.cmake/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/knetworkmanager-(.*)\.tar\.gz diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk index 888f4be38..47e83ef4a 100644 --- a/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,9 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: + 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 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi rm -f debian/stamp-cvs-make endif diff --git a/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk index 9dbcfbafd..5b6508f8c 100644 --- a/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk +++ b/debian/lenny/applications/knetworkmanager/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/debian/lenny/applications/knetworkmanager/debian/control b/debian/lenny/applications/knetworkmanager/debian/control index d1389862e..1f32d831d 100644 --- a/debian/lenny/applications/knetworkmanager/debian/control +++ b/debian/lenny/applications/knetworkmanager/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, libnm-glib-dev (>= 0.7.0), network-manager-dev (>= 0.7.0), libhal-dev, - libdbus-1-tqt-dev (>= 0.8.1), + libdbus-1-tqt-dev, libiw-dev, libnl-dev (>= 1.1), quilt, @@ -18,11 +18,11 @@ Build-Depends: cdbs, network-manager-openvpn, network-manager-strongswan, network-manager-pptp, - libtool, libltdl-dev, cmake -Standards-Version: 3.8.3 + automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 Homepage: http://opensuse.org/Projects/KNetworkManager -Package: network-manager-tde +Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp diff --git a/debian/lenny/applications/knetworkmanager/debian/rules b/debian/lenny/applications/knetworkmanager/debian/rules index 5043dd652..97955e38b 100755 --- a/debian/lenny/applications/knetworkmanager/debian/rules +++ b/debian/lenny/applications/knetworkmanager/debian/rules @@ -1,26 +1,47 @@ #!/usr/bin/make -f - -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - + include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/rules/utils.mk -include debian/cdbs/debian-qt-kde.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_OPENVPN="ON" -DWITH_VPNC="ON" -DWITH_PPTP="ON" +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_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \ debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop + +clean:: + find . -name Makefile.in | xargs rm -f + rm -f aclocal.m4 + rm -f acinclude.m4 + rm -f configure + rm -f configure.files + rm -f configure.in + rm -f config.h.in + rm -f stamp-h.in + rm -f subdirs + rm -f admin/ltmain.sh + rm -f admin/libtool.m4.in + rm -f debian/stamp-bootstrap diff --git a/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install index 3018d0891..4f1a1d3e8 100644 --- a/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-trinity.install @@ -1,3 +1,6 @@ +debian/tmp/opt/trinity/bin/xscreensaver-getimage-file +debian/tmp/opt/trinity/bin/xscreensaver-getimage +debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kxsconfig debian/tmp/opt/trinity/bin/kxsrun debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop diff --git a/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff new file mode 100644 index 000000000..b8a55ad56 --- /dev/null +++ b/debian/lenny/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff @@ -0,0 +1,10 @@ +diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am +--- kscreensaver/krootbacking/Makefile.am 2011-08-19 19:27:09.000000000 -0500 ++++ kscreensaver/krootbacking/Makefile.am 2011-08-19 20:06:36.000000000 -0500 +@@ -9,5 +9,5 @@ + + noinst_HEADERS = krootbacking.h + +-hackdir = /usr/local/bin/ ++hackdir = /opt/trinity/bin/ + hack_DATA = xscreensaver-getimage xscreensaver-getimage-file diff --git a/debian/lenny/kdemultimedia/debian/kmix-trinity.postrm b/debian/lenny/kdemultimedia/debian/kmix-trinity.postrm deleted file mode 100644 index 80792fb72..000000000 --- a/debian/lenny/kdemultimedia/debian/kmix-trinity.postrm +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -e - -case "$1" in - purge) - ;; - - remove) - mkdir -p /etc/xdg/menus - dpkg-divert --remove --rename /etc/xdg/menus/kde-information.menu - rm -rf /etc/xdg/menus.kde4 - - mkdir -p /usr/share/autostart - dpkg-divert --remove --rename /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --remove --rename /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #dpkg-divert --remove --rename /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/lenny/kdemultimedia/debian/kmix-trinity.preinst b/debian/lenny/kdemultimedia/debian/kmix-trinity.preinst deleted file mode 100644 index 251742f38..000000000 --- a/debian/lenny/kdemultimedia/debian/kmix-trinity.preinst +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - upgrade) - mkdir -p /usr/share/autostart.bkp - dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop - rm -f /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop - #rm -f /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop - #dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - install) - mkdir -p /usr/share/autostart.bkp - dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop - rm -f /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop - #rm -f /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop - #dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/README.source b/debian/squeeze/applications/knetworkmanager.cmake/debian/README.source new file mode 100644 index 000000000..96fb271ab --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/README.source @@ -0,0 +1,3 @@ +This package uses the quilt patch management system. + +Please refer to /usr/share/doc/quilt/README.source for further information. diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/buildvars.mk b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/buildvars.mk new file mode 100644 index 000000000..23d4709dc --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/buildvars.mk @@ -0,0 +1,86 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2002,2003 Colin Walters <walters@debian.org> +# Description: Defines some useful variables, but no rules +# +# 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 2, 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_rules_buildvars +_cdbs_rules_buildvars = 1 + +CDBS_VERSION = something + +# Common useful variables +DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) +DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') +DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-) +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//') +DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;') + +# Split into arch/indep packages +ifneq ($(DEB_INDEP_PACKAGES),cdbs) +DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep))) +DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same)))) +endif +# Split into normal and udeb packages +ifeq ($(DEB_UDEB_PACKAGES),) +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +else +DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) +endif +# Too much bother for now. If someone complains we'll fix it. +#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES)) +#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES)) +# A handy list of every package, udeb or not +DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES)) +DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES))) +DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES))) + +DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES))) + +# Some support for srcdir != builddir builds. +# These are relative to the root of the package +DEB_SRCDIR ?= . +DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR)) + +# Miscellaneous bits +DEB_ARCH = $(shell dpkg --print-architecture) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(words $(DEB_ALL_PACKAGES)),1) + DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/ +else + DEB_DESTDIR = $(CURDIR)/debian/tmp/ +endif + +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1) + +endif diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk new file mode 100644 index 000000000..888f4be38 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk @@ -0,0 +1,98 @@ +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: + touch debian/stamp-cvs-make + +include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) +include debian/cdbs/uploaders.mk + +DEB_PATCHDIRS := debian/patches/common debian/patches + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + install -p -D -m644 debian/$(cdbs_curpkg).presubj \ + debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ + fi + +binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: + set -e; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \ + done + +clean:: + rm -f debian/stamp-cvs-make + +endif diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/kde.mk new file mode 100644 index 000000000..9dbcfbafd --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/kde.mk @@ -0,0 +1,97 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Description: A class for KDE packages; sets KDE environment variables, etc +# +# 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 2, 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class + +ifndef _cdbs_class_kde +_cdbs_class_kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/kde/HTML + +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) + +DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +common-build-arch common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-prehook-impl:: + mkdir -p po + -XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages + -for file in po/*pot; do \ + sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ + done + +common-install-arch common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: +# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + +clean:: + rm -f debian/stamp-kde-apidox + rm -rf po/*.pot + +# This is a convenience target for calling manually. It's not part of +# the build process. +buildprep: clean apply-patches + $(MAKE) -f admin/Makefile.common dist + debian/rules clean + +endif diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/team-members b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/team-members new file mode 100644 index 000000000..05761af6e --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/team-members @@ -0,0 +1,16 @@ +Sune Vuorela <debian@pusling.com> +Ana Beatriz Guerrero Lopez <ana@debian.org> +Fathi Boudra <fboudra@free.fr> +Modestas Vainius <geromanas@mailas.com> +Josh Metzler <joshdeb@metzlers.org> +Isaac Clerencia <isaac@debian.org> +Adeodato Simó <dato@net.com.org.es> +Adeodato Simo <dato@net.com.org.es> +Christopher Martin <chrsmrtn@debian.org> +Daniel Schepler <schepler@debian.org> +Sarah Hobbs <hobbsee@ubuntu.com> +Nacho Barrientos Arias <nacho@debian.org> +Ricardo Javier Cardenes Medina <rcardenes@debian.org> +Ricardo Cardenes <rcardenes@debian.org> +Armin Berres <trigger+debian@space-based.de> +Francesco Pedrini <francesco.pedrini@gmail.com> diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/uploaders.mk b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/uploaders.mk new file mode 100644 index 000000000..31adfe31e --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/uploaders.mk @@ -0,0 +1,29 @@ + +MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//') + + +debian/control.tmp: + @if [ ! -e debian/control.in ] ; then \ + echo "this package is not yet prepared for using automatic update of uploaders"; \ + echo "Please do so."; \ + exit 1; \ + fi + @sed 's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in > debian/control.tmp + +check-uploaders: debian/control.tmp + @if ! diff -q debian/control debian/control.tmp ; then \ + echo "WARNING:: Control file differs from manually generated one" ; \ + echo "WARNING:: Please update it manually and check it afterwards" ; \ + echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\ + echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\ + fi + + +clean:: + rm -f debian/control.tmp + +update-uploaders: debian/control.tmp + @mv -f debian/control.tmp debian/control + +makebuilddir:: check-uploaders diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl new file mode 100644 index 000000000..9ce11d8a3 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/-[^-]+$//; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "KDE-Version3=$version3\n"; +print "KDE-Version2=$version2\n"; +print "KDE-Next-Version3=$version3_next\n"; +print "KDE-Next-Version2=$version2_next\n"; diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog b/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog new file mode 100644 index 000000000..ed0d32a81 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/changelog @@ -0,0 +1,373 @@ +knetworkmanager-trinity (1:0.8-0ubuntu12) karmic; urgency=low + + * UI tweaks for discoverability + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 26 Oct 2009 17:44:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low + + * Fixed VPN reauthentication request dialog failure when used with the permanent storage option + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 06 Oct 2009 19:31:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low + + * Fixed various minor glitches + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 03 Oct 2009 12:29:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low + + * Repaired poor usability for new wireless connections + * Repaired poor usability for connection management + * VPN connections now remember login information when asked + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 29 Sep 2009 09:39:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low + + * Repaired VPN plugins + * VPNC now allows hashed group password + * PPTP repaired and enabled + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 28 Sep 2009 14:51:00 -0600 + +knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low + + * Patched backend for new NM0.8 API + * Repaired poor usability in the "new connection" tasktray menu + * Repaired poor usability in the available devices tasktray menu + * Moved to /opt/trinity + + -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 22 Aug 2009 23:34:00 -0600 + +knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low + + * Updated SVN snapshot (r941706). + * debian/patches/04-dbus_access.patch + - Most of the relevant changes have been merged upstream. The patch now + only contains the Debian specific group "netdev" section. + * debian/control + - Bump Standards-Version to 3.8.1. No further changes. + + -- Michael Biebl <biebl@debian.org> Fri, 20 Mar 2009 22:59:51 +0100 + +knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low + + * debian/patches/05-no_blank_psk.patch + - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails + to validate them. Closes: #517213 + Patch by Dan Williams, thanks! + + -- Michael Biebl <biebl@debian.org> Tue, 03 Mar 2009 00:34:15 +0100 + +knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low + + * Merge experimental branch into unstable. Remaining changes: + - Remove 07-indicate_manual_config.patch, obsolete. + * debian/control + - Wrap Build-Depends. + - Bump Build-Depends on debhelper to (>= 7). + * debian/compat + - Bump debhelper compat level to 7. + * debian/rules + - Include debhelper.mk before any other files as recommended by the cdbs + documentation. + * Update SVN snapshot to r931033. + + -- Michael Biebl <biebl@debian.org> Wed, 25 Feb 2009 10:54:39 +0100 + +knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low + + * debian/patches/04-dbus_access.patch + - Update D-Bus names and interfaces for NM 0.7. Closes: #511526 + - Remove bare send_interface directives to avoid non-deterministic allow + messages with no interface. Closes: #510757 + - Do not allow unpriviledged processes to ask for a users' connections. + - Allow introspection by default. + + -- Michael Biebl <biebl@debian.org> Thu, 05 Feb 2009 01:52:22 +0100 + +knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low + + * Updated SVN snapshot (r908338). + * debian/rules + - Stop moving icons around, fixed upstream. + * debian/patches/01-configure_package_name.patch + - Make sure we set the correct PACKAGE name when generating the build + system so the translations are installed properly. + * debian/network-manager-kde.lintian-overrides + - Updated for the latest lintian changes. + + -- Michael Biebl <biebl@debian.org> Sun, 11 Jan 2009 06:52:06 +0100 + +knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low + + * SVN snapshot of the upcoming 0.7 release (for NM 0.7). + * debian/control + - Add Build-Depends on pkg-config. + - Bump Build-Depends on nm-* packages to (>= 0.7.0). + - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1). + - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian. + - Bump Depends on network-manager to (>= 0.7.0). + - Bump Standards-Version to 3.8.0. Add README.source as recommended by the + new policy. + * debian/rules + - Install autostart desktop file into /usr/share/autostart/. + - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them. + Closes: #487303 + - Add support for both libtool 1.x and 2.x. + * Switch patch management system to quilt. + * debian/patches/04-dbus_access.patch + - Refresh and update. + + -- Michael Biebl <biebl@debian.org> Tue, 16 Dec 2008 04:18:10 +0100 + +knetworkmanager (1:0.2.2-2) unstable; urgency=low + + * debian/patches/07-indicate_manual_config.patch + - manual-means-online: If there are interfaces that are not managed by + NetworkManager because they have custom configuration in + /etc/network/interfaces, we assume to be online and show a wired network + icon indicating manual network configuration. + * debian/control + - Add Build-Depends on pkg-config. + + -- Michael Biebl <biebl@debian.org> Wed, 14 Jan 2009 08:22:11 +0100 + +knetworkmanager (1:0.2.2-1) unstable; urgency=low + + * New upstream release. + - Improved tray icon animation using mng files. Closes: #394815 + - Improved LEAP security. Closes: #470709 + * Removed patches + - debian/patches/01-fix_french_translation.patch (merged upstream) + - debian/patches/02-linux_types.patch (obsolete) + - debian/patches/03-awk_path.patch (fixed upstream) + - debian/patches/05-desktop_file_fixes.patch (merged upstream) + * debian/knetworkmanager.linda + - Remove the linda override file, linda is dead. + * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides} + - Rename the lintian override file so it is automatically installed by + dh_lintian. + * debian/rules + - Drop the no longer required install rules for the override files. + - Drop the install rule for the autostart file. It's provided by upstream + now. + * debian/copyright + - Update the authors list. + * debian/control + - Bump Build-Depends on libnl-dev (>= 1.1). + - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper + admin/ directory again. + * debian/watch + - New download location at ftp.kde.org. + + -- Michael Biebl <biebl@debian.org> Fri, 04 Apr 2008 19:41:02 +0200 + +knetworkmanager (1:0.2-3) unstable; urgency=low + + * debian/control + - Use the new "Homepage:" field to specify the upstream URL. + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Bump Standards-Version to 3.7.3. No further changes required. + - Fix a few capitalization errors in the package description. + + -- Michael Biebl <biebl@debian.org> Fri, 11 Jan 2008 02:08:24 +0100 + +knetworkmanager (1:0.2-2) unstable; urgency=low + + * Rebuild against network-manager 0.6.5 to enable phase2 and leap + authentication support. + * debian/rules + - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is + built twice in a row. Closes: #442621 + * debian/control + - Add Build-Conflicts: autoconf2.13. Closes: #441046 + * debian/menu + - Set section to Applications/Network/Monitoring which seems to be the + most appropriate amongst the available sections. + * debian/patches/05-desktop_file_fixes.patch + - Fix the *.desktop files to be compliant to the fd.o menu and desktop + entry spec. + + -- Michael Biebl <biebl@debian.org> Sun, 16 Sep 2007 21:01:25 +0200 + +knetworkmanager (1:0.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches/05-leap_support.patch + - Removed, merged upstream. + * debian/patches/06-version_check.patch + - Removed, merged upstream. + * The upstream tarball does not ship an admin/ directory. Build-Depend on + kapptemplate, so we can copy it from there. + * debian/menu + - Update to new menu hierarchy and add a longtitle. + + -- Michael Biebl <biebl@debian.org> Wed, 25 Jul 2007 17:10:36 +0200 + +knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low + + * debian/patches/06-version_check.patch + - Added. Fixes the problem with knetworkmanager no longer connecting + automatically upon login. Closes: #431255 + If you are upgrading from a previous 0.2 svn snapshot, you may have to + clear the list of trusted networks in the configuration dialog. + + -- Michael Biebl <biebl@debian.org> Sun, 01 Jul 2007 11:47:00 +0200 + +knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low + + * debian/patches/02-linux_types.patch + - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined + in linux-libc-dev for ANSI C/C89. Closes: #430795 + + -- Michael Biebl <biebl@debian.org> Thu, 28 Jun 2007 06:08:04 +0200 + +knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low + + * SVN snapshot of the upcoming 0.2 release which has native VPN plugin + support. Closes: #415742 + * debian/control + - Add XS-Vcs-* fields. + - Add Recommends: network-manager-vpnc, network-manager-openvpn. + * debian/rules + - Compile with openvpn and vpnc support. + + * Removed patches that were merged upstream: + - debian/patches/05-no_deserialize.patch + - debian/patches/06-pretty_notification.patch + - debian/patches/07-overlay_icon_vpn.patch + - debian/patches/08-disable_sm.patch + - debian/patches/09-dbus_bool_t.patch + + * debian/patches/02-linux_types.patch + - Added. Needed to workaround a problem in libnl. + * debian/patches/03-awk_path.patch + - Added. In Debian awk is installed in /usr/bin. + * debian/patches/04-dbus_access.patch + - Do not remove the dbus at_console access check but make it an + alternative to the Debian netdev group policy. Closes: #426467 + * debian/patches/05-leap_support.patch + - Added. Do not fail to compile if LEAP support is not available. + + -- Michael Biebl <biebl@debian.org> Fri, 22 Jun 2007 21:08:32 +0100 + +knetworkmanager (1:0.1-4) unstable; urgency=low + + * Actually install the autostart file for knetworkmanager. + Thanks to Yannick Roehlly for spotting this glitch. + + -- Michael Biebl <biebl@debian.org> Fri, 12 Jan 2007 11:26:28 +0100 + +knetworkmanager (1:0.1-3) unstable; urgency=low + + * Pull some features and bug fixes from svn: + - debian/patches/05-no_deserialize.patch + + Don't call deserialize on encryption object to avoid warning of + libnm-util. Closes: #391486 + - debian/patches/06-pretty_notification.patch + + Prettify notification messages. + - debian/patches/07-overlay_icon_vpn.patch + + Show overlay icon (lock) for active VPN connections. + - debian/patches/08-disable_sm.patch + + Disable session management to avoid a deadlock when accessing kwallet. + Install an autostart file into /usr/share/autostart/ instead. + Closes: #406162 + - debian/patches/09-dbus_bool_t.patch + + Use dbus_bool_t instead of bool. Closes: #398974 + * debian/patches/01-fix_french_translation.patch + - Added patch from Emmanuel Bouthenot which fixes some errors in the + French translation. Closes: #402285 + + -- Michael Biebl <biebl@debian.org> Tue, 9 Jan 2007 16:31:52 +0100 + +knetworkmanager (1:0.1-2) unstable; urgency=low + + * Update maintainer email address to biebl@debian.org. + + -- Michael Biebl <biebl@debian.org> Fri, 20 Oct 2006 00:02:03 +0200 + +knetworkmanager (1:0.1-1) unstable; urgency=low + + * Finally the 0.1 release. Woohoo! + - Use an epoch to fix the versioning scheme I managed to mess up. + - Fixes a crash when removing network objects for a nonexistent network + interface. Closes: #390052 + * debian/patches/01-no_network_status.patch + - Removed, fixed upstream. + * debian/patches/03-configure.patch + - Removed, fixed upstream. + * Dropped the build-dep on kapptemplate. The upstream tarball now ships a + proper admin/ directory. + * debian/patches/02-dialup.patch + - Removed. Also dropped the Recommends: pppconfig. pppconfig can't + generate entries for /etc/network/interfaces yet. + + -- Michael Biebl <biebl@teco.edu> Fri, 29 Sep 2006 19:18:08 +0200 + +knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low + + * Updated to svn revision 586773. + * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man + page. Closes: #385642 + + -- Michael Biebl <biebl@teco.edu> Wed, 20 Sep 2006 19:46:52 +0200 + +knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low + + * Updated to svn revision 577960. + - Access KWallet on demand, not on startup. Closes: #379606 + * Added a Recommends: pppconfig. Closes: #380316 + + -- Michael Biebl <biebl@teco.edu> Mon, 28 Aug 2006 01:14:29 +0200 + +knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium + + * Updated to svn revision 560817. + * Removed 04-gnome_keyring_daemon.patch, fixed upstream. + * Added 04-dbus_access.patch. Fixes D-Bus access rights. + Closes: #379309, #379364 + * Enabled dial up support. Set pppconfig as configuration utility. + Closes: #376071 + * Reload D-Bus after installation. Closes: #379307 + * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820 + + -- Michael Biebl <biebl@teco.edu> Tue, 25 Jul 2006 23:33:31 +0200 + +knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low + + * Updated to svn revision 550737. + * Added 01-no_network_status.patch which removes a build dependency on + networkstatus. + * Removed 03-configure_notifications.patch, merged upstream. + * This version does not ship an admin/ directory. Added a build dependency + on kapptemplate and modified debian/rules to copy it from kapptemplate. + * Bumped Standards-Version to 3.7.2, no further changes required. + * Updated homepage URL. + * Added 04-gnome_keyring_daemon.patch which sets the correct path to the + gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store + their passwords. + + -- Michael Biebl <biebl@teco.edu> Wed, 14 Jun 2006 17:16:07 +0200 + +knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low + + * New upstream release. + * Removed 01-xdg_app.patch, merged upstream. + * Added 03-configure_notifications.patch, this patch modifies the context + menu of the systray applet to provide quick access to the notification + settings. + * Added a "Provides: knetworkmanager" to make the package installable by its + upstream name. + * Initial upload. Closes: #351069 + + -- Michael Biebl <biebl@teco.edu> Thu, 27 Apr 2006 08:01:39 +0200 + +knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low + + * Initial release. + + -- Michael Biebl <biebl@teco.edu> Tue, 7 Feb 2006 21:43:56 +0100 + diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/compat b/debian/squeeze/applications/knetworkmanager.cmake/debian/compat new file mode 100644 index 000000000..7f8f011eb --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control b/debian/squeeze/applications/knetworkmanager.cmake/debian/control new file mode 100644 index 000000000..d1389862e --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control @@ -0,0 +1,34 @@ +Source: knetworkmanager-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Build-Depends: cdbs, + debhelper (>= 7), + pkg-config, + kdelibs4-trinity-dev, + libnm-util-dev (>= 0.7.0), + libnm-glib-dev (>= 0.7.0), + network-manager-dev (>= 0.7.0), + libhal-dev, + libdbus-1-tqt-dev (>= 0.8.1), + libiw-dev, + libnl-dev (>= 1.1), + quilt, + network-manager-vpnc, + network-manager-openvpn, + network-manager-strongswan, + network-manager-pptp, + libtool, libltdl-dev, cmake +Standards-Version: 3.8.3 +Homepage: http://opensuse.org/Projects/KNetworkManager + +Package: network-manager-tde +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) +Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Provides: knetworkmanager-trinity +Conflicts: network-manager-kde +Description: KDE systray applet for controlling NetworkManager [Trinity] + Systray applet for controlling network connections managed by + NetworkManager. It is mainly written for KDE3 but also works for + other desktop environments like GNOME or Xfce. diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in new file mode 100644 index 000000000..c31b9f8b1 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/control.in @@ -0,0 +1,36 @@ +Source: knetworkmanager-trinity +Section: kde +Priority: optional +Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> +XSBC-Original-Maintainer: @@@MAINTAINER@@@ +Uploaders: @@@UPLOADERS@@@ +Build-Depends: cdbs, + debhelper (>= 7), + pkg-config, + kdelibs4-trinity-dev, + libnm-util-dev (>= 0.7.0), + libnm-glib-dev (>= 0.7.0), + network-manager-dev (>= 0.7.0), + libhal-dev, + libdbus-1-qt3-dev (>= 0.8.1), + libiw-dev, + libnl-dev (>= 1.1), + quilt, + network-manager-vpnc, + network-manager-openvpn, + network-manager-strongswan, + network-manager-pptp, + automake1.11-trinity, autoconf2.63, libtool, libltdl-dev +Standards-Version: 3.8.3 +Homepage: http://opensuse.org/Projects/KNetworkManager + +Package: network-manager-kde-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) +Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp +Provides: knetworkmanager-trinity +Conflicts: network-manager-kde +Description: KDE systray applet for controlling NetworkManager [Trinity] + Systray applet for controlling network connections managed by + NetworkManager. It is mainly written for KDE3 but also works for + other desktop environments like GNOME or Xfce. diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/copyright b/debian/squeeze/applications/knetworkmanager.cmake/debian/copyright new file mode 100644 index 000000000..2490de254 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Michael Biebl <biebl@teco.edu> on +Fri, 3 Feb 2006 05:53:06 +0100. + +It was downloaded from http://www.opensuse.org + +Upstream Authors: + Timo Hoenig <thoenig@suse.de> + Will Stephenson <wstephenson@suse.de> + Stefan Bogner <sbogner@suse.de> + Helmut Schaa <hschaa@suse.de> + Valentine Sinitsyn <e_val@inbox.ru> + +Copyright: + Copyright (C) 2005, 2006 Novell, Inc. + +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'. + diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/knetworkmanager.1 b/debian/squeeze/applications/knetworkmanager.cmake/debian/knetworkmanager.1 new file mode 100644 index 000000000..3cd261c89 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/knetworkmanager.1 @@ -0,0 +1,145 @@ +.\" This file was generated by kdemangen.pl +.TH KNETWORKMANAGER 1 "Feb 2006" "K Desktop Environment" "A NetworkManager front-end for KDE" +.SH NAME +knetworkmanager +\- A NetworkManager front-end for KDE +.SH SYNOPSIS +knetworkmanager [Qt\-options] [KDE\-options] +.SH DESCRIPTION +A NetworkManager front-end for KDE +.SH OPTIONS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget - see man X for the argument format +.TP +.B \-\-nofork +Don't run in the background. +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +-nograb, use -dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS + +.SH SEE ALSO +.BR networkmanager (1) +.SH AUTHORS +.nf +Timo Hoenig <thoenig@suse.de> +.br +Stefan Bogner <sbogner@suse.de> +.br +Will Stephenson <wstephenson@suse.de> +.br + diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/manpages b/debian/squeeze/applications/knetworkmanager.cmake/debian/manpages new file mode 100644 index 000000000..e2859341f --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/manpages @@ -0,0 +1 @@ +debian/knetworkmanager.1 diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/menu b/debian/squeeze/applications/knetworkmanager.cmake/debian/menu new file mode 100644 index 000000000..9775e9c7c --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/menu @@ -0,0 +1,6 @@ +?package(network-manager-kde): \ + needs="X11" \ + section="Applications/Network/Monitoring" \ + title="KNetworkManager" \ + longtitle="A KDE frontend for NetworkManager" \ + command="/opt/trinity/bin/knetworkmanager" diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides b/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides new file mode 100644 index 000000000..9ae01a92b --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.lintian-overrides @@ -0,0 +1,2 @@ +network-manager-kde: package-name-doesnt-match-sonames libkdeinit-knetworkmanager +network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libkdeinit_knetworkmanager.so libkdeinit_knetworkmanager.so diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst b/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst new file mode 100644 index 000000000..fdd4e51ca --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/network-manager-kde-trinity.postinst @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + # Ask D-Bus to reload the config file + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/patches/series b/debian/squeeze/applications/knetworkmanager.cmake/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/patches/series diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/rules b/debian/squeeze/applications/knetworkmanager.cmake/debian/rules new file mode 100755 index 000000000..5043dd652 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include debian/cdbs/debian-qt-kde.mk + +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ +-DWITH_OPENVPN="ON" -DWITH_VPNC="ON" -DWITH_PPTP="ON" + +DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO + +binary-install/network-manager-kde-trinity:: + # Install autostart file + install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \ + debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/watch b/debian/squeeze/applications/knetworkmanager.cmake/debian/watch new file mode 100644 index 000000000..36d51ca53 --- /dev/null +++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/knetworkmanager-(.*)\.tar\.gz diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk index 888f4be38..47e83ef4a 100644 --- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/knetworkmanager/debian/cdbs/debian-qt-kde.mk @@ -10,6 +10,9 @@ _cdbs_class_debian-qt-kde := 1 # Note: This _must_ be included before autotools.mk, or it won't work. common-configure-arch common-configure-indep:: debian/stamp-cvs-make debian/stamp-cvs-make: + 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 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) @@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: done clean:: + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi rm -f debian/stamp-cvs-make endif diff --git a/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk index 9dbcfbafd..5b6508f8c 100644 --- a/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk +++ b/debian/squeeze/applications/knetworkmanager/debian/cdbs/kde.mk @@ -35,7 +35,7 @@ else DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) endif -# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) export kde_cgidir = \$${libdir}/cgi-bin export kde_confdir = \$${sysconfdir}/trinity @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: @@ -70,7 +70,7 @@ cleanbuilddir:: common-build-arch common-build-indep:: debian/stamp-kde-apidox debian/stamp-kde-apidox: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) touch $@ common-install-prehook-impl:: @@ -82,7 +82,7 @@ common-install-prehook-impl:: common-install-arch common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: -# $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) clean:: rm -f debian/stamp-kde-apidox diff --git a/debian/squeeze/applications/knetworkmanager/debian/control b/debian/squeeze/applications/knetworkmanager/debian/control index d1389862e..1f32d831d 100644 --- a/debian/squeeze/applications/knetworkmanager/debian/control +++ b/debian/squeeze/applications/knetworkmanager/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, libnm-glib-dev (>= 0.7.0), network-manager-dev (>= 0.7.0), libhal-dev, - libdbus-1-tqt-dev (>= 0.8.1), + libdbus-1-tqt-dev, libiw-dev, libnl-dev (>= 1.1), quilt, @@ -18,11 +18,11 @@ Build-Depends: cdbs, network-manager-openvpn, network-manager-strongswan, network-manager-pptp, - libtool, libltdl-dev, cmake -Standards-Version: 3.8.3 + automake, autoconf, libtool, libltdl-dev +Standards-Version: 3.8.4 Homepage: http://opensuse.org/Projects/KNetworkManager -Package: network-manager-tde +Package: network-manager-kde-trinity Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0) Recommends: kwalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp diff --git a/debian/squeeze/applications/knetworkmanager/debian/rules b/debian/squeeze/applications/knetworkmanager/debian/rules index 5043dd652..97955e38b 100755 --- a/debian/squeeze/applications/knetworkmanager/debian/rules +++ b/debian/squeeze/applications/knetworkmanager/debian/rules @@ -1,26 +1,47 @@ #!/usr/bin/make -f - -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - + include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/rules/utils.mk -include debian/cdbs/debian-qt-kde.mk +include debian/cdbs/kde.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_OPENVPN="ON" -DWITH_VPNC="ON" -DWITH_PPTP="ON" +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_INSTALL_DOCS_ALL := -XNEWS -XTODO +DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp + +post-patches:: debian/stamp-bootstrap + +debian/stamp-bootstrap: + ! [ -f /usr/share/libtool/ltmain.sh ] || \ + cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh + ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ + cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh + cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap + binary-install/network-manager-kde-trinity:: # Install autostart file install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \ debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop + +clean:: + find . -name Makefile.in | xargs rm -f + rm -f aclocal.m4 + rm -f acinclude.m4 + rm -f configure + rm -f configure.files + rm -f configure.in + rm -f config.h.in + rm -f stamp-h.in + rm -f subdirs + rm -f admin/ltmain.sh + rm -f admin/libtool.m4.in + rm -f debian/stamp-bootstrap diff --git a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install index 3018d0891..4f1a1d3e8 100644 --- a/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/debian/squeeze/kdeartwork/debian/kscreensaver-xsavers-trinity.install @@ -1,3 +1,6 @@ +debian/tmp/opt/trinity/bin/xscreensaver-getimage-file +debian/tmp/opt/trinity/bin/xscreensaver-getimage +debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kxsconfig debian/tmp/opt/trinity/bin/kxsrun debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop diff --git a/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff new file mode 100644 index 000000000..b8a55ad56 --- /dev/null +++ b/debian/squeeze/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff @@ -0,0 +1,10 @@ +diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am +--- kscreensaver/krootbacking/Makefile.am 2011-08-19 19:27:09.000000000 -0500 ++++ kscreensaver/krootbacking/Makefile.am 2011-08-19 20:06:36.000000000 -0500 +@@ -9,5 +9,5 @@ + + noinst_HEADERS = krootbacking.h + +-hackdir = /usr/local/bin/ ++hackdir = /opt/trinity/bin/ + hack_DATA = xscreensaver-getimage xscreensaver-getimage-file diff --git a/debian/squeeze/kdemultimedia/debian/kmix-trinity.postrm b/debian/squeeze/kdemultimedia/debian/kmix-trinity.postrm deleted file mode 100644 index 80792fb72..000000000 --- a/debian/squeeze/kdemultimedia/debian/kmix-trinity.postrm +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -e - -case "$1" in - purge) - ;; - - remove) - mkdir -p /etc/xdg/menus - dpkg-divert --remove --rename /etc/xdg/menus/kde-information.menu - rm -rf /etc/xdg/menus.kde4 - - mkdir -p /usr/share/autostart - dpkg-divert --remove --rename /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --remove --rename /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #dpkg-divert --remove --rename /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/squeeze/kdemultimedia/debian/kmix-trinity.preinst b/debian/squeeze/kdemultimedia/debian/kmix-trinity.preinst deleted file mode 100644 index 251742f38..000000000 --- a/debian/squeeze/kdemultimedia/debian/kmix-trinity.preinst +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - upgrade) - mkdir -p /usr/share/autostart.bkp - dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop - rm -f /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop - #rm -f /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop - #dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - install) - mkdir -p /usr/share/autostart.bkp - dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop - rm -f /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop - #rm -f /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop - #dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/applications/kde-guidance/debian/control b/ubuntu/maverick/applications/kde-guidance/debian/control index 454cdfd58..efe6cf0dc 100644 --- a/ubuntu/maverick/applications/kde-guidance/debian/control +++ b/ubuntu/maverick/applications/kde-guidance/debian/control @@ -7,7 +7,7 @@ Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-trinity-dev, libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev, - python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata + python-support (>= 0.6), python2.6 (>= 2.5), python2.6-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata Standards-Version: 3.8.4 Package: kde-guidance-trinity diff --git a/ubuntu/maverick/applications/knetworkmanager/debian/control b/ubuntu/maverick/applications/knetworkmanager/debian/control index d1bde2e36..1f32d831d 100644 --- a/ubuntu/maverick/applications/knetworkmanager/debian/control +++ b/ubuntu/maverick/applications/knetworkmanager/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, libnm-glib-dev (>= 0.7.0), network-manager-dev (>= 0.7.0), libhal-dev, - libdbus-1-qt3-dev (>= 0.8.1), + libdbus-1-tqt-dev, libiw-dev, libnl-dev (>= 1.1), quilt, diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install index af1bbc133..9d8130e98 100644 --- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install @@ -1,3 +1,6 @@ +debian/tmp/opt/trinity/bin/xscreensaver-getimage-file +debian/tmp/opt/trinity/bin/xscreensaver-getimage +debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kxsconfig debian/tmp/opt/trinity/bin/kxsrun debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop diff --git a/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff new file mode 100644 index 000000000..b8a55ad56 --- /dev/null +++ b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff @@ -0,0 +1,10 @@ +diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am +--- kscreensaver/krootbacking/Makefile.am 2011-08-19 19:27:09.000000000 -0500 ++++ kscreensaver/krootbacking/Makefile.am 2011-08-19 20:06:36.000000000 -0500 +@@ -9,5 +9,5 @@ + + noinst_HEADERS = krootbacking.h + +-hackdir = /usr/local/bin/ ++hackdir = /opt/trinity/bin/ + hack_DATA = xscreensaver-getimage xscreensaver-getimage-file diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.postrm b/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.postrm deleted file mode 100644 index 80792fb72..000000000 --- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.postrm +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -e - -case "$1" in - purge) - ;; - - remove) - mkdir -p /etc/xdg/menus - dpkg-divert --remove --rename /etc/xdg/menus/kde-information.menu - rm -rf /etc/xdg/menus.kde4 - - mkdir -p /usr/share/autostart - dpkg-divert --remove --rename /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --remove --rename /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #dpkg-divert --remove --rename /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.preinst b/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.preinst deleted file mode 100644 index 251742f38..000000000 --- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.preinst +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -e - -case "$1" in - - upgrade) - mkdir -p /usr/share/autostart.bkp - dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop - rm -f /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop - #rm -f /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop - #dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - install) - mkdir -p /usr/share/autostart.bkp - dpkg-divert --add --rename --divert /usr/share/autostart.bkp/kmix_autostart.desktop /usr/share/autostart/kmix_autostart.desktop - rm -f /usr/share/autostart/kmix_autostart.desktop - #dpkg-divert --add --rename --divert /usr/share/autostart.bkp/restore_kmix_volumes.desktop /usr/share/autostart/restore_kmix_volumes.desktop - #rm -f /usr/share/autostart/restore_kmix_volumes.desktop - #mkdir -p /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop - #dpkg-divert --add --rename --divert /opt/trinity/share/autostart.bkp/restore_kmix_volumes.desktop /opt/trinity/share/autostart/restore_kmix_volumes.desktop - #rm -f /opt/trinity/share/autostart/restore_kmix_volumes.desktop - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/control b/ubuntu/maverick/libraries/pykdeextensions/debian/control index 958752553..bc40bf165 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/control +++ b/ubuntu/maverick/libraries/pykdeextensions/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a-trinity, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-trinity-trinity, - python-qt-dev, python-sip4-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5) + python-qt-dev, python-sip4-dev, python-support (>= 0.6), python2.6, python2.6-dev Standards-Version: 3.8.4 Package: pykdeextensions-trinity |