[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.5-3-34-g87ab2c3

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Tue Oct 11 00:26:41 UTC 2011 

The following commit has been merged in the master branch:
commit 98eccdd8d7761f2a0fa0c3d7a718a4f8faa2d400
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Oct 11 00:24:38 2011 +0200

    Add kmenuedit package.
---
 debian/changelog                  |    1 +
 debian/control                    |   16 ++++++++++++----
 debian/kde-workspace-bin.install  |    3 ---
 debian/kde-workspace-data.install |   18 ------------------
 debian/kmenuedit.install          |   21 +++++++++++++++++++++
 5 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78ea363..bcc66d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ kde-workspace (4:4.7.2-0r0) UNRELEASED; urgency=low
       builds against libpng packages in experimental.
   * Update installed files.
   * Ship Oxygen style in a separate package: kde-style-oxygen. (Closes: #630012)
+  * Ship kmenuedit in a separate package.
   * Bump sonames due to binary incompatible changes:
     - libkwineffects1abi1 -> libkwineffects1abi2
     - libplasmaclock4abi1 -> libplasmaclock4abi2
diff --git a/debian/control b/debian/control
index 5084fcf..7c5e133 100644
--- a/debian/control
+++ b/debian/control
@@ -103,9 +103,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, iso-codes,
 Recommends: plasma-scriptengines, polkit-kde-1 (>= 0.99) | policykit-1-gnome,
  upower [linux-any]
 Suggests: x11-xkb-utils
-Replaces: kcontrol, kmenuedit, ktip, libkfontinst4, ksplash, kdesktop,
+Replaces: kcontrol, ktip, libkfontinst4, ksplash, kdesktop,
  kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2) 
-Breaks: kcontrol, kmenuedit, ktip, libkfontinst4, kdesktop, ksplash,
+Breaks: kcontrol, ktip, libkfontinst4, kdesktop, ksplash,
  kdebase-runtime (<< 4:4.5), kdebase-data (<< 4:4.5), kdebase-workspace-bin (<< 4:4.7.2),
  polkit-kde-1 (<< 0.99)
 Description: core binaries for the KDE Plasma Workspace
@@ -120,10 +120,10 @@ Description: core binaries for the KDE Plasma Workspace
 Package: kde-workspace-data
 Architecture: all
 Depends: oxygencursors, ${misc:Depends}, ${perl:Depends}
-Replaces: ksmserver, kmenuedit, ktip, ksplash, libplasma1,
+Replaces: ksmserver, ktip, ksplash, libplasma1,
  kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80),
  kdebase-workspace-data (<< 4:4.7.2) 
-Breaks: ksmserver, kmenuedit, ktip, ksplash, libplasma1,
+Breaks: ksmserver, ktip, ksplash, libplasma1,
  kdebase-runtime-data (<< 4:4.5), kde-icons-mono (<< 4:4.6.80),
  kdebase-workspace-data (<< 4:4.7.2) 
 Description: shared data files for the KDE Plasma Workspace
