rev 15752 - in trunk/packages/kdebase-workspace/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Sat Aug 22 15:48:07 UTC 2009
Author: ana
Date: 2009-08-22 15:48:06 +0000 (Sat, 22 Aug 2009)
New Revision: 15752
Added:
trunk/packages/kdebase-workspace/debian/README.source
trunk/packages/kdebase-workspace/debian/patches/02_kfreebsd_updates.diff
Modified:
trunk/packages/kdebase-workspace/debian/changelog
trunk/packages/kdebase-workspace/debian/control
trunk/packages/kdebase-workspace/debian/copyright
trunk/packages/kdebase-workspace/debian/patches/series
Log:
updates for -workspace
Added: trunk/packages/kdebase-workspace/debian/README.source
===================================================================
--- trunk/packages/kdebase-workspace/debian/README.source (rev 0)
+++ trunk/packages/kdebase-workspace/debian/README.source 2009-08-22 15:48:06 UTC (rev 15752)
@@ -0,0 +1,6 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.
Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog 2009-08-22 15:26:54 UTC (rev 15751)
+++ trunk/packages/kdebase-workspace/debian/changelog 2009-08-22 15:48:06 UTC (rev 15752)
@@ -1,4 +1,4 @@
-kdebase-workspace (4:4.3.0-3) UNRELEASED; urgency=low
+kdebase-workspace (4:4.3.0-3) unstable; urgency=low
+++ Changes by George Kiagiadakis:
@@ -11,8 +11,16 @@
hurd-i386), and install the relative compiled stuff on linux only using a
install rule in rules. Based on a patch by Petr Salinger, thanks!
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 22 Aug 2009 00:23:25 +0200
+ +++ Changes by Ana Beatriz Guerrero Lopez:
+
+ * Small copyright updates (years).
+ * Add README.source about the patch system.
+ * Bump Standards-Version from 3.8.2 to 3.8.3 (no changes needed).
+ * Add patch 02_kfreebsd_updates for building in in kfreebsd-* from Petr * Salinger.
+ That together with Pino's changes (Closes: #542591).
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 22 Aug 2009 17:46:50 +0200
+
kdebase-workspace (4:4.3.0-2) unstable; urgency=low
+++ Changes by Modestas Vainius:
Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control 2009-08-22 15:26:54 UTC (rev 15751)
+++ trunk/packages/kdebase-workspace/debian/control 2009-08-22 15:48:06 UTC (rev 15752)
@@ -22,7 +22,7 @@
libxss-dev, libqedje-dev (>= 0.4.0), libggadget-1.0-dev (>= 0.10.5~), libggadget-qt-1.0-dev (>= 0.10.5~),
libpolkit-qt-dev, libpolkit-dbus-dev, libpolkit-grant-dev, libakonadi-dev (>= 1.1.95), libknotificationitem-1-dev,
libgps-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Homepage: http://www.kde.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdebase-workspace
Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdebase-workspace
Modified: trunk/packages/kdebase-workspace/debian/copyright
===================================================================
--- trunk/packages/kdebase-workspace/debian/copyright 2009-08-22 15:26:54 UTC (rev 15751)
+++ trunk/packages/kdebase-workspace/debian/copyright 2009-08-22 15:48:06 UTC (rev 15752)
@@ -10,7 +10,7 @@
Copyright:
Unless something else is mentioned, copyright is
-(C) 1996-2009, The K Desktop Environment project http://www.kde.org
+© 1996-2009, The K Desktop Environment project http://www.kde.org
@@ -1708,7 +1708,7 @@
-------------------------------------------------------------------------------
-The Debian packaging is (C) 2007-2008, Debian Qt/KDE Maintainers
+The Debian packaging is © 2007-2009, Debian Qt/KDE Maintainers
<debian-qt-kde at lists.debian.org> and is licensed under the GPL,
see `/usr/share/common-licenses/GPL'.
Added: trunk/packages/kdebase-workspace/debian/patches/02_kfreebsd_updates.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/02_kfreebsd_updates.diff (rev 0)
+++ trunk/packages/kdebase-workspace/debian/patches/02_kfreebsd_updates.diff 2009-08-22 15:48:06 UTC (rev 15752)
@@ -0,0 +1,123 @@
+--- kdebase-workspace-4.3.0.orig/ksysguard/ksysguardd/CMakeLists.txt
++++ kdebase-workspace-4.3.0/ksysguard/ksysguardd/CMakeLists.txt
+@@ -18,6 +18,10 @@
+
+ configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h)
+
++if( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" )
++ add_subdirectory( "FreeBSD" )
++ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD )
++else( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" )
+ if( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
+ add_subdirectory( "FreeBSD" )
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD )
+@@ -30,6 +34,7 @@
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME} )
+ endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+ endif( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
++endif( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" )
+
+ ########### next target ###############
+
+only in patch2:
+unchanged:
+--- kdebase-workspace-4.3.0.orig/ksysguard/ksysguardd/FreeBSD/ProcessList.c
++++ kdebase-workspace-4.3.0/ksysguard/ksysguardd/FreeBSD/ProcessList.c
+@@ -33,7 +33,7 @@
+ #include <sys/resourcevar.h>
+ #endif
+
+-#if __FreeBSD_version > 500015
++#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
+ #include <sys/priority.h>
+ #endif
+ #include <sys/sysctl.h>
+@@ -203,7 +203,7 @@
+ if (sysctl(mib, 4, &p, &len, NULL, 0) == -1 || !len)
+ return -1;
+
+-#if __FreeBSD_version >= 500015
++#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
+ ps->pid = p.ki_pid;
+ ps->ppid = p.ki_ppid;
+ ps->uid = p.ki_uid;
+@@ -231,7 +231,7 @@
+ #endif
+
+ /* this isn't usertime -- it's total time (??) */
+-#if __FreeBSD_version >= 500015
++#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
+ ps->userTime = p.ki_runtime / 10000;
+ #elif defined(__DragonFly__)
+ #if __DragonFly_version >= 190000
+@@ -260,7 +260,7 @@
+ if (fscale == 0)
+ ps->userLoad = 0;
+ else
+-#if __FreeBSD_version >= 500015
++#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
+ ps->userLoad = 100.0 * (double) p.ki_pctcpu / fscale;
+ ps->vmSize = p.ki_size;
+ ps->vmRss = p.ki_rssize * getpagesize();
+@@ -380,7 +380,7 @@
+ sysctl(mib, 3, p, &len, NULL, 0);
+
+ for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
+-#if __FreeBSD_version >= 500015
++#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
+ updateProcess(p[num].ki_pid);
+ #elif __DragonFly_version >= 190000
+ /* Skip kernel threads with pid -1. Swapper with pid 0 also
+only in patch2:
+unchanged:
+--- kdebase-workspace-4.3.0.orig/libs/ksysguard/processcore/processes_local_p.cpp
++++ kdebase-workspace-4.3.0/libs/ksysguard/processcore/processes_local_p.cpp
+@@ -21,7 +21,7 @@
+
+ #if defined __linux__
+ #include "processes_linux_p.cpp"
+-#elif defined __FreeBSD__ || defined __DragonFly__
++#elif defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__
+ #include "processes_freebsd_p.cpp"
+ #elif defined __OpenBSD__
+ #include "processes_openbsd_p.cpp"
+only in patch2:
+unchanged:
+--- kdebase-workspace-4.3.0.orig/libs/ksysguard/processcore/processes_freebsd_p.cpp
++++ kdebase-workspace-4.3.0/libs/ksysguard/processcore/processes_freebsd_p.cpp
+@@ -78,7 +78,7 @@
+ process->setTracerpid(0);
+
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ process->setEuid(p->ki_uid);
+ process->setUid(p->ki_ruid);
+ process->setEgid(p->ki_svgid);
+@@ -98,7 +98,7 @@
+ {
+ int status;
+ struct rusage pru;
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ ps->setUserTime(p->ki_rusage.ru_utime.tv_sec * 100 + p->ki_rusage.ru_utime.tv_usec / 10000);
+ ps->setSysTime(p->ki_rusage.ru_stime.tv_sec * 100 + p->ki_rusage.ru_stime.tv_usec / 10000);
+ ps->setNiceLevel(p->ki_nice);
+@@ -185,7 +185,7 @@
+ struct kinfo_proc p;
+ if(d->readProc(pid, &p))
+ {
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ ppid = p.ki_ppid;
+ #elif defined(__DragonFly__) && __DragonFly_version >= 190000
+ ppid = p.kp_ppid;
+@@ -230,7 +230,7 @@
+
+ for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
+ {
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ long pid = p[num].ki_pid;
+ long long ppid = p[num].ki_ppid;
+ #elif defined(__DragonFly__) && __DragonFly_version >= 190000
Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series 2009-08-22 15:26:54 UTC (rev 15751)
+++ trunk/packages/kdebase-workspace/debian/patches/series 2009-08-22 15:48:06 UTC (rev 15752)
@@ -1,4 +1,5 @@
01_r1004104_oxygen_air.diff
+02_kfreebsd_updates.diff
06_kdm_does_not_wreak_havoc.diff
07_kdmrc_defaults.diff
08_genkdmconf.diff
More information about the pkg-kde-commits
mailing list