From da62389748bc8803604ee639741dbf0d0c2d9c8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 22:14:39 -0600 Subject: Update Debian and Ubuntu packaging for latest GIT head --- .../kdelibs/debian/kdelibs-data-kde3.install | 12 +-- .../kdelibs/debian/kdelibs4-kde3-dev.install | 106 ++++++++++----------- .../patches/kubuntu_19_debianize_useragent.diff | 4 +- 3 files changed, 61 insertions(+), 61 deletions(-) (limited to 'ubuntu/maverick_automake/kdelibs') diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install index eee340dc0..30a8ea2d4 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs-data-kde3.install @@ -23,8 +23,8 @@ debian/tmp/opt/kde3/share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm debian/tmp/opt/kde3/share/apps/dcopidlng/kdocAstUtil.pm debian/tmp/opt/kde3/share/apps/dcopidlng/kdocParseDoc.pm debian/tmp/opt/kde3/share/apps/dcopidlng/kdocUtil.pm -debian/tmp/opt/kde3/share/apps/kabc/countrytransl.map -debian/tmp/opt/kde3/share/apps/kabc/formats/binary.desktop +debian/tmp/opt/kde3/share/apps/tdeabc/countrytransl.map +debian/tmp/opt/kde3/share/apps/tdeabc/formats/binary.desktop debian/tmp/opt/kde3/share/apps/katepart/katepartreadonlyui.rc debian/tmp/opt/kde3/share/apps/katepart/katepartui.rc debian/tmp/opt/kde3/share/apps/katepart/scripts/indent/script-indent-c1-test.lua @@ -3583,10 +3583,10 @@ debian/tmp/opt/kde3/share/services/kjavaappletviewer.desktop debian/tmp/opt/kde3/share/services/tdemailservice.protocol debian/tmp/opt/kde3/share/services/tdemultipart.desktop debian/tmp/opt/kde3/share/services/knotify.desktop -debian/tmp/opt/kde3/share/services/tderesources/kabc/dir.desktop -debian/tmp/opt/kde3/share/services/tderesources/kabc/file.desktop -debian/tmp/opt/kde3/share/services/tderesources/kabc/net.desktop -debian/tmp/opt/kde3/share/services/tderesources/kabc/ldapkio.desktop +debian/tmp/opt/kde3/share/services/tderesources/tdeabc/dir.desktop +debian/tmp/opt/kde3/share/services/tderesources/tdeabc/file.desktop +debian/tmp/opt/kde3/share/services/tderesources/tdeabc/net.desktop +debian/tmp/opt/kde3/share/services/tderesources/tdeabc/ldapkio.desktop debian/tmp/opt/kde3/share/services/tderesources/kabc_manager.desktop debian/tmp/opt/kde3/share/services/tdespell_aspell.desktop diff --git a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install index 0a96b4e79..f23a7c572 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install +++ b/ubuntu/maverick_automake/kdelibs/debian/kdelibs4-kde3-dev.install @@ -60,50 +60,50 @@ debian/tmp/opt/kde3/include/tde/dom/html_misc.h debian/tmp/opt/kde3/include/tde/dom/html_object.h debian/tmp/opt/kde3/include/tde/dom/html_table.h debian/tmp/opt/kde3/include/tde/fixx11h.h -debian/tmp/opt/kde3/include/tde/kabc/addressbook.h -debian/tmp/opt/kde3/include/tde/kabc/addresseedialog.h -debian/tmp/opt/kde3/include/tde/kabc/addressee.h -debian/tmp/opt/kde3/include/tde/kabc/addresseelist.h -debian/tmp/opt/kde3/include/tde/kabc/address.h -debian/tmp/opt/kde3/include/tde/kabc/addresslineedit.h -debian/tmp/opt/kde3/include/tde/kabc/agent.h -debian/tmp/opt/kde3/include/tde/kabc/distributionlistdialog.h -debian/tmp/opt/kde3/include/tde/kabc/distributionlisteditor.h -debian/tmp/opt/kde3/include/tde/kabc/distributionlist.h -debian/tmp/opt/kde3/include/tde/kabc/errorhandler.h -debian/tmp/opt/kde3/include/tde/kabc/field.h -debian/tmp/opt/kde3/include/tde/kabc/formatfactory.h -debian/tmp/opt/kde3/include/tde/kabc/format.h -debian/tmp/opt/kde3/include/tde/kabc/formatplugin.h -debian/tmp/opt/kde3/include/tde/kabc/geo.h -debian/tmp/opt/kde3/include/tde/kabc/key.h -debian/tmp/opt/kde3/include/tde/kabc/ldapclient.h -debian/tmp/opt/kde3/include/tde/kabc/ldapconfigwidget.h -debian/tmp/opt/kde3/include/tde/kabc/ldapurl.h -debian/tmp/opt/kde3/include/tde/kabc/ldifconverter.h -debian/tmp/opt/kde3/include/tde/kabc/ldif.h -debian/tmp/opt/kde3/include/tde/kabc/lock.h -debian/tmp/opt/kde3/include/tde/kabc/locknull.h -debian/tmp/opt/kde3/include/tde/kabc/phonenumber.h -debian/tmp/opt/kde3/include/tde/kabc/picture.h -debian/tmp/opt/kde3/include/tde/kabc/plugin.h -debian/tmp/opt/kde3/include/tde/kabc/resourcedir.h -debian/tmp/opt/kde3/include/tde/kabc/resourcefile.h -debian/tmp/opt/kde3/include/tde/kabc/resource.h -debian/tmp/opt/kde3/include/tde/kabc/resourceldapkio.h +debian/tmp/opt/kde3/include/tde/tdeabc/addressbook.h +debian/tmp/opt/kde3/include/tde/tdeabc/addresseedialog.h +debian/tmp/opt/kde3/include/tde/tdeabc/addressee.h +debian/tmp/opt/kde3/include/tde/tdeabc/addresseelist.h +debian/tmp/opt/kde3/include/tde/tdeabc/address.h +debian/tmp/opt/kde3/include/tde/tdeabc/addresslineedit.h +debian/tmp/opt/kde3/include/tde/tdeabc/agent.h +debian/tmp/opt/kde3/include/tde/tdeabc/distributionlistdialog.h +debian/tmp/opt/kde3/include/tde/tdeabc/distributionlisteditor.h +debian/tmp/opt/kde3/include/tde/tdeabc/distributionlist.h +debian/tmp/opt/kde3/include/tde/tdeabc/errorhandler.h +debian/tmp/opt/kde3/include/tde/tdeabc/field.h +debian/tmp/opt/kde3/include/tde/tdeabc/formatfactory.h +debian/tmp/opt/kde3/include/tde/tdeabc/format.h +debian/tmp/opt/kde3/include/tde/tdeabc/formatplugin.h +debian/tmp/opt/kde3/include/tde/tdeabc/geo.h +debian/tmp/opt/kde3/include/tde/tdeabc/key.h +debian/tmp/opt/kde3/include/tde/tdeabc/ldapclient.h +debian/tmp/opt/kde3/include/tde/tdeabc/ldapconfigwidget.h +debian/tmp/opt/kde3/include/tde/tdeabc/ldapurl.h +debian/tmp/opt/kde3/include/tde/tdeabc/ldifconverter.h +debian/tmp/opt/kde3/include/tde/tdeabc/ldif.h +debian/tmp/opt/kde3/include/tde/tdeabc/lock.h +debian/tmp/opt/kde3/include/tde/tdeabc/locknull.h +debian/tmp/opt/kde3/include/tde/tdeabc/phonenumber.h +debian/tmp/opt/kde3/include/tde/tdeabc/picture.h +debian/tmp/opt/kde3/include/tde/tdeabc/plugin.h +debian/tmp/opt/kde3/include/tde/tdeabc/resourcedir.h +debian/tmp/opt/kde3/include/tde/tdeabc/resourcefile.h +debian/tmp/opt/kde3/include/tde/tdeabc/resource.h +debian/tmp/opt/kde3/include/tde/tdeabc/resourceldapkio.h -debian/tmp/opt/kde3/include/tde/kabc/resourceselectdialog.h -debian/tmp/opt/kde3/include/tde/kabc/secrecy.h -debian/tmp/opt/kde3/include/tde/kabc/sortmode.h -debian/tmp/opt/kde3/include/tde/kabc/sound.h -debian/tmp/opt/kde3/include/tde/kabc/stdaddressbook.h -debian/tmp/opt/kde3/include/tde/kabc/timezone.h -debian/tmp/opt/kde3/include/tde/kabc/vcardconverter.h -debian/tmp/opt/kde3/include/tde/kabc/vcardformat.h -debian/tmp/opt/kde3/include/tde/kabc/vcardformatplugin.h -debian/tmp/opt/kde3/include/tde/kabc/vcard.h -debian/tmp/opt/kde3/include/tde/kabc/vcardline.h -debian/tmp/opt/kde3/include/tde/kabc/vcardparser.h +debian/tmp/opt/kde3/include/tde/tdeabc/resourceselectdialog.h +debian/tmp/opt/kde3/include/tde/tdeabc/secrecy.h +debian/tmp/opt/kde3/include/tde/tdeabc/sortmode.h +debian/tmp/opt/kde3/include/tde/tdeabc/sound.h +debian/tmp/opt/kde3/include/tde/tdeabc/stdaddressbook.h +debian/tmp/opt/kde3/include/tde/tdeabc/timezone.h +debian/tmp/opt/kde3/include/tde/tdeabc/vcardconverter.h +debian/tmp/opt/kde3/include/tde/tdeabc/vcardformat.h +debian/tmp/opt/kde3/include/tde/tdeabc/vcardformatplugin.h +debian/tmp/opt/kde3/include/tde/tdeabc/vcard.h +debian/tmp/opt/kde3/include/tde/tdeabc/vcardline.h +debian/tmp/opt/kde3/include/tde/tdeabc/vcardparser.h debian/tmp/opt/kde3/include/tde/tdeaboutapplication.h debian/tmp/opt/kde3/include/tde/tdeaboutdata.h debian/tmp/opt/kde3/include/tde/tdeaboutdialog.h @@ -238,7 +238,7 @@ debian/tmp/opt/kde3/include/tde/kdialog.h debian/tmp/opt/kde3/include/tde/kdirlister.h debian/tmp/opt/kde3/include/tde/kdirnotify.h debian/tmp/opt/kde3/include/tde/kdirnotify_stub.h -debian/tmp/opt/kde3/include/tde/kdiroperator.h +debian/tmp/opt/kde3/include/tde/tdediroperator.h debian/tmp/opt/kde3/include/tde/kdirselectdialog.h debian/tmp/opt/kde3/include/tde/kdirsize.h debian/tmp/opt/kde3/include/tde/kdirwatch.h @@ -251,7 +251,7 @@ debian/tmp/opt/kde3/include/tde/kdualcolorbutton.h debian/tmp/opt/kde3/include/tde/keditcl.h debian/tmp/opt/kde3/include/tde/keditlistbox.h debian/tmp/opt/kde3/include/tde/kedittoolbar.h -debian/tmp/opt/kde3/include/tde/kemailsettings.h +debian/tmp/opt/kde3/include/tde/tdeemailsettings.h debian/tmp/opt/kde3/include/tde/kencodingfiledialog.h debian/tmp/opt/kde3/include/tde/kextendedsocket.h debian/tmp/opt/kde3/include/tde/kextsock.h @@ -280,8 +280,8 @@ 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 -debian/tmp/opt/kde3/include/tde/kglobal.h -debian/tmp/opt/kde3/include/tde/kglobalsettings.h +debian/tmp/opt/kde3/include/tde/tdeglobal.h +debian/tmp/opt/kde3/include/tde/tdeglobalsettings.h debian/tmp/opt/kde3/include/tde/kguiitem.h debian/tmp/opt/kde3/include/tde/khelpmenu.h debian/tmp/opt/kde3/include/tde/khexedit/byteseditinterface.h @@ -379,7 +379,7 @@ debian/tmp/opt/kde3/include/tde/klineedit.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/tdelocale.h debian/tmp/opt/kde3/include/tde/klockfile.h debian/tmp/opt/kde3/include/tde/kmacroexpander.h debian/tmp/opt/kde3/include/tde/tdemainwindow.h @@ -404,8 +404,8 @@ debian/tmp/opt/kde3/include/tde/tdemditoolviewaccessor.h debian/tmp/opt/kde3/include/tde/tdemediaplayer/playerdcopobject.h debian/tmp/opt/kde3/include/tde/tdemediaplayer/player.h debian/tmp/opt/kde3/include/tde/tdemediaplayer/view.h -debian/tmp/opt/kde3/include/tde/kmenubar.h -debian/tmp/opt/kde3/include/tde/kmessagebox.h +debian/tmp/opt/kde3/include/tde/tdemenubar.h +debian/tmp/opt/kde3/include/tde/tdemessagebox.h debian/tmp/opt/kde3/include/tde/kmimemagic.h debian/tmp/opt/kde3/include/tde/kmimesourcefactory.h debian/tmp/opt/kde3/include/tde/kmimetypechooser.h @@ -477,7 +477,7 @@ debian/tmp/opt/kde3/include/tde/kprogressbox.h debian/tmp/opt/kde3/include/tde/kpropertiesdialog.h debian/tmp/opt/kde3/include/tde/kpropsdlg.h debian/tmp/opt/kde3/include/tde/kprotocolinfo.h -debian/tmp/opt/kde3/include/tde/kprotocolmanager.h +debian/tmp/opt/kde3/include/tde/tdeprotocolmanager.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 @@ -578,7 +578,7 @@ debian/tmp/opt/kde3/include/tde/ksslutils.h debian/tmp/opt/kde3/include/tde/ksslx509map.h debian/tmp/opt/kde3/include/tde/ksslx509v3.h debian/tmp/opt/kde3/include/tde/kstandarddirs.h -debian/tmp/opt/kde3/include/tde/kstartupinfo.h +debian/tmp/opt/kde3/include/tde/tdestartupinfo.h debian/tmp/opt/kde3/include/tde/kstaticdeleter.h debian/tmp/opt/kde3/include/tde/kstatusbar.h debian/tmp/opt/kde3/include/tde/tdestdaccel.h @@ -601,7 +601,7 @@ debian/tmp/opt/kde3/include/tde/ktabctl.h debian/tmp/opt/kde3/include/tde/ktabwidget.h debian/tmp/opt/kde3/include/tde/ktar.h debian/tmp/opt/kde3/include/tde/ktempdir.h -debian/tmp/opt/kde3/include/tde/ktempfile.h +debian/tmp/opt/kde3/include/tde/tdetempfile.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 diff --git a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff index a8e8a4ab1..3c0e3595e 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff +++ b/ubuntu/maverick_automake/kdelibs/debian/patches/kubuntu_19_debianize_useragent.diff @@ -1,5 +1,5 @@ ---- a/tdeio/tdeio/kprotocolmanager.cpp -+++ b/tdeio/tdeio/kprotocolmanager.cpp +--- a/tdeio/tdeio/tdeprotocolmanager.cpp ++++ b/tdeio/tdeio/tdeprotocolmanager.cpp @@ -450,14 +450,19 @@ return d->useragent; -- cgit v1.2.1