From cbfc487458706037e61278c9b5263685619d47f0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:01:42 -0600 Subject: Update Debian and Ubuntu packaging for latest GIT HEAD --- .../kiosktool/debian/patches/kubuntu_03_sudo_support.diff | 4 ++-- ubuntu/maverick/applications/piklab/debian/copyright | 6 +++--- ubuntu/maverick/tdegames/debian/changelog | 4 ++-- .../maverick/tdelibs/debian/tdelibs4-trinity-dev.install | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'ubuntu/maverick') diff --git a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff index 24e242b82..1ee900501 100644 --- a/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff +++ b/ubuntu/maverick/applications/kiosktool/debian/patches/kubuntu_03_sudo_support.diff @@ -27,8 +27,8 @@ #include +#include - #include - #include + #include + #include @@ -45,10 +46,124 @@ #include "kiosksync.h" diff --git a/ubuntu/maverick/applications/piklab/debian/copyright b/ubuntu/maverick/applications/piklab/debian/copyright index 5144c002c..3265a28c8 100644 --- a/ubuntu/maverick/applications/piklab/debian/copyright +++ b/ubuntu/maverick/applications/piklab/debian/copyright @@ -37,12 +37,12 @@ Copyright: src/progs/direct/base/direct.*: Copyright (C) Brian C. Lane src/common/gui/list_view.cpp: Copyright (C) 1992-2003 Trolltech AS. src/common/gui/editlistbox.cpp: Copyright (C) 2000 David Faure, Alexander Neundorf - src/common/nokde/nokde_kaboutdata.h: Copyright (C) 2000, Espen Sand + src/common/nokde/nokde_tdeaboutdata.h: Copyright (C) 2000, Espen Sand src/devices/pic/xml_data/*.xml: Copyright (C) 2007, Alan Page src/common/port/usb_port.cpp: Copyright (C) 2003-2005 Orion Sky Lawlor src/common/nokde/win32_utils.*: Copyright (C) 2004-2005, Jaroslaw Staniek - src/common/nokde/nokde_kcmdlineargs.*: Copyright (C) 1999, Waldo Bastian - src/common/nokde/nokde_kaboutdata.cpp: Copyright (C) 2000, Espen Sand + src/common/nokde/nokde_tdecmdlineargs.*: Copyright (C) 1999, Waldo Bastian + src/common/nokde/nokde_tdeaboutdata.cpp: Copyright (C) 2000, Espen Sand License: diff --git a/ubuntu/maverick/tdegames/debian/changelog b/ubuntu/maverick/tdegames/debian/changelog index 17e0e836e..2b3abf931 100644 --- a/ubuntu/maverick/tdegames/debian/changelog +++ b/ubuntu/maverick/tdegames/debian/changelog @@ -21,7 +21,7 @@ tdegames (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low * New upstream bugfix release (LP: #261366) - Bump version of tdelibs4-dev build dep to 3.5.10 - - Drop 11_include_kapplication.diff - applied upstream + - Drop 11_include_tdeapplication.diff - applied upstream -- Scott Kitterman Tue, 26 Aug 2008 00:42:38 -0400 @@ -62,7 +62,7 @@ tdegames (4:3.5.8-1) unstable; urgency=low tdegames (4:3.5.7-2) unstable; urgency=low - * Add patch to include kapplication.h in katomic. Fixes build failure on + * Add patch to include tdeapplication.h in katomic. Fixes build failure on alpha. Thanks to Steve Langasek for the fix. -- Debian Qt/KDE Maintainers Mon, 22 Jan 2007 05:59:42 +0100 diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index e0e516f86..ca194e680 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -104,10 +104,10 @@ debian/tmp/opt/trinity/include/kabc/vcardformatplugin.h debian/tmp/opt/trinity/include/kabc/vcard.h debian/tmp/opt/trinity/include/kabc/vcardline.h debian/tmp/opt/trinity/include/kabc/vcardparser.h -debian/tmp/opt/trinity/include/kaboutapplication.h -debian/tmp/opt/trinity/include/kaboutdata.h -debian/tmp/opt/trinity/include/kaboutdialog.h -debian/tmp/opt/trinity/include/kaboutkde.h +debian/tmp/opt/trinity/include/tdeaboutapplication.h +debian/tmp/opt/trinity/include/tdeaboutdata.h +debian/tmp/opt/trinity/include/tdeaboutdialog.h +debian/tmp/opt/trinity/include/tdeabouttde.h debian/tmp/opt/trinity/include/tdeaccelgen.h debian/tmp/opt/trinity/include/tdeaccel.h debian/tmp/opt/trinity/include/tdeaccelmanager.h @@ -121,7 +121,7 @@ debian/tmp/opt/trinity/include/kactivelabel.h debian/tmp/opt/trinity/include/kallocator.h debian/tmp/opt/trinity/include/kanimwidget.h debian/tmp/opt/trinity/include/kapp.h -debian/tmp/opt/trinity/include/kapplication.h +debian/tmp/opt/trinity/include/tdeapplication.h debian/tmp/opt/trinity/include/karchive.h debian/tmp/opt/trinity/include/kar.h debian/tmp/opt/trinity/include/karrowbutton.h @@ -156,7 +156,7 @@ debian/tmp/opt/trinity/include/kcharselect.h debian/tmp/opt/trinity/include/kcharsets.h debian/tmp/opt/trinity/include/kclientsocketbase.h debian/tmp/opt/trinity/include/kclipboard.h -debian/tmp/opt/trinity/include/kcmdlineargs.h +debian/tmp/opt/trinity/include/tdecmdlineargs.h debian/tmp/opt/trinity/include/kcmenumngr.h debian/tmp/opt/trinity/include/tdecmodulecontainer.h debian/tmp/opt/trinity/include/tdecmodule.h @@ -590,7 +590,7 @@ debian/tmp/opt/trinity/include/kstdguiitem.h debian/tmp/opt/trinity/include/kstreamsocket.h debian/tmp/opt/trinity/include/kstringhandler.h debian/tmp/opt/trinity/include/kstringvalidator.h -debian/tmp/opt/trinity/include/kstyle.h +debian/tmp/opt/trinity/include/tdestyle.h debian/tmp/opt/trinity/include/ksvgiconengine.h debian/tmp/opt/trinity/include/kswitchlanguagedialog.h debian/tmp/opt/trinity/include/tdesycocaentry.h -- cgit v1.2.3