From a60fb3aff20c1280342b61c6cac80a63a6952aaa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 18:51:31 -0600 Subject: Update Debian and Ubuntu packaging for latest GIT --- ubuntu/lucid_automake/kdelibs/debian/changelog | 8 +-- .../kdelibs/debian/kdelibs-data-kde3.install | 10 ++-- .../kdelibs/debian/kdelibs4-kde3-dev.install | 58 +++++++++++----------- .../patches/kubuntu_51_launchpad_integration.diff | 4 +- 4 files changed, 40 insertions(+), 40 deletions(-) (limited to 'ubuntu/lucid_automake/kdelibs/debian') diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog index b1123744c..28baa837e 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/changelog +++ b/ubuntu/lucid_automake/kdelibs/debian/changelog @@ -432,7 +432,7 @@ kdelibs (4:3.5.8-0ubuntu4) hardy; urgency=low kdelibs (4:3.5.8-0ubuntu3.1) gutsy-proposed; urgency=low - * Add kubuntu_94_kselectaction.diff Closes: LP #155144 + * Add kubuntu_94_tdeselectaction.diff Closes: LP #155144 Editable TDESelectAction stopped working for custom values -- Jonathan Riddell Sun, 21 Oct 2007 00:09:25 +0100 @@ -1921,7 +1921,7 @@ kdelibs (4:3.4.2-2) unstable; urgency=low kdelibs (4:3.4.2-1) unstable; urgency=low * New upstream release. Includes a forward declaration of KXMLGUIClient in - kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543, + tdeactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543, #318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS). * KDE_3_4_BRANCH update. @@ -2240,7 +2240,7 @@ kdelibs (4:3.3.2-5) unstable; urgency=medium * Add GFDL to debian/copyright. - * Add another kaccel patch that fixes non-English keyboards on + * Add another tdeaccel patch that fixes non-English keyboards on SunRay terminals. Thanks to Nikita Youshchenko. (Closes: #301971) -- Debian Qt/KDE Maintainers Fri, 22 Apr 2005 11:21:11 -0400 @@ -2354,7 +2354,7 @@ kdelibs (4:3.3.2-1) unstable; urgency=medium * Add patch to change the group set by KDE CUPS configurator to Debian's default, lpadmin, rather than sys. (Closes: #263430) - * Add kaccel hack that works around a Konqueror crash with Russian keyboards. + * Add tdeaccel hack that works around a Konqueror crash with Russian keyboards. (Closes: #287566) * Change debian/copyright file to refer to licenses, instead of copyright, diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install index a50a89f4b..eee340dc0 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs-data-kde3.install @@ -186,7 +186,7 @@ debian/tmp/opt/kde3/share/apps/kdeui/about/top-middle.png debian/tmp/opt/kde3/share/apps/kdeui/pics/aboutkde.png debian/tmp/opt/kde3/share/apps/kdeui/pics/ktip-background.png debian/tmp/opt/kde3/share/apps/kdeui/pics/ktip-bulb.png -debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kactionselector.png +debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdeactionselector.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kactivelabel.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kcharselect.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdecmodule.png @@ -202,8 +202,8 @@ debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kdoublenuminput.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kdoublespinbox.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kdualcolorbutton.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/keditlistbox.png -debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kfontcombo.png -debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kfontrequester.png +debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdefontcombo.png +debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdefontrequester.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kgradientselector.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/khistorycombo.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/khsselector.png @@ -214,8 +214,8 @@ debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kintspinbox.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kkeybutton.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kled.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/klineedit.png -debian/tmp/opt/kde3/share/apps/kdewidgets/pics/klistbox.png -debian/tmp/opt/kde3/share/apps/kdewidgets/pics/klistview.png +debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdelistbox.png +debian/tmp/opt/kde3/share/apps/kdewidgets/pics/tdelistview.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kpalettetable.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kpasswordedit.png debian/tmp/opt/kde3/share/apps/kdewidgets/pics/kprogress.png diff --git a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install index 9b33d9723..94ff0f7c4 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/lucid_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -108,15 +108,15 @@ debian/tmp/opt/kde3/include/tde/kaboutapplication.h debian/tmp/opt/kde3/include/tde/kaboutdata.h debian/tmp/opt/kde3/include/tde/kaboutdialog.h debian/tmp/opt/kde3/include/tde/kaboutkde.h -debian/tmp/opt/kde3/include/tde/kaccelgen.h -debian/tmp/opt/kde3/include/tde/kaccel.h -debian/tmp/opt/kde3/include/tde/kaccelmanager.h +debian/tmp/opt/kde3/include/tde/tdeaccelgen.h +debian/tmp/opt/kde3/include/tde/tdeaccel.h +debian/tmp/opt/kde3/include/tde/tdeaccelmanager.h debian/tmp/opt/kde3/include/tde/kacl.h -debian/tmp/opt/kde3/include/tde/kactionclasses.h -debian/tmp/opt/kde3/include/tde/kactioncollection.h -debian/tmp/opt/kde3/include/tde/kaction.h -debian/tmp/opt/kde3/include/tde/kactionselector.h -debian/tmp/opt/kde3/include/tde/kactionshortcutlist.h +debian/tmp/opt/kde3/include/tde/tdeactionclasses.h +debian/tmp/opt/kde3/include/tde/tdeactioncollection.h +debian/tmp/opt/kde3/include/tde/tdeaction.h +debian/tmp/opt/kde3/include/tde/tdeactionselector.h +debian/tmp/opt/kde3/include/tde/tdeactionshortcutlist.h debian/tmp/opt/kde3/include/tde/kactivelabel.h debian/tmp/opt/kde3/include/tde/kallocator.h debian/tmp/opt/kde3/include/tde/kanimwidget.h @@ -274,9 +274,9 @@ debian/tmp/opt/kde3/include/tde/kfilterbase.h debian/tmp/opt/kde3/include/tde/kfilterdev.h debian/tmp/opt/kde3/include/tde/kfinddialog.h debian/tmp/opt/kde3/include/tde/kfind.h -debian/tmp/opt/kde3/include/tde/kfontcombo.h -debian/tmp/opt/kde3/include/tde/kfontdialog.h -debian/tmp/opt/kde3/include/tde/kfontrequester.h +debian/tmp/opt/kde3/include/tde/tdefontcombo.h +debian/tmp/opt/kde3/include/tde/tdefontdialog.h +debian/tmp/opt/kde3/include/tde/tdefontrequester.h debian/tmp/opt/kde3/include/tde/kgenericfactory.h debian/tmp/opt/kde3/include/tde/kgenericfactory.tcc debian/tmp/opt/kde3/include/tde/kglobalaccel.h @@ -376,14 +376,14 @@ debian/tmp/opt/kde3/include/tde/kled.h debian/tmp/opt/kde3/include/tde/klibloader.h debian/tmp/opt/kde3/include/tde/klineeditdlg.h debian/tmp/opt/kde3/include/tde/klineedit.h -debian/tmp/opt/kde3/include/tde/klistbox.h -debian/tmp/opt/kde3/include/tde/klistview.h -debian/tmp/opt/kde3/include/tde/klistviewsearchline.h +debian/tmp/opt/kde3/include/tde/tdelistbox.h +debian/tmp/opt/kde3/include/tde/tdelistview.h +debian/tmp/opt/kde3/include/tde/tdelistviewsearchline.h debian/tmp/opt/kde3/include/tde/klocale.h debian/tmp/opt/kde3/include/tde/klockfile.h debian/tmp/opt/kde3/include/tde/kmacroexpander.h -debian/tmp/opt/kde3/include/tde/kmainwindow.h -debian/tmp/opt/kde3/include/tde/kmainwindowiface.h +debian/tmp/opt/kde3/include/tde/tdemainwindow.h +debian/tmp/opt/kde3/include/tde/tdemainwindowiface.h debian/tmp/opt/kde3/include/tde/kmanagerselection.h debian/tmp/opt/kde3/include/tde/kmdcodec.h debian/tmp/opt/kde3/include/tde/tdemdichildarea.h @@ -444,7 +444,7 @@ debian/tmp/opt/kde3/include/tde/tdeparts/browserextension.h debian/tmp/opt/kde3/include/tde/tdeparts/browserinterface.h debian/tmp/opt/kde3/include/tde/tdeparts/browserrun.h debian/tmp/opt/kde3/include/tde/tdeparts/componentfactory.h -debian/tmp/opt/kde3/include/tde/tdeparts/dockmainwindow.h +debian/tmp/opt/kde3/include/tde/tdeparts/doctdemainwindow.h debian/tmp/opt/kde3/include/tde/tdeparts/event.h debian/tmp/opt/kde3/include/tde/tdeparts/factory.h debian/tmp/opt/kde3/include/tde/tdeparts/genericfactory.h @@ -465,7 +465,7 @@ debian/tmp/opt/kde3/include/tde/kpixmapregionselectorwidget.h debian/tmp/opt/kde3/include/tde/kpixmapsplitter.h debian/tmp/opt/kde3/include/tde/kplugininfo.h debian/tmp/opt/kde3/include/tde/kpluginselector.h -debian/tmp/opt/kde3/include/tde/kpopupmenu.h +debian/tmp/opt/kde3/include/tde/tdepopupmenu.h debian/tmp/opt/kde3/include/tde/kpreviewwidgetbase.h debian/tmp/opt/kde3/include/tde/kprintaction.h debian/tmp/opt/kde3/include/tde/kprinter.h @@ -481,7 +481,7 @@ debian/tmp/opt/kde3/include/tde/kprotocolmanager.h debian/tmp/opt/kde3/include/tde/kpty.h debian/tmp/opt/kde3/include/tde/kpushbutton.h debian/tmp/opt/kde3/include/tde/krandomsequence.h -debian/tmp/opt/kde3/include/tde/krecentdocument.h +debian/tmp/opt/kde3/include/tde/tderecentdocument.h debian/tmp/opt/kde3/include/tde/kregexpeditorinterface.h debian/tmp/opt/kde3/include/tde/kregexp.h debian/tmp/opt/kde3/include/tde/kremoteencoding.h @@ -511,7 +511,7 @@ debian/tmp/opt/kde3/include/tde/ksconfig.h debian/tmp/opt/kde3/include/tde/tdescreensaver.h debian/tmp/opt/kde3/include/tde/tdescreensaver_vroot.h debian/tmp/opt/kde3/include/tde/kscrollview.h -debian/tmp/opt/kde3/include/tde/kselect.h +debian/tmp/opt/kde3/include/tde/tdeselect.h debian/tmp/opt/kde3/include/tde/kseparator.h debian/tmp/opt/kde3/include/tde/kserversocket.h debian/tmp/opt/kde3/include/tde/kservicegroup.h @@ -525,9 +525,9 @@ debian/tmp/opt/kde3/include/tde/ksharedpixmap.h debian/tmp/opt/kde3/include/tde/ksharedptr.h debian/tmp/opt/kde3/include/tde/kshellcompletion.h debian/tmp/opt/kde3/include/tde/kshell.h -debian/tmp/opt/kde3/include/tde/kshortcutdialog.h -debian/tmp/opt/kde3/include/tde/kshortcut.h -debian/tmp/opt/kde3/include/tde/kshortcutlist.h +debian/tmp/opt/kde3/include/tde/tdeshortcutdialog.h +debian/tmp/opt/kde3/include/tde/tdeshortcut.h +debian/tmp/opt/kde3/include/tde/tdeshortcutlist.h debian/tmp/opt/kde3/include/tde/kshred.h debian/tmp/opt/kde3/include/tde/ksimpleconfig.h debian/tmp/opt/kde3/include/tde/ksmimecrypto.h @@ -581,7 +581,7 @@ debian/tmp/opt/kde3/include/tde/kstandarddirs.h debian/tmp/opt/kde3/include/tde/kstartupinfo.h debian/tmp/opt/kde3/include/tde/kstaticdeleter.h debian/tmp/opt/kde3/include/tde/kstatusbar.h -debian/tmp/opt/kde3/include/tde/kstdaccel.h +debian/tmp/opt/kde3/include/tde/tdestdaccel.h debian/tmp/opt/kde3/include/tde/kstdaction.h debian/tmp/opt/kde3/include/tde/kstddirs.h debian/tmp/opt/kde3/include/tde/kstdguiitem.h @@ -604,7 +604,7 @@ debian/tmp/opt/kde3/include/tde/ktempdir.h debian/tmp/opt/kde3/include/tde/ktempfile.h debian/tmp/opt/kde3/include/tde/ktextbrowser.h debian/tmp/opt/kde3/include/tde/ktextedit.h -debian/tmp/opt/kde3/include/tde/tdetexteditor/blockselectioninterface.h +debian/tmp/opt/kde3/include/tde/tdetexteditor/bloctdeselectioninterface.h debian/tmp/opt/kde3/include/tde/tdetexteditor/clipboardinterface.h debian/tmp/opt/kde3/include/tde/tdetexteditor/codecompletioninterface.h debian/tmp/opt/kde3/include/tde/tdetexteditor/configinterfaceextension.h @@ -641,10 +641,10 @@ debian/tmp/opt/kde3/include/tde/ktimewidget.h debian/tmp/opt/kde3/include/tde/ktimezones.h debian/tmp/opt/kde3/include/tde/ktimezonewidget.h debian/tmp/opt/kde3/include/tde/ktip.h -debian/tmp/opt/kde3/include/tde/ktoolbarbutton.h -debian/tmp/opt/kde3/include/tde/ktoolbar.h -debian/tmp/opt/kde3/include/tde/ktoolbarlabelaction.h -debian/tmp/opt/kde3/include/tde/ktoolbarradiogroup.h +debian/tmp/opt/kde3/include/tde/tdetoolbarbutton.h +debian/tmp/opt/kde3/include/tde/tdetoolbar.h +debian/tmp/opt/kde3/include/tde/tdetoolbarlabelaction.h +debian/tmp/opt/kde3/include/tde/tdetoolbarradiogroup.h debian/tmp/opt/kde3/include/tde/ktrader.h debian/tmp/opt/kde3/include/tde/ktypelist.h debian/tmp/opt/kde3/include/tde/kuniqueapp.h diff --git a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff index 80238d564..dd8e6dbe1 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff +++ b/ubuntu/lucid_automake/kdelibs/debian/patches/kubuntu_51_launchpad_integration.diff @@ -2,8 +2,8 @@ diff -Nur kdelibs-3.5.8/kdeui/khelpmenu.cpp kdelibs-3.5.8.new/kdeui/khelpmenu.cp --- kdelibs-3.5.8/kdeui/khelpmenu.cpp 2007-10-08 10:52:12.000000000 +0100 +++ kdelibs-3.5.8.new/kdeui/khelpmenu.cpp 2007-10-09 09:42:02.000000000 +0100 @@ -41,6 +41,7 @@ - #include - #include + #include + #include #include +#include -- cgit v1.2.1