rev 16201 - in trunk/packages/kdelibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Tue Nov 3 23:02:57 UTC 2009
Author: modax-guest
Date: 2009-11-03 23:02:56 +0000 (Tue, 03 Nov 2009)
New Revision: 16201
Removed:
trunk/packages/kdelibs/debian/patches/01_r1032787_khtml_show_hide_fix.diff
trunk/packages/kdelibs/debian/patches/02_r1032185_threading_issues_in_klocale.diff
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
trunk/packages/kdelibs/debian/patches/series
Log:
* New upstream release.
* Update debian/patches:
- 01_r1032787_khtml_show_hide_fix - remove, taken from upstream;
- 02_r1032185_threading_issues_in_klocale - remove, taken from upstream;
- 08_add_debian_build_type - refresh, offsets adjusted;
- 14_hardcode_ptm_device - refresh, offsets adjusted;
- 15_kfreebsd_support - refresh, offsets adjusted;
- 20_use_dejavu_as_default_font - refresh, offsets adjusted;
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2009-11-03 21:16:29 UTC (rev 16200)
+++ trunk/packages/kdelibs/debian/changelog 2009-11-03 23:02:56 UTC (rev 16201)
@@ -1,5 +1,7 @@
-kde4libs (4:4.3.2-3) UNRELEASED; urgency=low
+kde4libs (4:4.3.3-0r1) UNRELEASED; urgency=low
+ * New upstream release.
+
+++ Changes by George Kiagiadakis:
* Add patch to make konsole work on GNU/kFreeBSD.
@@ -8,6 +10,16 @@
* Add patch to find KDE3 documentation on khelpcenter4
+ +++ Changes by Modestas Vainius:
+
+ * Update debian/patches:
+ - 01_r1032787_khtml_show_hide_fix - remove, taken from upstream;
+ - 02_r1032185_threading_issues_in_klocale - remove, taken from upstream;
+ - 08_add_debian_build_type - refresh, offsets adjusted;
+ - 14_hardcode_ptm_device - refresh, offsets adjusted;
+ - 15_kfreebsd_support - refresh, offsets adjusted;
+ - 20_use_dejavu_as_default_font - refresh, offsets adjusted;
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 12 Oct 2009 21:36:51 +0300
kde4libs (4:4.3.2-2) unstable; urgency=low
Modified: trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2009-11-03 21:16:29 UTC (rev 16200)
+++ trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2009-11-03 23:02:56 UTC (rev 16201)
@@ -5,7 +5,7 @@
icons.
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1010,11 +1010,13 @@
+@@ -1016,11 +1016,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
Modified: trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2009-11-03 21:16:29 UTC (rev 16200)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2009-11-03 23:02:56 UTC (rev 16201)
@@ -2,7 +2,7 @@
Bypass build time check as /dev/ptmx is alsways present at runtime.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -195,13 +195,7 @@
+@@ -196,13 +196,7 @@
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-11-03 21:16:29 UTC (rev 16200)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2009-11-03 23:02:56 UTC (rev 16201)
@@ -62,7 +62,7 @@
}
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -157,11 +157,11 @@
+@@ -158,11 +158,11 @@
set(UTIL_LIBRARY util)
endif (login_in_libutil)
endif (NOT login_in_libc)
Modified: trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2009-11-03 21:16:29 UTC (rev 16200)
+++ trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2009-11-03 23:02:56 UTC (rev 16201)
@@ -1,7 +1,7 @@
Use DejaVu Sans as default font and adjusts sizes accordingly.
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -373,7 +373,7 @@
+@@ -381,7 +381,7 @@
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
static const char GeneralId[] = "General";
@@ -10,7 +10,7 @@
#ifdef Q_WS_MAC
static const char DefaultMacFont[] = "Lucida Grande";
#endif
-@@ -386,13 +386,13 @@
+@@ -394,13 +394,13 @@
{ GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
{ GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
#else
Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series 2009-11-03 21:16:29 UTC (rev 16200)
+++ trunk/packages/kdelibs/debian/patches/series 2009-11-03 23:02:56 UTC (rev 16201)
@@ -1,5 +1,3 @@
-01_r1032787_khtml_show_hide_fix.diff
-02_r1032185_threading_issues_in_klocale.diff
08_add_debian_build_type.diff
11_default_kde4_xdg_menu_prefix.diff
13_qt4_designer_plugins_path.diff
More information about the pkg-kde-commits
mailing list