[pkg-boinc-commits] r361 - in trunk/kboincspy/debian: . patches
Frank S. Thomas
fst-guest at costa.debian.org
Wed Feb 8 08:10:07 UTC 2006
Author: fst-guest
Date: 2006-02-08 08:10:06 +0000 (Wed, 08 Feb 2006)
New Revision: 361
Added:
trunk/kboincspy/debian/kboincspy-dev.dirs
trunk/kboincspy/debian/kboincspy-dev.install
trunk/kboincspy/debian/kboincspy.dirs
Removed:
trunk/kboincspy/debian/patches/02_utc-offset-fix.patch
trunk/kboincspy/debian/patches/03_predictor1-url-4monitor.patch
Modified:
trunk/kboincspy/debian/README.Debian
trunk/kboincspy/debian/changelog
trunk/kboincspy/debian/control
trunk/kboincspy/debian/control.in
trunk/kboincspy/debian/copyright
trunk/kboincspy/debian/kboincspy.install
trunk/kboincspy/debian/patches/01_add-libs-to-libadd.patch
trunk/kboincspy/debian/rules
Log:
Prepared KBS for the new upstream release.
Modified: trunk/kboincspy/debian/README.Debian
===================================================================
--- trunk/kboincspy/debian/README.Debian 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/README.Debian 2006-02-08 08:10:06 UTC (rev 361)
@@ -7,11 +7,7 @@
available at:
http://pkg-boinc.alioth.debian.org
-
- These packages are poorly tested and should be considered "experimental".
- Until the core client is in the official Debian archive, I suggest downloading
- and installing it from the BOINC website:
- http://boinc.berkeley.edu/download.php
+ For installation instructions see http://wiki.debian.org/BOINC#Installation
- -- Frank S. Thomas <frank at thomas-alfeld.de>, 02 Jul 2005
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Tue, 7 Feb 2006
Modified: trunk/kboincspy/debian/changelog
===================================================================
--- trunk/kboincspy/debian/changelog 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/changelog 2006-02-08 08:10:06 UTC (rev 361)
@@ -1,9 +1,17 @@
-kboincspy (0.9.1-1) UNRELEASED; urgency=low
+kboincspy (0.9.1-1) unstable; urgency=low
- * NOT RELEASED YET
* New upstream release.
+ * Splitted KBoincSpy up into two packages: kboincspy and kboincspy-dev. The
+ latter contains header files and other files that are needed to develop
+ and compile plugins for KBoincSpy.
+ * debian/patches/:
+ - Updated 01_add-libs-to-libadd.patch for the new release.
+ - Removed backported patches: 02_utc-offset-fix.patch,
+ 03_predictor1-url-4monitor.patch.
+ * Updated debian/copyright, since KBoincSpy's core library and plugins
+ (monitors and panels) are now licensed under the LGPL.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Sat, 24 Dec 2005 23:19:19 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Wed, 8 Feb 2006 09:08:23 +0100
kboincspy (0.9.0-3) unstable; urgency=low
Modified: trunk/kboincspy/debian/control
===================================================================
--- trunk/kboincspy/debian/control 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/control 2006-02-08 08:10:06 UTC (rev 361)
@@ -22,14 +22,23 @@
architecture offers support for a virtually unlimited number of projects.
.
Plugins for the following BOINC projects are included:
- * AstroPulse - http://setiboinc.ssl.berkeley.edu/ap
- * BURP - Big and Ugly Rendering Project - http://burp.boinc.dk
* climateprediction.net - http://www.climateprediction.net
* Einstein at Home - http://einstein.phys.uwm.edu
- * Lattice Project - http://lattice.umiacs.umd.edu
* LHC at home - http://lhcathome.cern.ch
- * Pirates at home - http://pirates.vassar.edu
* ProteinPredictorAtHome - http://predictor.scripps.edu
* SETI at home - http://setiweb.ssl.berkeley.edu
.
- Homepage: http://kboincspy.sourceforge.net/
+ Homepage: http://kboincspy.sourceforge.net
+
+Package: kboincspy-dev
+Section: libdevel
+Architecture: any
+Depends: kboincspy (= ${Source-Version}), kdelibs4-dev (>= 4:3.3.0)
+Description: development files for KBoincSpy plugins
+ KBoincSpy is a KDE monitor and control utility for the BOINC distributed
+ client.
+ .
+ This package contains header files and other files that are needed to develop
+ and compile plugins for KBoincSpy.
+ .
+ Homepage: http://kboincspy.sourceforge.net
Modified: trunk/kboincspy/debian/control.in
===================================================================
--- trunk/kboincspy/debian/control.in 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/control.in 2006-02-08 08:10:06 UTC (rev 361)
@@ -22,14 +22,23 @@
architecture offers support for a virtually unlimited number of projects.
.
Plugins for the following BOINC projects are included:
- * AstroPulse - http://setiboinc.ssl.berkeley.edu/ap
- * BURP - Big and Ugly Rendering Project - http://burp.boinc.dk
* climateprediction.net - http://www.climateprediction.net
* Einstein at Home - http://einstein.phys.uwm.edu
- * Lattice Project - http://lattice.umiacs.umd.edu
* LHC at home - http://lhcathome.cern.ch
- * Pirates at home - http://pirates.vassar.edu
* ProteinPredictorAtHome - http://predictor.scripps.edu
* SETI at home - http://setiweb.ssl.berkeley.edu
.
- Homepage: http://kboincspy.sourceforge.net/
+ Homepage: http://kboincspy.sourceforge.net
+
+Package: kboincspy-dev
+Section: libdevel
+Architecture: any
+Depends: kboincspy (= ${Source-Version}), kdelibs4-dev (>= 4:3.3.0)
+Description: development files for KBoincSpy plugins
+ KBoincSpy is a KDE monitor and control utility for the BOINC distributed
+ client.
+ .
+ This package contains header files and other files that are needed to develop
+ and compile plugins for KBoincSpy.
+ .
+ Homepage: http://kboincspy.sourceforge.net
Modified: trunk/kboincspy/debian/copyright
===================================================================
--- trunk/kboincspy/debian/copyright 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/copyright 2006-02-08 08:10:06 UTC (rev 361)
@@ -5,11 +5,11 @@
Upstream Author: Roberto A. Virga <rvirga at users.sourceforge.net>
-Copyright (C) 2004-2005 Roberto A. Virga
+Copyright (C) 2004-2006 Roberto A. Virga
-License:
+KBoincSpy's main program is licensed under the GPL:
- This package is free software; you can redistribute it and/or modify
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991.
@@ -27,6 +27,27 @@
Public License can be found in `/usr/share/common-licenses/GPL'.
+KBoincSpy's plugins and it's core library are licensed under the LGPL:
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU Library General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
The KBoincSpy Handbook included in this package is licensed
under the terms of the GNU Free Documentation License:
Added: trunk/kboincspy/debian/kboincspy-dev.dirs
===================================================================
--- trunk/kboincspy/debian/kboincspy-dev.dirs 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/kboincspy-dev.dirs 2006-02-08 08:10:06 UTC (rev 361)
@@ -0,0 +1 @@
+usr/lib
Added: trunk/kboincspy/debian/kboincspy-dev.install
===================================================================
--- trunk/kboincspy/debian/kboincspy-dev.install 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/kboincspy-dev.install 2006-02-08 08:10:06 UTC (rev 361)
@@ -0,0 +1,2 @@
+debian/tmp/usr/include usr
+debian/tmp/usr/lib/*.la usr/lib
Added: trunk/kboincspy/debian/kboincspy.dirs
===================================================================
--- trunk/kboincspy/debian/kboincspy.dirs 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/kboincspy.dirs 2006-02-08 08:10:06 UTC (rev 361)
@@ -0,0 +1 @@
+usr/lib
Modified: trunk/kboincspy/debian/kboincspy.install
===================================================================
--- trunk/kboincspy/debian/kboincspy.install 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/kboincspy.install 2006-02-08 08:10:06 UTC (rev 361)
@@ -1 +1,4 @@
-debian/icons/kboincspy-*.xpm usr/share/pixmaps/
+debian/tmp/usr/bin usr
+debian/tmp/usr/lib/kde3 usr/lib
+debian/tmp/usr/share usr
+debian/icons/kboincspy-*.xpm usr/share/pixmaps
Modified: trunk/kboincspy/debian/patches/01_add-libs-to-libadd.patch
===================================================================
--- trunk/kboincspy/debian/patches/01_add-libs-to-libadd.patch 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/patches/01_add-libs-to-libadd.patch 2006-02-08 08:10:06 UTC (rev 361)
@@ -1,252 +1,306 @@
-diff -Naur kboincspy-0.9.0.orig/src/panels/cpdn/trickle/Makefile.am kboincspy-0.9.0/src/panels/cpdn/trickle/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/cpdn/trickle/Makefile.am 2004-11-15 21:09:17.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/cpdn/trickle/Makefile.am 2005-12-21 21:13:39.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSCPDN_INCLUDES)
+diff -Naur kboincspy-0.9.1.orig/src/kbscore/Makefile.am kboincspy-0.9.1/src/kbscore/Makefile.am
+--- kboincspy-0.9.1.orig/src/kbscore/Makefile.am 2006-01-27 00:49:15.000000000 +0100
++++ kboincspy-0.9.1/src/kbscore/Makefile.am 2006-02-07 13:57:44.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(all_includes)
- libkbscpdntricklepanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
--libkbscpdntricklepanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
-+libkbscpdntricklepanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
+ libkbscore_la_LDFLAGS = $(all_libraries) -release 0.9.1 -no-undefined
+-libkbscore_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
++libkbscore_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO)
- kde_module_LTLIBRARIES = libkbscpdntricklepanel.la
+ libkbscore_la_SOURCES = kbsboincdata.cpp kbsboinclogx.cpp \
+ kbsboincmonitor.cpp kbscachenode.cpp kbsdatamonitor.cpp \
+diff -Naur kboincspy-0.9.1.orig/src/monitors/cpdn/Makefile.am kboincspy-0.9.1/src/monitors/cpdn/Makefile.am
+--- kboincspy-0.9.1.orig/src/monitors/cpdn/Makefile.am 2006-01-14 21:20:57.000000000 +0100
++++ kboincspy-0.9.1/src/monitors/cpdn/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbscpdnmonitor.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/common/client/Makefile.am kboincspy-0.9.0/src/panels/common/client/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/common/client/Makefile.am 2004-11-15 21:08:36.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/common/client/Makefile.am 2005-12-21 21:02:57.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES)
+ libkbscpdnmonitor_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-libkbscpdnmonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
++libkbscpdnmonitor_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- libkbsclientpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbscpdnmonitor_la_SOURCES = kbscpdndata.cpp kbscpdnmonitor.cpp \
+ kbscpdnplugin.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/common/client/Makefile.am kboincspy-0.9.1/src/panels/common/client/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/common/client/Makefile.am 2006-01-03 19:32:06.000000000 +0100
++++ kboincspy-0.9.1/src/panels/common/client/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbsclientpanel.la
+
+ libkbsclientpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbsclientpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
+libkbsclientpanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- kde_module_LTLIBRARIES = libkbsclientpanel.la
+ libkbsclientpanel_la_SOURCES = kbsclientcontent.ui \
+ kbsclientpanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/common/performance/Makefile.am kboincspy-0.9.1/src/panels/common/performance/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/common/performance/Makefile.am 2006-01-03 19:32:59.000000000 +0100
++++ kboincspy-0.9.1/src/panels/common/performance/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbsperformancepanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/common/host/Makefile.am kboincspy-0.9.0/src/panels/common/host/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/common/host/Makefile.am 2004-11-15 21:08:44.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/common/host/Makefile.am 2005-12-21 21:03:56.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES)
-
- libkbshostpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
--libkbshostpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
-+libkbshostpanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
-
- kde_module_LTLIBRARIES = libkbshostpanel.la
-
-diff -Naur kboincspy-0.9.0.orig/src/panels/common/performance/Makefile.am kboincspy-0.9.0/src/panels/common/performance/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/common/performance/Makefile.am 2004-11-15 21:08:50.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/common/performance/Makefile.am 2005-12-21 21:05:12.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES)
-
- libkbsperformancepanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbsperformancepanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbsperformancepanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
+libkbsperformancepanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- kde_module_LTLIBRARIES = libkbsperformancepanel.la
+ libkbsperformancepanel_la_SOURCES = kbsperformancecontent.ui \
+ kbsperformancepanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/common/processor/Makefile.am kboincspy-0.9.1/src/panels/common/processor/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/common/processor/Makefile.am 2006-01-03 19:33:32.000000000 +0100
++++ kboincspy-0.9.1/src/panels/common/processor/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbsprocessorpanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/common/processor/Makefile.am kboincspy-0.9.0/src/panels/common/processor/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/common/processor/Makefile.am 2004-11-15 21:08:55.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/common/processor/Makefile.am 2005-12-21 21:09:02.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES)
-
- libkbsprocessorpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbsprocessorpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbsprocessorpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
+libkbsprocessorpanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- kde_module_LTLIBRARIES = libkbsprocessorpanel.la
+ libkbsprocessorpanel_la_SOURCES = kbsprocessorcontent.ui \
+ kbsprocessorpanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/common/progress/Makefile.am kboincspy-0.9.1/src/panels/common/progress/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/common/progress/Makefile.am 2006-01-03 19:34:06.000000000 +0100
++++ kboincspy-0.9.1/src/panels/common/progress/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbsprogresspanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/common/progress/Makefile.am kboincspy-0.9.0/src/panels/common/progress/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/common/progress/Makefile.am 2004-11-15 21:09:00.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/common/progress/Makefile.am 2005-12-21 21:05:41.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES)
-
- libkbsprogresspanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbsprogresspanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbsprogresspanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
+libkbsprogresspanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- kde_module_LTLIBRARIES = libkbsprogresspanel.la
+ libkbsprogresspanel_la_SOURCES = kbsprogresscontent.ui \
+ kbsprogresspanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/common/user/Makefile.am kboincspy-0.9.1/src/panels/common/user/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/common/user/Makefile.am 2006-01-03 19:34:35.000000000 +0100
++++ kboincspy-0.9.1/src/panels/common/user/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = libkbsuserpanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/common/user/Makefile.am kboincspy-0.9.0/src/panels/common/user/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/common/user/Makefile.am 2004-11-15 21:09:06.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/common/user/Makefile.am 2005-12-21 21:11:36.000000000 +0100
-@@ -4,7 +4,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES)
-
- libkbsuserpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbsuserpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbsuserpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
+libkbsuserpanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- kde_module_LTLIBRARIES = libkbsuserpanel.la
+ libkbsuserpanel_la_SOURCES = kbscreditcalendarcontent.ui kbsusercontent.ui \
+ kbscreditcalendar.cpp kbscreditcalendarwindow.cpp kbsuserpanelnode.cpp \
+diff -Naur kboincspy-0.9.1.orig/src/panels/cpdn/trickle/Makefile.am kboincspy-0.9.1/src/panels/cpdn/trickle/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/cpdn/trickle/Makefile.am 2006-01-03 19:35:03.000000000 +0100
++++ kboincspy-0.9.1/src/panels/cpdn/trickle/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbscpdntricklepanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/einstein/workunit/Makefile.am kboincspy-0.9.0/src/panels/einstein/workunit/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/einstein/workunit/Makefile.am 2005-02-17 21:36:47.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/einstein/workunit/Makefile.am 2005-12-21 21:14:53.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSEINSTEIN_INCLUDES)
+ libkbscpdntricklepanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-libkbscpdntricklepanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
++libkbscpdntricklepanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- libkbseinsteinworkunitpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbscpdntricklepanel_la_SOURCES = kbscpdntricklecontent.ui \
+ kbscpdntricklepanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/einstein/workunit/Makefile.am kboincspy-0.9.1/src/panels/einstein/workunit/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/einstein/workunit/Makefile.am 2006-01-03 19:35:33.000000000 +0100
++++ kboincspy-0.9.1/src/panels/einstein/workunit/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbseinsteinworkunitpanel.la
+
+ libkbseinsteinworkunitpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbseinsteinworkunitpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSEINSTEIN)
+libkbseinsteinworkunitpanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSEINSTEIN)
- kde_module_LTLIBRARIES = libkbseinsteinworkunitpanel.la
+ libkbseinsteinworkunitpanel_la_SOURCES = kbseinsteinworkunitcontent.ui \
+ kbseinsteinworkunitpanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/lhc/tracking/Makefile.am kboincspy-0.9.1/src/panels/lhc/tracking/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/lhc/tracking/Makefile.am 2006-01-03 19:38:55.000000000 +0100
++++ kboincspy-0.9.1/src/panels/lhc/tracking/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbslhctrackingpanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/lhc/tracking/Makefile.am kboincspy-0.9.0/src/panels/lhc/tracking/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/lhc/tracking/Makefile.am 2005-02-28 23:42:28.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/lhc/tracking/Makefile.am 2005-12-21 21:16:21.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSLHC_INCLUDES)
-
- libkbslhctrackingpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbslhctrackingpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbslhctrackingpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSLHC) $(GLLIB)
+libkbslhctrackingpanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSLHC) $(GLLIB)
- kde_module_LTLIBRARIES = libkbslhctrackingpanel.la
+ libkbslhctrackingpanel_la_SOURCES = kbslhctrackingcontent.ui \
+ kbslhcparticleview.cpp kbslhctrackingdetailswindow.cpp \
+diff -Naur kboincspy-0.9.1.orig/src/panels/predictor/folding/Makefile.am kboincspy-0.9.1/src/panels/predictor/folding/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/predictor/folding/Makefile.am 2006-01-03 19:36:27.000000000 +0100
++++ kboincspy-0.9.1/src/panels/predictor/folding/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbspredictorfoldingpanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/predictor/folding/Makefile.am kboincspy-0.9.0/src/panels/predictor/folding/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/predictor/folding/Makefile.am 2005-03-15 18:20:33.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/predictor/folding/Makefile.am 2005-12-21 21:18:15.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSPREDICTOR_INCLUDES)
-
- libkbspredictorfoldingpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbspredictorfoldingpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbspredictorfoldingpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSPREDICTOR) $(GLLIB)
+libkbspredictorfoldingpanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSPREDICTOR) $(GLLIB)
- kde_module_LTLIBRARIES = libkbspredictorfoldingpanel.la
+ libkbspredictorfoldingpanel_la_SOURCES = kbspredictormfoldcontent.ui \
+ kbspredictorcharmmcontent.ui kbspredictormoleculeswindow.cpp \
+diff -Naur kboincspy-0.9.1.orig/src/panels/seti/calibration/Makefile.am kboincspy-0.9.1/src/panels/seti/calibration/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/seti/calibration/Makefile.am 2006-01-03 19:36:49.000000000 +0100
++++ kboincspy-0.9.1/src/panels/seti/calibration/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbsseticalibrationpanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/seti/calibration/Makefile.am kboincspy-0.9.0/src/panels/seti/calibration/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/seti/calibration/Makefile.am 2004-11-15 21:09:35.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/seti/calibration/Makefile.am 2005-12-21 21:20:19.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSSETI_INCLUDES)
-
- libkbsseticalibrationpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbsseticalibrationpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbsseticalibrationpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
+libkbsseticalibrationpanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
- kde_module_LTLIBRARIES = libkbsseticalibrationpanel.la
+ libkbsseticalibrationpanel_la_SOURCES = kbsseticalibrationcontent.ui \
+ kbsseticalibrationpanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/seti/performance/Makefile.am kboincspy-0.9.1/src/panels/seti/performance/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/seti/performance/Makefile.am 2006-01-03 19:37:20.000000000 +0100
++++ kboincspy-0.9.1/src/panels/seti/performance/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbssetiperformancepanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/seti/performance/Makefile.am kboincspy-0.9.0/src/panels/seti/performance/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/seti/performance/Makefile.am 2004-11-15 21:09:45.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/seti/performance/Makefile.am 2005-12-21 21:20:54.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSSETI_INCLUDES)
-
- libkbssetiperformancepanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbssetiperformancepanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbssetiperformancepanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
+libkbssetiperformancepanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
- kde_module_LTLIBRARIES = libkbssetiperformancepanel.la
+ libkbssetiperformancepanel_la_SOURCES = kbssetiperformancecontent.ui \
+ kbssetiperformancepanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/seti/progress/Makefile.am kboincspy-0.9.1/src/panels/seti/progress/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/seti/progress/Makefile.am 2006-01-03 19:37:42.000000000 +0100
++++ kboincspy-0.9.1/src/panels/seti/progress/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbssetiprogresspanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/seti/progress/Makefile.am kboincspy-0.9.0/src/panels/seti/progress/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/seti/progress/Makefile.am 2004-11-15 21:09:51.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/seti/progress/Makefile.am 2005-12-21 21:24:43.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSSETI_INCLUDES)
-
- libkbssetiprogresspanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbssetiprogresspanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbssetiprogresspanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
+libkbssetiprogresspanel_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
- kde_module_LTLIBRARIES = libkbssetiprogresspanel.la
+ libkbssetiprogresspanel_la_SOURCES = kbssetiprogresscontent.ui \
+ kbssetiprogresspanelnode.cpp
+diff -Naur kboincspy-0.9.1.orig/src/panels/seti/results/Makefile.am kboincspy-0.9.1/src/panels/seti/results/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/seti/results/Makefile.am 2006-01-03 19:38:02.000000000 +0100
++++ kboincspy-0.9.1/src/panels/seti/results/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbssetiresultspanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/seti/results/Makefile.am kboincspy-0.9.0/src/panels/seti/results/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/seti/results/Makefile.am 2004-11-15 21:09:56.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/seti/results/Makefile.am 2005-12-21 21:25:58.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSSETI_INCLUDES)
-
- libkbssetiresultspanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbssetiresultspanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbssetiresultspanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
+libkbssetiresultspanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
- kde_module_LTLIBRARIES = libkbssetiresultspanel.la
+ libkbssetiresultspanel_la_SOURCES = \
+ kbssetiresultscontent.ui kbssetiresultsdetailscontent.ui \
+diff -Naur kboincspy-0.9.1.orig/src/panels/seti/workunit/Makefile.am kboincspy-0.9.1/src/panels/seti/workunit/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/seti/workunit/Makefile.am 2006-01-03 19:38:28.000000000 +0100
++++ kboincspy-0.9.1/src/panels/seti/workunit/Makefile.am 2006-02-07 13:57:06.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbssetiworkunitpanel.la
-diff -Naur kboincspy-0.9.0.orig/src/panels/seti/workunit/Makefile.am kboincspy-0.9.0/src/panels/seti/workunit/Makefile.am
---- kboincspy-0.9.0.orig/src/panels/seti/workunit/Makefile.am 2005-02-16 17:11:44.000000000 +0100
-+++ kboincspy-0.9.0/src/panels/seti/workunit/Makefile.am 2005-12-21 21:30:10.000000000 +0100
-@@ -3,7 +3,7 @@
- INCLUDES = $(all_includes) $(KBSCORE_INCLUDES) $(KBSSETI_INCLUDES)
-
- libkbssetiworkunitpanel_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbssetiworkunitpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbssetiworkunitpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
+libkbssetiworkunitpanel_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(LIB_KBSSETI)
- kde_module_LTLIBRARIES = libkbssetiworkunitpanel.la
-
-diff -Naur kboincspy-0.9.0.orig/src/monitors/cpdn/Makefile.am kboincspy-0.9.0/src/monitors/cpdn/Makefile.am
---- kboincspy-0.9.0.orig/src/monitors/cpdn/Makefile.am 2004-11-15 21:07:15.000000000 +0100
-+++ kboincspy-0.9.0/src/monitors/cpdn/Makefile.am 2005-12-21 20:50:52.000000000 +0100
+ libkbssetiworkunitpanel_la_SOURCES = kbssetiworkunitcontent.ui \
+ kbssetiskymaplegend.cpp kbssetiskymapwindow.cpp kbssetitelescopepathwindow.cpp \
+diff -Naur kboincspy-0.9.1.orig/src/monitors/ap/Makefile.am kboincspy-0.9.1/src/monitors/ap/Makefile.am
+--- kboincspy-0.9.1.orig/src/monitors/ap/Makefile.am 2006-01-27 02:50:33.000000000 +0100
++++ kboincspy-0.9.1/src/monitors/ap/Makefile.am 2006-02-07 17:59:55.000000000 +0100
@@ -5,7 +5,7 @@
- kde_module_LTLIBRARIES = libkbscpdnmonitor.la
+ lib_LTLIBRARIES = libkbsastropulse.la
- libkbscpdnmonitor_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
--libkbscpdnmonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
-+libkbscpdnmonitor_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
+ libkbsastropulse_la_LDFLAGS = $(all_libraries) -release 0.9.1 -no-undefined
+-libkbsastropulse_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
++libkbsastropulse_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- libkbscpdnmonitor_la_SOURCES = cpdndata.cpp kbscpdnmonitor.cpp \
- kbscpdnplugin.cpp
-diff -Naur kboincspy-0.9.0.orig/src/monitors/einstein/Makefile.am kboincspy-0.9.0/src/monitors/einstein/Makefile.am
---- kboincspy-0.9.0.orig/src/monitors/einstein/Makefile.am 2005-02-19 23:49:08.000000000 +0100
-+++ kboincspy-0.9.0/src/monitors/einstein/Makefile.am 2005-12-21 20:52:53.000000000 +0100
-@@ -12,7 +12,7 @@
+ libkbsastropulse_la_SOURCES = kbsastropulsedata.cpp \
+ kbsastropulselogmanager.cpp kbsastropulselogx.cpp
+@@ -13,7 +13,7 @@
+ kde_module_LTLIBRARIES = libkbsastropulsemonitor.la
+
+ libkbsastropulsemonitor_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-libkbsastropulsemonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) libkbsastropulse.la
++libkbsastropulsemonitor_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) libkbsastropulse.la
+
+ libkbsastropulsemonitor_la_SOURCES = kbsastropulseconfigpage.ui \
+ kbsastropulsepreferences.kcfgc kbsastropulsemonitor.cpp \
+diff -Naur kboincspy-0.9.1.orig/src/monitors/einstein/Makefile.am kboincspy-0.9.1/src/monitors/einstein/Makefile.am
+--- kboincspy-0.9.1.orig/src/monitors/einstein/Makefile.am 2006-01-14 21:21:02.000000000 +0100
++++ kboincspy-0.9.1/src/monitors/einstein/Makefile.am 2006-02-07 18:50:37.000000000 +0100
+@@ -5,14 +5,14 @@
+ lib_LTLIBRARIES = libkbseinstein.la
+
+ libkbseinstein_la_LDFLAGS = $(all_libraries) -release 0.9.1 -no-undefined
+-libkbseinstein_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
++libkbseinstein_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
+
+ libkbseinstein_la_SOURCES = kbseinsteindata.cpp
+
kde_module_LTLIBRARIES = libkbseinsteinmonitor.la
- libkbseinsteinmonitor_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbseinsteinmonitor_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbseinsteinmonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) libkbseinstein.la
+libkbseinsteinmonitor_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) libkbseinstein.la
libkbseinsteinmonitor_la_SOURCES = kbseinsteinprojectmonitor.cpp \
- kbseinsteinplugin.cpp kbseinsteintaskmonitor.cpp
-diff -Naur kboincspy-0.9.0.orig/src/monitors/lhc/Makefile.am kboincspy-0.9.0/src/monitors/lhc/Makefile.am
---- kboincspy-0.9.0.orig/src/monitors/lhc/Makefile.am 2005-02-28 23:40:49.000000000 +0100
-+++ kboincspy-0.9.0/src/monitors/lhc/Makefile.am 2005-12-21 20:54:00.000000000 +0100
-@@ -12,7 +12,7 @@
+ kbseinsteintaskmonitor.cpp kbseinsteinplugin.cpp
+diff -Naur kboincspy-0.9.1.orig/src/monitors/lhc/Makefile.am kboincspy-0.9.1/src/monitors/lhc/Makefile.am
+--- kboincspy-0.9.1.orig/src/monitors/lhc/Makefile.am 2006-01-14 21:21:06.000000000 +0100
++++ kboincspy-0.9.1/src/monitors/lhc/Makefile.am 2006-02-07 19:06:24.000000000 +0100
+@@ -5,14 +5,14 @@
+ lib_LTLIBRARIES = libkbslhc.la
+
+ libkbslhc_la_LDFLAGS = $(all_libraries) -release 0.9.1 -no-undefined
+-libkbslhc_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
++libkbslhc_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
+
+ libkbslhc_la_SOURCES = kbslhcdata.cpp kbslhcinterpolator.cpp
+
kde_module_LTLIBRARIES = libkbslhcmonitor.la
- libkbslhcmonitor_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbslhcmonitor_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbslhcmonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) libkbslhc.la
+libkbslhcmonitor_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) libkbslhc.la
libkbslhcmonitor_la_SOURCES = kbslhcprojectmonitor.cpp \
- kbslhctaskmonitor.cpp kbslhcplugin.cpp kbslhcinterpolator.cpp
-diff -Naur kboincspy-0.9.0.orig/src/monitors/predictor/Makefile.am kboincspy-0.9.0/src/monitors/predictor/Makefile.am
---- kboincspy-0.9.0.orig/src/monitors/predictor/Makefile.am 2005-03-22 16:06:15.000000000 +0100
-+++ kboincspy-0.9.0/src/monitors/predictor/Makefile.am 2005-12-21 21:00:29.000000000 +0100
-@@ -12,7 +12,7 @@
+ kbslhctaskmonitor.cpp kbslhcplugin.cpp
+diff -Naur kboincspy-0.9.1.orig/src/monitors/predictor/Makefile.am kboincspy-0.9.1/src/monitors/predictor/Makefile.am
+--- kboincspy-0.9.1.orig/src/monitors/predictor/Makefile.am 2006-01-27 03:41:34.000000000 +0100
++++ kboincspy-0.9.1/src/monitors/predictor/Makefile.am 2006-02-07 19:33:28.000000000 +0100
+@@ -5,14 +5,14 @@
+ lib_LTLIBRARIES = libkbspredictor.la
+
+ libkbspredictor_la_LDFLAGS = $(all_libraries) -release 0.9.1 -no-undefined
+-libkbspredictor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) $(GLLIB)
++libkbspredictor_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) $(GLLIB)
+
+ libkbspredictor_la_SOURCES = kbspredictordata.cpp kbspredictormoleculeview.cpp
+
kde_module_LTLIBRARIES = libkbspredictormonitor.la
- libkbspredictormonitor_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbspredictormonitor_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbspredictormonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) libkbspredictor.la
+libkbspredictormonitor_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) libkbspredictor.la
libkbspredictormonitor_la_SOURCES = kbspredictorconfigpage.ui \
kbspredictormoleculelog.cpp kbspredictorpreferences.cpp \
-diff -Naur kboincspy-0.9.0.orig/src/monitors/seti/Makefile.am kboincspy-0.9.0/src/monitors/seti/Makefile.am
---- kboincspy-0.9.0.orig/src/monitors/seti/Makefile.am 2005-03-07 17:02:41.000000000 +0100
-+++ kboincspy-0.9.0/src/monitors/seti/Makefile.am 2005-12-21 20:58:59.000000000 +0100
-@@ -14,7 +14,7 @@
+diff -Naur kboincspy-0.9.1.orig/src/monitors/seti/Makefile.am kboincspy-0.9.1/src/monitors/seti/Makefile.am
+--- kboincspy-0.9.1.orig/src/monitors/seti/Makefile.am 2006-01-27 03:06:46.000000000 +0100
++++ kboincspy-0.9.1/src/monitors/seti/Makefile.am 2006-02-07 19:34:10.000000000 +0100
+@@ -5,7 +5,7 @@
+ lib_LTLIBRARIES = libkbsseti.la
+
+ libkbsseti_la_LDFLAGS = $(all_libraries) -release 0.9.1 -no-undefined
+-libkbsseti_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
++libkbsseti_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
+
+ libkbsseti_la_SOURCES = kbsseticalibrator.cpp kbssetidata.cpp \
+ kbssetilog.cpp kbssetilog9x.cpp kbssetilogmanager.cpp \
+@@ -15,7 +15,7 @@
kde_module_LTLIBRARIES = libkbssetimonitor.la
- libkbssetimonitor_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkbssetimonitor_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-libkbssetimonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) libkbsseti.la
+libkbssetimonitor_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) libkbsseti.la
libkbssetimonitor_la_SOURCES = kbsseticalibrationpage.ui kbsseticonfigpage.ui \
kbssetigaussianlog.cpp kbssetipreferences.cpp \
-diff -Naur kboincspy-0.9.0.orig/src/monitors/ap/Makefile.am kboincspy-0.9.0/src/monitors/ap/Makefile.am
---- kboincspy-0.9.0.orig/src/monitors/ap/Makefile.am 2005-02-21 17:01:19.000000000 +0100
-+++ kboincspy-0.9.0/src/monitors/ap/Makefile.am 2005-12-21 20:49:16.000000000 +0100
-@@ -13,7 +13,7 @@
- kde_module_LTLIBRARIES = libkbsastropulsemonitor.la
+diff -Naur kboincspy-0.9.1.orig/src/panels/common/host/Makefile.am kboincspy-0.9.1/src/panels/common/host/Makefile.am
+--- kboincspy-0.9.1.orig/src/panels/common/host/Makefile.am 2006-01-03 19:32:32.000000000 +0100
++++ kboincspy-0.9.1/src/panels/common/host/Makefile.am 2006-02-07 19:44:36.000000000 +0100
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkbshostpanel.la
- libkbsastropulsemonitor_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
--libkbsastropulsemonitor_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE) libkbsastropulse.la
-+libkbsastropulsemonitor_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE) libkbsastropulse.la
+ libkbshostpanel_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-libkbshostpanel_la_LIBADD = $(LIB_KDECORE) $(LIB_KBSCORE)
++libkbshostpanel_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) $(LIB_KBSCORE)
- libkbsastropulsemonitor_la_SOURCES = kbsastropulseconfigpage.ui \
- kbsastropulsemonitor.cpp kbsastropulsepreferences.kcfgc \
+ libkbshostpanel_la_SOURCES = kbshostcontent.ui \
+ kbshostpanelnode.cpp kbshoststatisticswindow.cpp
Deleted: trunk/kboincspy/debian/patches/02_utc-offset-fix.patch
===================================================================
--- trunk/kboincspy/debian/patches/02_utc-offset-fix.patch 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/patches/02_utc-offset-fix.patch 2006-02-08 08:10:06 UTC (rev 361)
@@ -1,44 +0,0 @@
-diff -u -r1.19 -r1.20
---- kboincspy-0.9.0.orig/src/kbscore/boincdata.cpp 2005/03/26 14:01:20 1.19
-+++ kboincspy-0.9.0/src/kbscore/boincdata.cpp 2005/04/05 17:23:54 1.20
-@@ -28,10 +28,10 @@
-
- QDateTime parseJulianDate(double d)
- {
-- const double epoch = 58574102.0;
-+ const double epoch = 58574100.0;
- QDateTime out;
--
-- out.setTime_t(unsigned((d * 24 - epoch) * 60 * 60));
-+
-+ out.setTime_t(unsigned((d * 24 - epoch) * 60 * 60), Qt::UTC);
- out = out.addSecs(KRFCDate::localUTCOffset() * 60);
-
- return out;
-@@ -61,7 +61,7 @@
- {
- QDateTime out;
-
-- out.setTime_t(unsigned(d));
-+ out.setTime_t(unsigned(d), Qt::UTC);
- out = out.addSecs(KRFCDate::localUTCOffset() * 60);
-
- return out;
-@@ -74,7 +74,7 @@
-
- double formatUNIXDate(const QDateTime &date)
- {
-- return(double(date.toTime_t()) - KRFCDate::localUTCOffset() * 60.0);
-+ return(double(date.toTime_t()) - KRFCDate::localUTCOffset() * 60);
- }
-
- QString formatBytes(double bytes)
-@@ -704,7 +704,7 @@
- else if(elementName == "body")
- body = element.text().stripWhiteSpace();
- else if(elementName == "time")
-- time.setTime_t(element.text().toUInt(0, 10));
-+ time = parseUNIXDate(element.text().toDouble());
- else if(elementName == "project")
- project = element.text().stripWhiteSpace();
- }
Deleted: trunk/kboincspy/debian/patches/03_predictor1-url-4monitor.patch
===================================================================
--- trunk/kboincspy/debian/patches/03_predictor1-url-4monitor.patch 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/patches/03_predictor1-url-4monitor.patch 2006-02-08 08:10:06 UTC (rev 361)
@@ -1,11 +0,0 @@
-diff -u -r1.3 -r1.4
---- kboincspy-0.9.0.orig/src/monitors/predictor/kbspredictormonitor.desktop 2005/02/06 08:56:14 1.3
-+++ kboincspy-0.9.0/src/monitors/predictor/kbspredictormonitor.desktop 2005/04/09 16:59:36 1.4
-@@ -2,6 +2,6 @@
- Encoding=UTF-8
- Type=Service
- Name=ProteinPredictorAtHome Monitor
--X-KDE-Projects=predictor.scripps.edu
-+X-KDE-Projects=predictor.scripps.edu,predictor1.scripps.edu
- X-KDE-Library=libkbspredictormonitor
- ServiceTypes=KBSMonitor
Modified: trunk/kboincspy/debian/rules
===================================================================
--- trunk/kboincspy/debian/rules 2006-02-06 23:06:54 UTC (rev 360)
+++ trunk/kboincspy/debian/rules 2006-02-08 08:10:06 UTC (rev 361)
@@ -8,16 +8,18 @@
include /usr/share/cdbs/1/class/kde.mk
DEB_CONFIGURE_EXTRA_FLAGS := --with-gl
-
+DEB_DH_MAKESHLIBS_ARGS_kboincspy := -V"kboincspy (= $(DEB_NOEPOCH_VERSION))"
+DEB_INSTALL_DOCS_ALL :=
DEB_INSTALL_MANPAGES_kboincspy := kboincspy.1
post-patches::
# Removing these files, which were generated by uic, saves us from
-# patching some Makefile.in's for adding `$(srcdir)/'. Since we are
-# regenerating the makefiles here too, patching is in any case not
-# possible anymore.
+# patching some Makefile.ins for adding `$(srcdir)/'. They are
+# regenerated by uic anyway.
-rm src/kbsconfigpage.h
+ -rm src/kbslocationdialog.h
-rm src/kbsprojectdialog.h
+ -rm src/kbsprojectwizardcontent.h
-rm src/kbsproxydialog.h
-rm src/panels/common/client/kbsclientcontent.h
-rm src/panels/common/host/kbshostcontent.h
@@ -39,7 +41,11 @@
docbook2x-man debian/manpages/kboincspy.xml
install/kboincspy::
- install -p -D -m644 debian/lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/kboincspy
+ install -p -D -m644 debian/lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+ find debian/tmp/usr/lib -maxdepth 1 -type f -name *.so -exec cp {} debian/$(cdbs_curpkg)/usr/lib \;
+install/kboincspy-dev::
+ find debian/tmp/usr/lib -maxdepth 1 -type l -name *.so -exec cp -d {} debian/$(cdbs_curpkg)/usr/lib \;
+
clean::
dh_clean kboincspy.1
More information about the pkg-boinc-commits
mailing list