[SCM] KDE Base Applications module packaging branch, kde4.5, updated. debian/4.4.5-1-11-ge6efcfd

Mon Aug 2 16:39:16 UTC 2010

The following commit has been merged in the kde4.5 branch:
commit e6efcfdf434a2e1bd881f28aae48cafc66404a03
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Mon Aug 2 19:27:39 2010 +0300

    Remove the kinfocenter package (moved to kdebase-workspace).
---
 debian/changelog                 |    1 +
 debian/control                   |   14 +------
 debian/kinfocenter.install       |   88 --------------------------------------
 debian/kinfocenter.install.linux |    3 -
 debian/rules                     |    6 ---
 5 files changed, 2 insertions(+), 110 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b1a7ab..cc74b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kdebase (4:4.5.0-0r1) UNRELEASED; urgency=low
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
+  * Remove the kinfocenter package (moved to kdebase-workspace).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Aug 2010 00:07:45 +0300
 
diff --git a/debian/control b/debian/control
index beb1b7e..89e68ce 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Depends: dolphin (>= ${source:Version}), kappfinder (>= ${source:Version}),
  konsole (>= ${source:Version}), kwrite (>= ${source:Version}),
  libkonq5 (>= ${source:Version}), plasma-widget-folderview (>= ${source:Version}),
  ${misc:Depends}
-Recommends: kinfocenter (>= ${source:Version}), konqueror-nsplugins (>= ${source:Version})
+Recommends: konqueror-nsplugins (>= ${source:Version})
 Description: base applications from the official KDE release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -105,18 +105,6 @@ Description: file search utility
  .
  This package is part of the KDE base applications module.
 
-Package: kinfocenter
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kcontrol
-Replaces: kdebase-bin (<< 4:4.0.0-1)
-Description: system information viewer 
- KInfoCenter provides you with a graphical overview of various aspects of your
- system, such as memory usage, storage capacity, and attached devices.
- .
- This package is part of the KDE base applications module.
-
 Package: konqueror
 Section: web
 Architecture: any
diff --git a/debian/kinfocenter.install b/debian/kinfocenter.install
deleted file mode 100644
index 3f7a4b3..0000000
--- a/debian/kinfocenter.install
+++ /dev/null
@@ -1,88 +0,0 @@
-usr/bin/kinfocenter
-usr/lib/kde4/kcm_info.so
-usr/lib/kde4/kcm_ioslaveinfo.so
-usr/lib/kde4/kcm_memory.so
-usr/lib/kde4/kcm_nic.so
-usr/lib/kde4/kcm_opengl.so
-usr/lib/kde4/kcm_partition.so
-usr/lib/kde4/kcm_pci.so
-usr/lib/kde4/kcm_samba.so
-usr/lib/kde4/kcm_solidproc.so
-usr/lib/kde4/kcm_usb.so
-usr/lib/libkdeinit4_kinfocenter.so
-usr/share/applications/kde4/kinfocenter.desktop
-usr/share/doc/kde/HTML/en/kinfocenter/common
-usr/share/doc/kde/HTML/en/kinfocenter/devices/common
-usr/share/doc/kde/HTML/en/kinfocenter/devices/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/devices/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/dma/common
-usr/share/doc/kde/HTML/en/kinfocenter/dma/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/dma/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/interrupts/common
-usr/share/doc/kde/HTML/en/kinfocenter/interrupts/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/interrupts/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/ioports/common
-usr/share/doc/kde/HTML/en/kinfocenter/ioports/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/ioports/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/kinfocenter.png
-usr/share/doc/kde/HTML/en/kinfocenter/memory/common
-usr/share/doc/kde/HTML/en/kinfocenter/memory/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/memory/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/nics/common
-usr/share/doc/kde/HTML/en/kinfocenter/nics/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/nics/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/opengl/common
-usr/share/doc/kde/HTML/en/kinfocenter/opengl/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/opengl/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/partitions/common
-usr/share/doc/kde/HTML/en/kinfocenter/partitions/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/partitions/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/pci/common
-usr/share/doc/kde/HTML/en/kinfocenter/pci/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/pci/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/processor/common
-usr/share/doc/kde/HTML/en/kinfocenter/processor/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/processor/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/protocols/common
-usr/share/doc/kde/HTML/en/kinfocenter/protocols/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/protocols/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/samba/common
-usr/share/doc/kde/HTML/en/kinfocenter/samba/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/samba/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/scsi/common
-usr/share/doc/kde/HTML/en/kinfocenter/scsi/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/scsi/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/sound/common
-usr/share/doc/kde/HTML/en/kinfocenter/sound/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/sound/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/usb/common
-usr/share/doc/kde/HTML/en/kinfocenter/usb/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/usb/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/view1394/common
-usr/share/doc/kde/HTML/en/kinfocenter/view1394/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/view1394/index.docbook
-usr/share/doc/kde/HTML/en/kinfocenter/xserver/common
-usr/share/doc/kde/HTML/en/kinfocenter/xserver/index.cache.bz2
-usr/share/doc/kde/HTML/en/kinfocenter/xserver/index.docbook
-usr/share/kde4/apps/kcmusb/usb.ids
-usr/share/kde4/apps/kinfocenter/about/kinfocenter.css
-usr/share/kde4/apps/kinfocenter/about/main.html
-usr/share/kde4/apps/kinfocenter/kinfocenterui.rc
-usr/share/kde4/services/devices.desktop
-usr/share/kde4/services/dma.desktop
-usr/share/kde4/services/interrupts.desktop
-usr/share/kde4/services/ioports.desktop
-usr/share/kde4/services/ioslaveinfo.desktop
-usr/share/kde4/services/kcm_memory.desktop
-usr/share/kde4/services/kcm_partition.desktop
-usr/share/kde4/services/kcm_pci.desktop
-usr/share/kde4/services/kcmsolidproc.desktop
-usr/share/kde4/services/kcmusb.desktop
-usr/share/kde4/services/nic.desktop
-usr/share/kde4/services/opengl.desktop
-usr/share/kde4/services/scsi.desktop
-usr/share/kde4/services/smbstatus.desktop
-usr/share/kde4/services/sound.desktop
-usr/share/kde4/services/xserver.desktop
diff --git a/debian/kinfocenter.install.linux b/debian/kinfocenter.install.linux
deleted file mode 100644
index ff4159e..0000000
--- a/debian/kinfocenter.install.linux
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/kde4/kcm_view1394.so
-usr/share/kde4/apps/kcmview1394/oui.db
-usr/share/kde4/services/kcmview1394.desktop
diff --git a/debian/rules b/debian/rules
index d9a9ad4..0ec6606 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,3 @@ include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
 DEB_INSTALL_DOCS_ALL=
-
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-install/kinfocenter::
-	# Install common files
-	dh_install -p$(cdbs_curpkg) --ignore=debian/$(cdbs_curpkg).install.linux
-endif

-- 
KDE Base Applications module packaging

