[SCM] KDE Base Applications module packaging branch, kde4.8, updated. debian/4.7.4-1-6-g599cdbc

Eshat Cakar eshat-guest at alioth.debian.org
Mon Jan 30 22:05:59 UTC 2012 

The following commit has been merged in the kde4.8 branch:
commit 599cdbc1af501c511d5dc55fed6e0887c6d1280c
Author: Eshat Cakar <info at eshat.de>
Date:   Mon Jan 30 23:05:38 2012 +0100

    sort *.install
---
 debian/dolphin.install            |    2 +-
 debian/kde-baseapps-bin.install   |    2 +-
 debian/kde-baseapps-data.install  |    2 +-
 debian/konq-plugins.install       |    2 +-
 debian/konqueror.install          |    8 ++++----
 debian/konsole.install            |   12 ++++++------
 debian/libkonq5-dev.install       |    4 ++--
 debian/libkonq5-templates.install |   28 ++++++++++++++--------------
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/debian/dolphin.install b/debian/dolphin.install
index 8b07edd..99cdce5 100644
--- a/debian/dolphin.install
+++ b/debian/dolphin.install
@@ -24,8 +24,8 @@ usr/share/doc/kde/HTML/en/dolphin/preferences-services.png
 usr/share/doc/kde/HTML/en/dolphin/preferences-startup.png
 usr/share/doc/kde/HTML/en/dolphin/preferences-trash.png
 usr/share/doc/kde/HTML/en/dolphin/preferences-viewmodes-icons.png
-usr/share/doc/kde/HTML/en/dolphin/toolbar.png
 usr/share/doc/kde/HTML/en/dolphin/toolbar-navigation.png
+usr/share/doc/kde/HTML/en/dolphin/toolbar.png
 usr/share/doc/kde/HTML/en/dolphin/toolbar-view-appearance.png
 usr/share/doc/kde/HTML/en/dolphin/viewproperties-dialog.png
 usr/share/kde4/apps/dolphin/dolphinui.rc
diff --git a/debian/kde-baseapps-bin.install b/debian/kde-baseapps-bin.install
index a4ec648..65fdf82 100644
--- a/debian/kde-baseapps-bin.install
+++ b/debian/kde-baseapps-bin.install
@@ -2,8 +2,8 @@ usr/bin/kbookmarkmerger
 usr/bin/kdialog
 usr/bin/keditbookmarks
 usr/lib/kde4/kcm_kio.so
-usr/lib/kde4/kcm_konq.so
 usr/lib/kde4/kcm_konqhtml.so
+usr/lib/kde4/kcm_konq.so
 usr/lib/kde4/kcm_kurifilt.so
 usr/lib/kde4/kcm_performance.so
 usr/lib/libkbookmarkmodel_private.so.4
diff --git a/debian/kde-baseapps-data.install b/debian/kde-baseapps-data.install
index 0a7f1d5..bfd9e27 100644
--- a/debian/kde-baseapps-data.install
+++ b/debian/kde-baseapps-data.install
@@ -5,12 +5,12 @@ usr/share/kde4/apps/kcmcss/template.css
 usr/share/kde4/apps/kcontrol/pics/onlyone.png
 usr/share/kde4/apps/kcontrol/pics/overlapping.png
 usr/share/kde4/apps/kdm/pics/users/Blackbox.png
+usr/share/kde4/apps/kdm/pics/users/bomb.png
 usr/share/kde4/apps/kdm/pics/users/Green.png
 usr/share/kde4/apps/kdm/pics/users/Happy.png
 usr/share/kde4/apps/kdm/pics/users/Listening.png
 usr/share/kde4/apps/kdm/pics/users/Notme.png
 usr/share/kde4/apps/kdm/pics/users/TV.png
-usr/share/kde4/apps/kdm/pics/users/bomb.png
 usr/share/kde4/apps/keditbookmarks/keditbookmarks-genui.rc
 usr/share/kde4/apps/keditbookmarks/keditbookmarksui.rc
 usr/share/kde4/apps/kwebkitpart/kpartplugins/khtmlkttsd.desktop
