rev 14542 - in trunk/packages: kdebase-runtime/debian kdebase-runtime/debian/patches kdelibs/debian kdelibs/debian/patches kdepimlibs/debian

Fathi Boudra fabo at alioth.debian.org
Fri May 1 12:37:37 UTC 2009


Author: fabo
Date: 2009-05-01 12:37:37 +0000 (Fri, 01 May 2009)
New Revision: 14542

Removed:
   trunk/packages/kdelibs/debian/patches/01_no_plasma_popup_over_screensaver_r956998.diff
Modified:
   trunk/packages/kdebase-runtime/debian/changelog
   trunk/packages/kdebase-runtime/debian/control
   trunk/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
   trunk/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff
   trunk/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
   trunk/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff
   trunk/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
   trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
   trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
   trunk/packages/kdelibs/debian/patches/series
   trunk/packages/kdepimlibs/debian/changelog
   trunk/packages/kdepimlibs/debian/control
Log:
Prepare kdelibs/kdepimlibs/kdebase-runtime 4.2.3
Update changelog.
Refresh patches.


Modified: trunk/packages/kdebase-runtime/debian/changelog
===================================================================
--- trunk/packages/kdebase-runtime/debian/changelog	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdebase-runtime/debian/changelog	2009-05-01 12:37:37 UTC (rev 14542)
@@ -1,9 +1,17 @@
-kdebase-runtime (4:4.2.2-2) UNRELEASED; urgency=low
+kdebase-runtime (4:4.2.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
+  +++ Chnages by Sune Vuorela:
+
   * Update sections.
 
- -- Sune Vuorela <debian at pusling.com>  Mon, 06 Apr 2009 23:52:32 +0200
+  +++ Changes by Fathi Boudra:
 
+  * Bump Standards-Version to 3.8.1. No changes needed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 May 2009 13:49:01 +0200
+
 kdebase-runtime (4:4.2.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdebase-runtime/debian/control
===================================================================
--- trunk/packages/kdebase-runtime/debian/control	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdebase-runtime/debian/control	2009-05-01 12:37:37 UTC (rev 14542)
@@ -11,7 +11,7 @@
  libxcb1-dev, libopenexr-dev, libbz2-dev, libx11-dev, libxcursor-dev,
  libasound2-dev (>= 1.0.14a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libjpeg62-dev, libqt4-opengl-dev, libpulse-dev, libxine-dev
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebase-runtime
 Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdebase-runtime

Modified: trunk/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff
===================================================================
--- trunk/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdebase-runtime/debian/patches/01_kde4_information_menu.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -1,6 +1,6 @@
 --- a/doc/userguide/kde-for-admins.docbook
 +++ b/doc/userguide/kde-for-admins.docbook
-@@ -1765,8 +1765,8 @@
+@@ -1765,8 +1765,8 @@ contents are defined by <filename>kde-se
  whose icon and name are defined by <filename>kde-settings.directory</filename></para>
  </listitem>
  <listitem><para>Info Center has a hidden Information menu whose

Modified: trunk/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff
===================================================================
--- trunk/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -2,7 +2,7 @@
 co-installable witj KDE 3.
 --- a/pics/CMakeLists.txt
 +++ b/pics/CMakeLists.txt
-@@ -4,9 +4,9 @@
+@@ -4,9 +4,9 @@ add_subdirectory( emoticons )
  add_subdirectory( oxygen )
  
  set(ksvgtopng_SRCS ksvgtopng.cpp )
@@ -17,7 +17,7 @@
  # so that fallbacks work even for themes that don't inherit from oxygen
 --- a/pics/ksvgtopng.cpp
 +++ b/pics/ksvgtopng.cpp
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ int main(int argc, char **argv)
  {
  	if(argc < 5)
  	{

Modified: trunk/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
===================================================================
--- trunk/packages/kdebase-runtime/debian/patches/03_ktrash4.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdebase-runtime/debian/patches/03_ktrash4.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -1,7 +1,7 @@
 ktrash is being renamed ktrash4 to allow kdebase-runtime be co-installable with KDE 3.
 --- a/kioslave/trash/CMakeLists.txt
 +++ b/kioslave/trash/CMakeLists.txt
-@@ -39,11 +39,11 @@
+@@ -39,11 +39,11 @@ set_target_properties(trash PROPERTIES
  set(ktrash_SRCS ktrash.cpp )
  
  

Modified: trunk/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff
===================================================================
--- trunk/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdebase-runtime/debian/patches/04_disable_debug_by_default.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -6,7 +6,7 @@
 unless the user requested them.
 --- a/kdebugdialog/klistdebugdialog.cpp
 +++ b/kdebugdialog/klistdebugdialog.cpp
-@@ -117,7 +117,7 @@
+@@ -117,7 +117,7 @@ void KListDebugDialog::load()
      QTreeWidgetItem* item = m_areaWidget->topLevelItem(i);
      KConfigGroup group = pConfig->group( item->data(0, Qt::UserRole).toByteArray() ); // Group name = debug area code = cb's name
  

Modified: trunk/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff
===================================================================
--- trunk/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdebase-runtime/debian/patches/25_khelp_htdig.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -1,6 +1,6 @@
 --- a/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
 +++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.cmake
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ use strict;
  
  use Getopt::Long;
  
@@ -11,7 +11,7 @@
  chomp $kdeprefix;
 --- a/khelpcenter/searchhandlers/khc_htdig.pl.cmake
 +++ b/khelpcenter/searchhandlers/khc_htdig.pl.cmake
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ use strict;
  
  use Getopt::Long;
  
@@ -22,7 +22,7 @@
  chomp $kdeprefix;
 --- a/khelpcenter/searchhandlers/khc_htsearch.pl
 +++ b/khelpcenter/searchhandlers/khc_htsearch.pl
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ use Getopt::Long;
  use open IO => ':utf8';
  use open ':std';
  

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdelibs/debian/changelog	2009-05-01 12:37:37 UTC (rev 14542)
@@ -1,5 +1,7 @@
-kde4libs (4:4.2.2-3) UNRELEASED; urgency=low
+kde4libs (4:4.2.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
   +++ Changes by Modestas Vainius:
 
   * Fix typo in the kdelibs5.templates.
@@ -12,13 +14,8 @@
 
   * Reword of kdelibs5.templates.
 
-  [ Fathi Boudra ]
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 May 2009 12:36:12 +0200
 
-  * Add 01_no_plasma_popup_over_screensaver_r956998.diff patch:
-    Do not let plasma popup appear over screensaver.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 Apr 2009 13:19:00 +0200
-
 kde4libs (4:4.2.2-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -2,7 +2,7 @@
 Bypass build time check as /dev/ptmx is alsways present at runtime.
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -191,13 +191,7 @@ if (UNIX)
+@@ -192,13 +192,7 @@ if (UNIX)
      set(HAVE_OPENPTY)
  
      EXECUTE_PROCESS(

Modified: trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -62,7 +62,7 @@
  }
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -153,11 +153,11 @@ if (UNIX)
+@@ -154,11 +154,11 @@ if (UNIX)
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
      endif (NOT login_in_libc)

Modified: trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff	2009-05-01 12:37:37 UTC (rev 14542)
@@ -2,7 +2,7 @@
 
 --- a/plasma/CMakeLists.txt
 +++ b/plasma/CMakeLists.txt
-@@ -139,6 +139,10 @@
+@@ -139,6 +139,10 @@ kde4_add_library(plasma SHARED ${plasma_
  target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} knewstuff2
                               ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
                               threadweaver ${KDE4_SOLID_LIBS} )

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdelibs/debian/patches/series	2009-05-01 12:37:37 UTC (rev 14542)
@@ -1,4 +1,3 @@
-01_no_plasma_popup_over_screensaver_r956998.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
 11_default_kde4_xdg_menu_prefix.diff

Modified: trunk/packages/kdepimlibs/debian/changelog
===================================================================
--- trunk/packages/kdepimlibs/debian/changelog	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdepimlibs/debian/changelog	2009-05-01 12:37:37 UTC (rev 14542)
@@ -1,9 +1,17 @@
-kdepimlibs (4:4.2.2-2) UNRELEASED; urgency=low
+kdepimlibs (4:4.2.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
+  +++ Changes by Sune Vuorela:
+
   * Fix sections.
 
- -- Sune Vuorela <debian at pusling.com>  Mon, 06 Apr 2009 23:29:26 +0200
+  +++ Changes by Fathi Boudra:
 
+  * Bump Standards-Version to 3.8.1. No changes needed.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 01 May 2009 13:45:19 +0200
+
 kdepimlibs (4:4.2.2-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/kdepimlibs/debian/control
===================================================================
--- trunk/packages/kdepimlibs/debian/control	2009-05-01 12:18:51 UTC (rev 14541)
+++ trunk/packages/kdepimlibs/debian/control	2009-05-01 12:37:37 UTC (rev 14542)
@@ -7,7 +7,7 @@
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.2.3), quilt, pkg-kde-tools (>= 0.4.2),
  kdelibs5-dev (>= 4:4.2.2), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
  libakonadi-dev (>= 1.1.1), libical-dev (>= 0.33)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1yy
 Homepage: http://pim.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdepimlibs
 Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdepimlibs




More information about the pkg-kde-commits mailing list