@@ -380,6 +380,14 @@ Replaces: kdebase-workspace-bin (<< 4:4.7.2), kdebase-workspace-data (<< 4:4.7.2
 Description: ...
  ...
 
+Package: kmenuedit
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: kdebase-workspace-bin (<< 4:4.7.2), kdebase-workspace-data (<< 4:4.7.2)
+Replaces: kdebase-workspace-bin (<< 4:4.7.2), kdebase-workspace-data (<< 4:4.7.2)
+Description: ...
+ ...
+
 Package: libkephal4abi1
 Section: libs
 Architecture: any
diff --git a/debian/kde-workspace-bin.install b/debian/kde-workspace-bin.install
index e4f1c01..ecd2677 100644
--- a/debian/kde-workspace-bin.install
+++ b/debian/kde-workspace-bin.install
@@ -7,7 +7,6 @@ usr/bin/kcminit_startup
 usr/bin/kdostartupconfig4
 usr/bin/kfontinst
 usr/bin/kfontview
-usr/bin/kmenuedit
 usr/bin/krandom.kss
 usr/bin/krandrstartup
 usr/bin/krandrtray
@@ -122,7 +121,6 @@ usr/lib/kde4/solid_wicd.so
 usr/lib/libkdeinit4_kaccess.so
 usr/lib/libkdeinit4_kcminit.so
 usr/lib/libkdeinit4_kcminit_startup.so
-usr/lib/libkdeinit4_kmenuedit.so
 usr/lib/libkdeinit4_krunner.so
 usr/lib/libkdeinit4_ksmserver.so
 usr/lib/libkdeinit4_plasma-windowed.so
@@ -137,7 +135,6 @@ usr/lib/libpowerdevilcore.so.0.1.0
 usr/lib/libpowerdevilui.so
 usr/lib/strigi/strigita_font.so
 usr/share/applications/kde4/kfontview.desktop
-usr/share/applications/kde4/kmenuedit.desktop
 usr/share/applications/kde4/krandrtray.desktop
 usr/share/autostart/krunner.desktop
 usr/share/kde4/apps/kcmsolidactions/solid-action-template.desktop
diff --git a/debian/kde-workspace-data.install b/debian/kde-workspace-data.install
index 76447d9..448cda4 100644
--- a/debian/kde-workspace-data.install
+++ b/debian/kde-workspace-data.install
@@ -91,23 +91,10 @@ usr/share/doc/kde/HTML/en/kfontview/common
 usr/share/doc/kde/HTML/en/kfontview/index.cache.bz2
 usr/share/doc/kde/HTML/en/kfontview/index.docbook
 usr/share/doc/kde/HTML/en/kfontview/kfontview.png
-usr/share/doc/kde/HTML/en/kmenuedit/common
-usr/share/doc/kde/HTML/en/kmenuedit/done.png
-usr/share/doc/kde/HTML/en/kmenuedit/index.cache.bz2
-usr/share/doc/kde/HTML/en/kmenuedit/index.docbook
-usr/share/doc/kde/HTML/en/kmenuedit/itemname.png
-usr/share/doc/kde/HTML/en/kmenuedit/new.png
-usr/share/doc/kde/HTML/en/kmenuedit/reset.png
-usr/share/doc/kde/HTML/en/kmenuedit/selecticon.png
-usr/share/doc/kde/HTML/en/kmenuedit/selectinternet.png
 usr/share/icons/hicolor/128x128/apps/ksplash.png
-usr/share/icons/hicolor/16x16/apps/kmenuedit.png
 usr/share/icons/hicolor/16x16/apps/ksplash.png
-usr/share/icons/hicolor/22x22/apps/kmenuedit.png
 usr/share/icons/hicolor/22x22/apps/ksplash.png
-usr/share/icons/hicolor/32x32/apps/kmenuedit.png
 usr/share/icons/hicolor/32x32/apps/ksplash.png
-usr/share/icons/hicolor/48x48/apps/kmenuedit.png
 usr/share/icons/hicolor/48x48/apps/ksplash.png
 usr/share/icons/hicolor/64x64/apps/ksplash.png
 usr/share/icons/oxygen/128x128/mimetypes/fonts-package.png
@@ -196,11 +183,6 @@ usr/share/kde4/apps/khotkeys/defaults.khotkeys
 usr/share/kde4/apps/khotkeys/kde32b1.khotkeys
 usr/share/kde4/apps/khotkeys/konqueror_gestures_kde321.khotkeys
 usr/share/kde4/apps/khotkeys/printscreen.khotkeys
-usr/share/kde4/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new.png
-usr/share/kde4/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new_sep.png
-usr/share/kde4/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
-usr/share/kde4/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new_sep.png
-usr/share/kde4/apps/kmenuedit/kmenueditui.rc
 usr/share/kde4/apps/kscreenlocker/kscreenlocker.notifyrc
 usr/share/kde4/apps/ksplash/Themes/Default/1024x768/background.png
 usr/share/kde4/apps/ksplash/Themes/Default/1280x1024/background.png
diff --git a/debian/kmenuedit.install b/debian/kmenuedit.install
new file mode 100644
index 0000000..f2d5eb2
--- /dev/null
+++ b/debian/kmenuedit.install
@@ -0,0 +1,21 @@
+usr/bin/kmenuedit
+usr/lib/libkdeinit4_kmenuedit.so
+usr/share/applications/kde4/kmenuedit.desktop
+usr/share/doc/kde/HTML/en/kmenuedit/common
+usr/share/doc/kde/HTML/en/kmenuedit/done.png
+usr/share/doc/kde/HTML/en/kmenuedit/index.cache.bz2
+usr/share/doc/kde/HTML/en/kmenuedit/index.docbook
+usr/share/doc/kde/HTML/en/kmenuedit/itemname.png
+usr/share/doc/kde/HTML/en/kmenuedit/new.png
+usr/share/doc/kde/HTML/en/kmenuedit/reset.png
+usr/share/doc/kde/HTML/en/kmenuedit/selecticon.png
+usr/share/doc/kde/HTML/en/kmenuedit/selectinternet.png
+usr/share/icons/hicolor/16x16/apps/kmenuedit.png
+usr/share/icons/hicolor/22x22/apps/kmenuedit.png
+usr/share/icons/hicolor/32x32/apps/kmenuedit.png
+usr/share/icons/hicolor/48x48/apps/kmenuedit.png
+usr/share/kde4/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new.png
+usr/share/kde4/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new_sep.png
+usr/share/kde4/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
+usr/share/kde4/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new_sep.png
+usr/share/kde4/apps/kmenuedit/kmenueditui.rc

-- 
KDE Base Workspace module packaging

More information about the pkg-kde-commits mailing list