diff --git a/debian/konq-plugins.install b/debian/konq-plugins.install
index bdf71cc..18530a5 100644
--- a/debian/konq-plugins.install
+++ b/debian/konq-plugins.install
@@ -87,6 +87,6 @@ usr/share/kde4/apps/kwebkitpart/kpartplugins/uachangerplugin.desktop
 usr/share/kde4/apps/kwebkitpart/kpartplugins/uachangerplugin.rc
 usr/share/kde4/config.kcfg/validators.kcfg
 usr/share/kde4/config/translaterc
-usr/share/kde4/services/ServiceMenus/imageconverter.desktop
 usr/share/kde4/services/fsview_part.desktop
+usr/share/kde4/services/ServiceMenus/imageconverter.desktop
 usr/share/kde4/services/webarchivethumbnail.desktop
diff --git a/debian/konqueror.install b/debian/konqueror.install
index 737143e..c8d5074 100644
--- a/debian/konqueror.install
+++ b/debian/konqueror.install
@@ -5,11 +5,11 @@ usr/lib/kde4/kded_konqy_preloader.so
 usr/lib/kde4/khtmlkttsdplugin.so
 usr/lib/kde4/konq_aboutpage.so
 usr/lib/kde4/konq_shellcmdplugin.so
+usr/lib/kde4/konqsidebar_history.so
+usr/lib/kde4/konqsidebar_places.so
 usr/lib/kde4/konq_sidebar.so
 usr/lib/kde4/konq_sidebartree_bookmarks.so
 usr/lib/kde4/konq_sidebartree_dirtree.so
-usr/lib/kde4/konqsidebar_history.so
-usr/lib/kde4/konqsidebar_places.so
 usr/lib/kde4/konqsidebar_tree.so
 usr/lib/kde4/konqsidebar_web.so
 usr/lib/libkdeinit4_kfmclient.so
@@ -82,13 +82,13 @@ usr/share/kde4/apps/konqsidebartng/plugins/konqsidebar_web.desktop
 usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/.directory
 usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/ftp/.directory
 usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/.directory
 usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
+usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/.directory
 usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
 usr/share/kde4/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
-usr/share/kde4/apps/konqsidebartng/virtual_folders/services/.directory
 usr/share/kde4/apps/konqsidebartng/virtual_folders/services/applications.desktop
+usr/share/kde4/apps/konqsidebartng/virtual_folders/services/.directory
 usr/share/kde4/apps/konqueror/about/box-centre-konqueror.png
 usr/share/kde4/apps/konqueror/about/intro.html
 usr/share/kde4/apps/konqueror/about/konq.css
diff --git a/debian/konsole.install b/debian/konsole.install
index 54b27d6..62c2e2f 100644
--- a/debian/konsole.install
+++ b/debian/konsole.install
@@ -11,18 +11,18 @@ usr/share/kde4/apps/konsole/BlackOnLightYellow.schema
 usr/share/kde4/apps/konsole/BlackOnRandomLight.colorscheme
 usr/share/kde4/apps/konsole/BlackOnWhite.schema
 usr/share/kde4/apps/konsole/DarkPastels.colorscheme
-usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
-usr/share/kde4/apps/konsole/Linux.colorscheme
-usr/share/kde4/apps/konsole/README.KeyTab
-usr/share/kde4/apps/konsole/Shell.profile
-usr/share/kde4/apps/konsole/WhiteOnBlack.schema
 usr/share/kde4/apps/konsole/default.keytab
+usr/share/kde4/apps/konsole/GreenOnBlack.colorscheme
 usr/share/kde4/apps/konsole/konsole.notifyrc
 usr/share/kde4/apps/konsole/konsoleui.rc
+usr/share/kde4/apps/konsole/Linux.colorscheme
 usr/share/kde4/apps/konsole/linux.keytab
 usr/share/kde4/apps/konsole/partui.rc
