rev 12132 - in branches/kde4-backports/packages/kdebase-runtime/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Wed Sep 10 21:04:37 UTC 2008


Author: ana
Date: 2008-09-10 21:04:36 +0000 (Wed, 10 Sep 2008)
New Revision: 12132

Added:
   branches/kde4-backports/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff
Removed:
   branches/kde4-backports/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff
Modified:
   branches/kde4-backports/packages/kdebase-runtime/debian/
   branches/kde4-backports/packages/kdebase-runtime/debian/changelog
   branches/kde4-backports/packages/kdebase-runtime/debian/control
   branches/kde4-backports/packages/kdebase-runtime/debian/khelpcenter4.install
   branches/kde4-backports/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
   branches/kde4-backports/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff
   branches/kde4-backports/packages/kdebase-runtime/debian/patches/series
   branches/kde4-backports/packages/kdebase-runtime/debian/rules
Log:
merge kdebase-runtime for backports



Property changes on: branches/kde4-backports/packages/kdebase-runtime/debian
___________________________________________________________________
Name: svn:externals
   - cdbs svn://svn.debian.org/pkg-kde/branches/kde4/cdbs/

   + cdbs svn://svn.debian.org/pkg-kde/branches/kde4-backports/cdbs/


Modified: branches/kde4-backports/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/changelog	2008-09-10 20:22:48 UTC (rev 12131)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/changelog	2008-09-10 21:04:36 UTC (rev 12132)
@@ -1,3 +1,36 @@
+kdebase-runtime (4:4.1.1-3) experimental; urgency=low
+
+  * Revert /usr/bin/kdesu link. It is *not* expected to be there. Reopens 495999.
+
+ -- Sune Vuorela <debian at pusling.com>  Wed, 10 Sep 2008 16:21:24 +0200
+
+kdebase-runtime (4:4.1.1-2) experimental; urgency=low
+
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Fix htdig paths, so Build Search Index should work now. (Closes: #497518)
+    Patch 25_khelp_htdig.diff.
+
+  +++ Changes by Modestas Vainius:
+
+  * Provide the link /usr/bin/kdesu in kdebase-runtime-bin-kde4.
+    (Closes: #495999)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 10 Sep 2008 14:43:46 +0200
+
+kdebase-runtime (4:4.1.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Sune Vuorela:
+
+  * Refresh patches:
+    + Remove 05_r839927_qreal.diff - merged upstream.
+  * Remove KHelpcenter icons, they seem have moved away.
+  * Rename Applets.desktop in khelpcenter, it is now called plasma.desktop.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 02 Sep 2008 18:34:08 +0200
+
 kdebase-runtime (4:4.1.0-2) unstable; urgency=high
 
   +++ Changes by Pino Toscano:

Modified: branches/kde4-backports/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/control	2008-09-10 20:22:48 UTC (rev 12131)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/control	2008-09-10 21:04:36 UTC (rev 12132)
@@ -5,7 +5,7 @@
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdepimlibs5-dev (>= 4:4.1.0), kdelibs5-dev (>= 4:4.1.0),
+ kdepimlibs5-dev (>= 4:4.1.1), kdelibs5-dev (>= 4:4.1.1),
  libclucene-dev, libsmbclient-dev, libsoprano-dev (>= 2.1),
  libstreamanalyzer-dev (>= 0.5.8), libstrigiqtdbusclient-dev (>= 0.5.8),
  libxcb1-dev, libxine-dev, libopenexr-dev, libbz2-dev, libx11-dev,

Modified: branches/kde4-backports/packages/kdebase-runtime/debian/khelpcenter4.install
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/khelpcenter4.install	2008-09-10 20:22:48 UTC (rev 12131)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/khelpcenter4.install	2008-09-10 21:04:36 UTC (rev 12132)
@@ -158,13 +158,6 @@
 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
@@ -187,7 +180,6 @@
 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
@@ -195,6 +187,7 @@
 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/plasma.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

Modified: branches/kde4-backports/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	2008-09-10 20:22:48 UTC (rev 12131)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	2008-09-10 21:04:36 UTC (rev 12132)
@@ -1,5 +1,3 @@
-Index: b/doc/userguide/kde-for-admins.docbook
-===================================================================
 --- a/doc/userguide/kde-for-admins.docbook
 +++ b/doc/userguide/kde-for-admins.docbook
 @@ -1765,8 +1765,8 @@
@@ -13,8 +11,6 @@
  </listitem>
  
  <listitem><para>Screensavers contains a hidden System/Screensavers menu,
-Index: b/kcontrol/menus/CMakeLists.txt
-===================================================================
 --- a/kcontrol/menus/CMakeLists.txt
 +++ b/kcontrol/menus/CMakeLists.txt
 @@ -4,5 +4,5 @@
@@ -25,8 +21,6 @@
 -install( FILES kde-information.directory  DESTINATION  ${XDG_DIRECTORY_INSTALL_DIR} )
 +    DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus/ RENAME kde4-information.menu )
 +install( FILES kde-information.directory  DESTINATION  ${XDG_DIRECTORY_INSTALL_DIR} RENAME kde4-information.directory )
-Index: b/kcontrol/menus/kde-information.menu
-===================================================================
 --- a/kcontrol/menus/kde-information.menu
 +++ b/kcontrol/menus/kde-information.menu
 @@ -3,7 +3,7 @@

Modified: branches/kde4-backports/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff	2008-09-10 20:22:48 UTC (rev 12131)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff	2008-09-10 21:04:36 UTC (rev 12132)
@@ -4,8 +4,6 @@
 See also kdelibs' 09_disable_debug_messages_if_not_explicitly_enabled.diff
 which does the same when printing debug information. Don't print them
 unless the user requested them.
-Index: b/kdebugdialog/klistdebugdialog.cpp
-===================================================================
 --- a/kdebugdialog/klistdebugdialog.cpp
 +++ b/kdebugdialog/klistdebugdialog.cpp
 @@ -117,7 +117,7 @@

Deleted: branches/kde4-backports/packages/kdebase-runtime/debian/patches/05_r839927_qreal.diff

Copied: branches/kde4-backports/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff (from rev 12131, branches/kde4/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff)
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff	                        (rev 0)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff	2008-09-10 21:04:36 UTC (rev 12132)
@@ -0,0 +1,58 @@
+--- kdebase-runtime-4.1.1.orig/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake	2008-09-05 13:12:37.000000000 +0200
++++ kdebase-runtime-4.1.1/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake	2008-09-05 13:14:35.000000000 +0200
+@@ -26,10 +26,14 @@
+ 
+ use Getopt::Long;
+ 
+-my $htdigdata = "/srv/www/htdig/common/";
++my $htdigdata = "/etc/htdig";
++
+ my $htdigbin = "/usr/bin";
+ my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
++my $kdehtmldir = `kde-config --expandvars --install html`;
+ chomp $kdeprefix;
++chomp $kdehtmldir;
++
+ 
+ my $dbg = 1;
+ 
+@@ -89,7 +93,7 @@
+ $ENV{ CDPATH } = '';
+ $ENV{ ENV } = '';
+ 
+-my $findpath = "@HTML_INSTALL_DIR@/$lang/";
++my $findpath = "$kdehtmldir/$lang/";
+ my $findcmd = "find $findpath -name index.docbook";
+ 
+ print STDERR "FINDCMD: $findcmd\n";
+@@ -168,7 +172,7 @@
+ locale:                 $locale
+ database_dir:           $htdigdb
+ database_base:		\${database_dir}/$identifier
+-local_urls:             help://=@HTML_INSTALL_DIR@/en/ file://=/
++local_urls:             help://=$kdehtmldir/en/ file://=/
+ local_urls_only:        true
+ limit_urls_to:          file:// help:/
+ ignore_noindex:         true
+--- kdebase-runtime-4.1.1.orig/khelpcenter/searchhandlers/khc_htdig.pl.cmake	2008-09-05 13:14:41.000000000 +0200
++++ kdebase-runtime-4.1.1/khelpcenter/searchhandlers/khc_htdig.pl.cmake	2008-09-05 13:22:49.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+ use Getopt::Long;
+ 
+-my $htdigdata = "/srv/www/htdig/common/";
++my $htdigdata = "/etc/htdig";
+ my $htdigbin = "/usr/bin";
+ my $kdeprefix = "@CMAKE_INSTALL_PREFIX@";
+ chomp $kdeprefix;
+--- kdebase-runtime-4.1.1.orig/khelpcenter/searchhandlers/khc_htsearch.pl	2008-09-05 13:23:02.000000000 +0200
++++ kdebase-runtime-4.1.1/khelpcenter/searchhandlers/khc_htsearch.pl	2008-09-05 13:23:17.000000000 +0200
+@@ -8,7 +8,7 @@
+ use open IO => ':utf8';
+ use open ':std';
+ 
+-my $htsearchpath="/srv/www/cgi-bin/htsearch";
++my $htsearchpath="/usr/lib/cgi-bin/htsearch";
+ 
+ my $config;
+ my $format;

Modified: branches/kde4-backports/packages/kdebase-runtime/debian/patches/series
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/patches/series	2008-09-10 20:22:48 UTC (rev 12131)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/patches/series	2008-09-10 21:04:36 UTC (rev 12132)
@@ -2,4 +2,4 @@
 02_ksvgtopng4.diff
 03_ktrash4.diff
 04_disable_debug_by_default.diff
-05_r839927_qreal.diff
+25_khelp_htdig.diff

Modified: branches/kde4-backports/packages/kdebase-runtime/debian/rules
===================================================================
--- branches/kde4-backports/packages/kdebase-runtime/debian/rules	2008-09-10 20:22:48 UTC (rev 12131)
+++ branches/kde4-backports/packages/kdebase-runtime/debian/rules	2008-09-10 21:04:36 UTC (rev 12132)
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-THIS_SHOULD_GO_TO_UNSTABLE=1
 
 # don'tuse the debugging symbols from kdebase-runtime-kde4. othwerwise we have a conflict with kdebase-dbg from KDE 3
 DEB_DBG_PACKAGE_kdebase-runtime := kdebase-runtime-dbg




More information about the pkg-kde-commits mailing list