rev 10733 - branches/kde4/packages/kdebase-runtime/debian

Tue May 27 09:45:43 UTC 2008

Author: modax-guest
Date: 2008-05-27 09:45:43 +0000 (Tue, 27 May 2008)
New Revision: 10733

Added:
   branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.install
   branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.installgen
Removed:
   branches/kde4/packages/kdebase-runtime/debian/khelpcenter.install
   branches/kde4/packages/kdebase-runtime/debian/khelpcenter.installgen
Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/control
   branches/kde4/packages/kdebase-runtime/debian/not-installed
Log:
Add khelpcenter4

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================

--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-05-27 09:06:15 UTC (rev 10732)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-05-27 09:45:43 UTC (rev 10733)
@@ -5,8 +5,11 @@
   * Install desktop-directory files to kdebase-runtime-data-common (37 files).
   * Bump kdepimlibs5-dev and libphonon-dev build dependencies to 4.0.80
     (Closes: #483117)
+  * Revive khelpcenter (from r9108) as khelpcenter4 package. Make it conflict
+    with khelpcenter (KDE3). Make kdebase-runtime-data-common recommend
+    khelpcenter4.
  
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2008 11:51:11 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2008 12:39:49 +0300
 
 kdebase-runtime (4:4.0.80-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control	2008-05-27 09:06:15 UTC (rev 10732)
+++ branches/kde4/packages/kdebase-runtime/debian/control	2008-05-27 09:45:43 UTC (rev 10733)
@@ -62,6 +62,7 @@
 Package: kdebase-runtime-data-common
 Section: kde
 Architecture: all
+Recommends: khelpcenter4
 Replaces: kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1)
 Conflicts: kdebase-bin (<< 4:4.0.0-1), kdebase-data (<< 4:4.0.0-1)
 Description: shared data files for the KDE 4 base runtime module 
@@ -73,6 +74,19 @@
  .
  This package is part of the KDE 4 base runtime module.
 
+Package: khelpcenter4
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: htdig
+Conflicts: khelpcenter
+Description: Help Center for KDE 4
+ The KDE Help Center displays documentation on how to use the KDE 4 desktop and
+ applications, as well as UNIX man and info pages.
+ It can search through documentation using the 'htdig' package.
+ .
+ This package is part of the KDE 4 base runtime module.
+
 Package: kde-icons-oxygen
 Section: kde
 Architecture: all

Deleted: branches/kde4/packages/kdebase-runtime/debian/khelpcenter.install

Deleted: branches/kde4/packages/kdebase-runtime/debian/khelpcenter.installgen

Copied: branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.install (from rev 10730, branches/kde4/packages/kdebase-runtime/debian/khelpcenter.install)
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.install	                        (rev 0)
+++ branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.install	2008-05-27 09:45:43 UTC (rev 10733)
@@ -0,0 +1,207 @@
+usr/bin/khelpcenter
+usr/lib/libkdeinit4_khelpcenter.so
+usr/share/applications/kde4/Help.desktop
+usr/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
+usr/share/doc/kde4/HTML/en/khelpcenter/background.png
+usr/share/doc/kde4/HTML/en/khelpcenter/bgtable.png
+usr/share/doc/kde4/HTML/en/khelpcenter/common
+usr/share/doc/kde4/HTML/en/khelpcenter/contact.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/about.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/common
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/configkde.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/contrib.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/desktop.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/filemng.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/getkde.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/index.cache.bz2
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/index.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/install.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/intro.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/kdeapps.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/misc.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/moreinfo.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/nonkdeapps.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/notrelated.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/panel.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/qt.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/questions.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/sound.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/tips.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/webbrowse.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/faq/winmng.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/glossary/common
+usr/share/doc/kde4/HTML/en/khelpcenter/glossary/index.cache.bz2
+usr/share/doc/kde4/HTML/en/khelpcenter/glossary/index.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/glossary/kdeprintingglossary.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/help.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/index.cache.bz2
+usr/share/doc/kde4/HTML/en/khelpcenter/index.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/kdelogo2.png
+usr/share/doc/kde4/HTML/en/khelpcenter/khelpcenter.png
+usr/share/doc/kde4/HTML/en/khelpcenter/lines.png
+usr/share/doc/kde4/HTML/en/khelpcenter/lines2.png
+usr/share/doc/kde4/HTML/en/khelpcenter/pointers.png
+usr/share/doc/kde4/HTML/en/khelpcenter/quickstart/common
+usr/share/doc/kde4/HTML/en/khelpcenter/quickstart/index.cache.bz2
+usr/share/doc/kde4/HTML/en/khelpcenter/quickstart/index.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/shadow1.png
+usr/share/doc/kde4/HTML/en/khelpcenter/support.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/a-window.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/accessibility.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/amarok-icon.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/amarok.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/burning-cds.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/common
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/control-center.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/customizing-desktop.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/desktop.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/email.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/extragear-applications.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/file-sharing.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/font-installation.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/getting-help.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/glossary.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/index.cache.bz2
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/index.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/juk-icon.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/juk.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kaboodle.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kcalc-systray.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kcontrol.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kde-office.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kmag.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kmousetool.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kmouth.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kmouth2.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kmouth3.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/knode-identity.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/knode-mail-account.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/knode-news-account.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/knode-start.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/konq-sidebar.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/konq-simple.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kopete.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/kppp-wizard.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/migrator-applications.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/noatun-icon.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/noatun.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/oggfolder.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/open-file-dialog.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/pdf-files.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/playing-movies.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/playing-music.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/printer-setup.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/removable-disks.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/rip.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/ripsettings.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/screen-captures.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/services.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/splash-screen.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/titlebar-menu.png
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/usenet.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/where-next.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/userguide/your-kde-account.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/common
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/index.cache.bz2
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/index.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict1.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict10.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict11.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict12.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict13.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict14.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict15.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict16.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict17.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict18.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict19.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict2.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict20.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict21.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict22.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict23.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict3.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict4.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict5.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict6.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict7.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict8.png
+usr/share/doc/kde4/HTML/en/khelpcenter/visualdict/pict9.png
+usr/share/doc/kde4/HTML/en/khelpcenter/welcome.docbook
+usr/share/doc/kde4/HTML/en/khelpcenter/whatiskde.docbook
+usr/share/icons/hicolor/128x128/apps/khelpcenter.png
+usr/share/icons/hicolor/16x16/apps/khelpcenter.png
+usr/share/icons/hicolor/22x22/apps/khelpcenter.png
+usr/share/icons/hicolor/32x32/apps/khelpcenter.png
+usr/share/icons/hicolor/48x48/apps/khelpcenter.png
+usr/share/icons/hicolor/64x64/apps/khelpcenter.png
+usr/share/icons/hicolor/scalable/apps/khelpcenter.svgz
+usr/share/kde4/apps/khelpcenter/glossary.html.in
+usr/share/kde4/apps/khelpcenter/glossary.xslt
+usr/share/kde4/apps/khelpcenter/index.html.in
+usr/share/kde4/apps/khelpcenter/intro.html.in
+usr/share/kde4/apps/khelpcenter/khelpcenterui.rc
+usr/share/kde4/apps/khelpcenter/plugins/Applications/.directory
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/.directory
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man1.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man2.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man3.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man4.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man5.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man6.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man7.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man8.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/man9.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Manpages/mann.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Scrollkeeper/.directory
+usr/share/kde4/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Tutorials/.directory
+usr/share/kde4/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
+usr/share/kde4/apps/khelpcenter/plugins/Tutorials/visualdict.desktop
+usr/share/kde4/apps/khelpcenter/plugins/applets.desktop
+usr/share/kde4/apps/khelpcenter/plugins/contact.desktop
+usr/share/kde4/apps/khelpcenter/plugins/faq.desktop
+usr/share/kde4/apps/khelpcenter/plugins/info.desktop
+usr/share/kde4/apps/khelpcenter/plugins/kcontrolmodules.desktop
+usr/share/kde4/apps/khelpcenter/plugins/kicmodules.desktop
+usr/share/kde4/apps/khelpcenter/plugins/kioslaves.desktop
+usr/share/kde4/apps/khelpcenter/plugins/links.desktop
+usr/share/kde4/apps/khelpcenter/plugins/support.desktop
+usr/share/kde4/apps/khelpcenter/plugins/userguide.desktop
+usr/share/kde4/apps/khelpcenter/plugins/welcome.desktop
+usr/share/kde4/apps/khelpcenter/searchhandlers/docbook.desktop
+usr/share/kde4/apps/khelpcenter/searchhandlers/htdig.desktop
+usr/share/kde4/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+usr/share/kde4/apps/khelpcenter/searchhandlers/man.desktop
+usr/share/kde4/apps/khelpcenter/table-of-contents.xslt
+usr/share/kde4/config.kcfg/khelpcenter.kcfg
+usr/share/kde4/services/khelpcenter.desktop

Copied: branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.installgen (from rev 10730, branches/kde4/packages/kdebase-runtime/debian/khelpcenter.installgen)
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.installgen	                        (rev 0)
+++ branches/kde4/packages/kdebase-runtime/debian/khelpcenter4.installgen	2008-05-27 09:45:43 UTC (rev 10733)
@@ -0,0 +1,3 @@
+depends first
+
+dst:khelpcenter

Modified: branches/kde4/packages/kdebase-runtime/debian/not-installed
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/not-installed	2008-05-27 09:06:15 UTC (rev 10732)
+++ branches/kde4/packages/kdebase-runtime/debian/not-installed	2008-05-27 09:45:43 UTC (rev 10733)
@@ -1,5 +1,2 @@
 # Files not installed because they conflict with hicolor-icon-theme:
 ./usr/share/icons/hicolor/index.theme
-
-# Do not ship khelpcenter for now, KDE 4 does not contain any help anyway,
-# and it is updating KDE 3's khelpcenter.