+usr/share/kde4/apps/konsole/README.KeyTab
 usr/share/kde4/apps/konsole/sessionui.rc
+usr/share/kde4/apps/konsole/Shell.profile
 usr/share/kde4/apps/konsole/solaris.keytab
-usr/share/kde4/services/ServiceMenus/konsolehere.desktop
+usr/share/kde4/apps/konsole/WhiteOnBlack.schema
 usr/share/kde4/services/konsolepart.desktop
+usr/share/kde4/services/ServiceMenus/konsolehere.desktop
 usr/share/kde4/servicetypes/terminalemulator.desktop
diff --git a/debian/libkonq5-dev.install b/debian/libkonq5-dev.install
index 8972694..2046b9c 100644
--- a/debian/libkonq5-dev.install
+++ b/debian/libkonq5-dev.install
@@ -5,13 +5,13 @@ usr/include/konq_fileitemcapabilities.h
 usr/include/konq_historyentry.h
 usr/include/konq_historyprovider.h
 usr/include/konq_menuactions.h
+usr/include/konqmimedata.h
 usr/include/konq_operations.h
 usr/include/konq_popupmenu.h
 usr/include/konq_popupmenuinformation.h
 usr/include/konq_popupmenuplugin.h
-usr/include/konqmimedata.h
-usr/include/kversioncontrolplugin.h
 usr/include/kversioncontrolplugin2.h
+usr/include/kversioncontrolplugin.h
 usr/include/libkonq_export.h
 usr/lib/libkonq.so
 usr/share/dbus-1/interfaces/org.kde.FavIcon.xml
diff --git a/debian/libkonq5-templates.install b/debian/libkonq5-templates.install
index 4af5082..d8b6cec 100644
--- a/debian/libkonq5-templates.install
+++ b/debian/libkonq5-templates.install
@@ -1,19 +1,5 @@
-usr/share/templates/.source/CAMERA-Device.desktop
-usr/share/templates/.source/CDROM-Device.desktop
-usr/share/templates/.source/CDWRITER-Device.desktop
-usr/share/templates/.source/DVDROM-Device.desktop
-usr/share/templates/.source/Floppy.desktop
-usr/share/templates/.source/HD.desktop
-usr/share/templates/.source/HTMLFile.html
-usr/share/templates/.source/MO-Device.desktop
-usr/share/templates/.source/NFS.desktop
-usr/share/templates/.source/Program.desktop
-usr/share/templates/.source/TextFile.txt
-usr/share/templates/.source/URL.desktop
-usr/share/templates/.source/ZIP-Device.desktop
 usr/share/templates/Directory.desktop
 usr/share/templates/HTMLFile.desktop
-usr/share/templates/TextFile.desktop
 usr/share/templates/linkCAMERA.desktop
 usr/share/templates/linkCDROM.desktop
 usr/share/templates/linkCDWRITER.desktop
@@ -26,3 +12,17 @@ usr/share/templates/linkPath.desktop
 usr/share/templates/linkProgram.desktop
 usr/share/templates/linkURL.desktop
 usr/share/templates/linkZIP.desktop
+usr/share/templates/.source/CAMERA-Device.desktop
+usr/share/templates/.source/CDROM-Device.desktop
+usr/share/templates/.source/CDWRITER-Device.desktop
+usr/share/templates/.source/DVDROM-Device.desktop
+usr/share/templates/.source/Floppy.desktop
+usr/share/templates/.source/HD.desktop
+usr/share/templates/.source/HTMLFile.html
+usr/share/templates/.source/MO-Device.desktop
+usr/share/templates/.source/NFS.desktop
+usr/share/templates/.source/Program.desktop
+usr/share/templates/.source/TextFile.txt
+usr/share/templates/.source/URL.desktop
+usr/share/templates/.source/ZIP-Device.desktop
+usr/share/templates/TextFile.desktop

-- 
KDE Base Applications module packaging

More information about the pkg-kde-commits mailing list