diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdeartwork-3.3.2/admin/cvs.sh marlin_build_kdeartwork-3.3.2/admin/cvs.sh --- kdeartwork-3.3.2/admin/cvs.sh 2004-11-28 17:50:27.000000000 +0100 +++ marlin_build_kdeartwork-3.3.2/admin/cvs.sh 2005-01-28 02:36:28.000000000 +0100 @@ -348,11 +348,11 @@ if test -f inst-apps; then inst=`cat inst-apps` list="" for i in $inst; do - list="$list `find $i/ -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \ + list="$list `find $i/ ! -path "*/{arch}/*" -a ! -path "*/,,*" -a \( -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" \) | \ sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`" done else - list=`find . -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \ + list=`find . ! -path "*/{arch}/*" -a ! -path "*/,,*" -a \( -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" \) | \ sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"` fi for i in $list; do if test -f $i && test `dirname $i` != "." ; then diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdeartwork-3.3.2/debian/changelog marlin_build_kdeartwork-3.3.2/debian/changelog --- kdeartwork-3.3.2/debian/changelog 2004-11-28 17:50:28.000000000 +0100 +++ marlin_build_kdeartwork-3.3.2/debian/changelog 2005-01-28 02:38:23.000000000 +0100 @@ -1,5 +1,99 @@ -kdeartwork (4:3.3.1-1) unstable; urgency=medium +kdeartwork (4:3.3.2-0.1.0.50.linspire0.1) marlin; urgency=low + + * Autobuilder version increment (Reason(s): Source changes, Packaging changes, + Build dependency changes, changed: kdebase-dev (4:3.3.2-0.0los.0.50.lin- + spire0.1 => 4:3.3.2-0.1los.0.50.linspire0.7), changed: kdelibs4-dev + (4:3.3.2-0.0los.0.50.linspire0.1 => 4:3.3.2-0.0los.0.50.linspire0.7), + changed: kwin (4:3.3.2-0.0los.0.50.linspire0.1 => 4:3.3.2-0.1los.0.50.lin- + spire0.7), changed: xlibmesa-gl-dev (4.3.xorg.6.7.0-3.0.0.50.linspire0.6 => + 6.8.1-0.4.0.50.linspire0.3), changed: xlibmesa-glu-dev (4.3.x- + org.6.7.0-3.0.0.50.linspire0.6 => 6.8.1-0.4.0.50.linspire0.3), Developer + recommended version: 4:3.3.2-0.1). + * Jeremy Shaw : 2005/01/27 17:17:29 PST + + files: 1 modified + + hacked version number due to autobuilder failure (tos@lindows.- + com--2004/kdeartwork--build-marlin--3.3.2--patch-7): + * Jeremy Shaw : 2005/01/27 15:58:06 PST + + files: 1 modified + + kscreensaver: fix kswarm and other non opengl screensavers (tos@lindows.- + com--2004/kdeartwork--build-marlin--3.3.2--patch-6): + - Patches applied: + + * tos@lindows.com--2004/kdeartwork--kscreensavers-- + fix-non-gl--3.3.2--base-0 + tag of tos@lindows.com--2004/kdeartwork--upstream--3.3.2--patch-1 + + * tos@lindows.com--2004/kdeartwork--kscreensavers-- + fix-non-gl--3.3.2--patch-1 + kscreensavers: fix broken non-opengl screensavers + + -- Autobuilder Thu, 27 Jan 2005 17:38:22 -0800 + +kdeartwork (4:3.3.2-0.1) unstable; urgency=low + + * Horrible hack due to nasty failure of autobuilder. + + -- Jeremy Shaw Thu, 27 Jan 2005 17:16:39 -0800 + +kdeartwork (4:3.3.2-0.0.0.50.linspire0.1) marlin; urgency=low + + * Autobuilder version increment (Reason(s): Initial build by autobuilder). + + -- Autobuilder Tue, 14 Dec 2004 11:05:30 -0800 + +kdeartwork (4:3.3.2-0) unstable; urgency=low + + * New upstream release. + + -- Sean Meiners Wed, 8 Dec 2004 18:35:35 -0800 + +kdeartwork (4:3.3.1-1.0.0.50.linspire0.2) marlin; urgency=medium + + * Autobuilder version increment (Reason(s): Source changes, Build dependency + changes, changed: debhelper (4.2.23 => 4.2.24), changed: kdebase-dev + (4:3.3.1-1.0.0.50.linspire0.1 => 4:3.3.1-2.0.0.50.linspire0.7), changed: + kdelibs4-dev (4:3.3.1-1.0.0.50.linspire0.1 => 4:3.3.1-1.0.0.50.linspire0.2), + changed: kwin (4:3.3.1-1.0.0.50.linspire0.1 => 4:3.3.1-2.0.0.50.lin- + spire0.7)). + * Sean Meiners : 2004/12/02 16:23:51 PST + + files: 1 modified + + merged andrunko branch (tos@lindows.com--2004/kdeartwork--build-mar- + lin--3.3.1--patch-7): + - Patches applied: + * tos@lindows.com--2004/kdeartwork--andrunko--3.3.1--base-0 + tag of tos@lindows.com--2004/kdeartwork--upstream--3.3.1--patch-1 + + * tos@lindows.com--2004/kdeartwork--andrunko--3.3.1--patch-1 + imported andrunko's Qt/KDE eye candy patch + + -- Autobuilder Fri, 3 Dec 2004 11:18:07 -0800 + +kdeartwork (4:3.3.1-1.0.0.50.linspire0.1) marlin; urgency=medium + + * Autobuilder version increment (Reason(s): Packaging changes, Build dependen- + cy changes, new: automake1.7 (1.7.9-6), changed: debhelper (4.2.21 => + 4.2.23), changed: kdebase-dev (4:3.3.1-0.0.0.50.linspire0.1 => + 4:3.3.1-1.0.0.50.linspire0.1), changed: kdelibs4-dev (4:3.3.1-0.0.0.50.lin- + spire0.1 => 4:3.3.1-1.0.0.50.linspire0.1), changed: kwin + (4:3.3.1-0.0.0.50.linspire0.1 => 4:3.3.1-1.0.0.50.linspire0.1), removed: au- + tomake1.9 (1.9.2-1), Developer recommended version: 4:3.3.1-1). + * Sean Meiners : 2004/11/05 12:04:44 PST + + files: 20 new,9 modified,12 removed + + merged new debian branch (tos@lindows.com--2004/kdeartwork--build-mar- + lin--3.3.1--patch-5): + - Patches applied: + + * tos@lindows.com--2004/kdeartwork--debian--3.3.1--base-0 + tag of tos@lindows.com--2004/kdeartwork--debian--3.3.0--patch-3 + + * tos@lindows.com--2004/kdeartwork--debian--3.3.1--patch-1 + Imported debian + + -- Autobuilder Fri, 5 Nov 2004 12:42:25 -0800 + +kdeartwork (4:3.3.1-1) unstable; urgency=medium + * New upstream bugfix release. * Added kdeclassic/locolor icon license to debian/copyright, which has been clarified upstream. @@ -12,6 +106,18 @@ kdeartwork (4:3.3.1-1) unstable; urgency (closes: #267974). -- Ben Burton Sun, 31 Oct 2004 15:17:56 +1100 + +kdeartwork (4:3.3.1-0.0.0.50.linspire0.1) marlin; urgency=low + + * Autobuilder version increment (Reason(s): Initial build by autobuilder). + + -- Autobuilder Thu, 14 Oct 2004 15:24:55 -0700 + +kdeartwork (4:3.3.1-0) unstable; urgency=low + + * New upstream release. + + -- Sean Meiners Thu, 14 Oct 2004 12:40:43 -0700 kdeartwork (4:3.3.0-1) unstable; urgency=low @@ -22,7 +128,7 @@ kdeartwork (4:3.3.0-1) unstable; urgency along with kxsconfig and kxsrun (closes: #208769, #244538). Two years of confusion is enough. * Build-depends on both xscreensaver and xscreensaver-gl, which are - required for the corresponding .desktop files to be installed. + required for the corresponding .desktop files to be installed. * Removed depths_xxx.jpg from the kworldclock themes since the license is too restrictive (all rights reserved). * Removed Virtual Machine screensaver since GPL cannot be mixed with BSD @@ -30,6 +136,39 @@ kdeartwork (4:3.3.0-1) unstable; urgency -- Ben Burton Thu, 14 Oct 2004 08:30:34 +1000 +kdeartwork (4:3.3.0-0.0.0.50.lindows0.1) marlin; urgency=low + + * Autobuilder version increment (Reason(s): Packaging changes, Build + dependency changes, changed: debhelper (4.2.19 => 4.2.20), Developer + recommended version: 4:3.3.0). + * [Sean Meiners (tos@lindows.com--2004/kdeartwork--build-marlin--3.3.0--patch- + 5): 2004/08/26 17:07:08 PDT] merged version-fix from debian branch (files: + 1 modified) + + -- Autobuilder Thu, 26 Aug 2004 17:28:18 -0700 + +kdeartwork (4:3.3.0-0) experimental; urgency=low + + * New upstream release + + -- Sean Meiners Thu, 26 Aug 2004 17:05:33 -0700 + +kdeartwork (4:3.2.92-1.0.0.50.lindows0.1) marlin; urgency=low + + * Autobuilder version increment (Reason(s): Initial build by autobuilder). + + -- Autobuilder Wed, 25 Aug 2004 13:28:48 -0700 + +kdeartwork (4:3.2.92-1) experimental; urgency=low + + * New upstream release. + * Versioned libqt3-mt-dev build-depends is no longer necessary since + kdelibs4-dev already forces Qt 3.3. + * Build-depends on both xscreensaver and xscreensaver-gl, which are + required for the corresponding .desktop files to be installed. + + -- Ben Burton Sun, 1 Aug 2004 18:41:10 +1000 + kdeartwork (4:3.2.3-1) unstable; urgency=low * New upstream bugfix release. diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdeartwork-3.3.2/kscreensaver/xsavers/main.cpp marlin_build_kdeartwork-3.3.2/kscreensaver/xsavers/main.cpp --- kdeartwork-3.3.2/kscreensaver/xsavers/main.cpp 2004-06-22 19:14:00.000000000 +0200 +++ marlin_build_kdeartwork-3.3.2/kscreensaver/xsavers/main.cpp 2005-01-28 02:36:38.000000000 +0100 @@ -23,6 +23,7 @@ #include "demowin.h" #include "saver.h" +#include static const char appName[] = "klock"; static const char description[] = I18N_NOOP("KDE Screen Lock/Saver"); @@ -75,7 +76,7 @@ int main(int argc, char *argv[]) if (args->isSet("root")) { - saveWin = QApplication::desktop()->handle(); + saveWin = RootWindow(qt_xdisplay(), qt_xscreen()); } if (args->isSet("demo")) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdeartwork-3.3.2/styles/plastik/plastik.cpp marlin_build_kdeartwork-3.3.2/styles/plastik/plastik.cpp --- kdeartwork-3.3.2/styles/plastik/plastik.cpp 2004-11-29 09:28:46.000000000 +0100 +++ marlin_build_kdeartwork-3.3.2/styles/plastik/plastik.cpp 2005-01-28 02:36:26.000000000 +0100 @@ -1409,78 +1409,12 @@ void PlastikStyle::drawKStylePrimitive(K break; } - // copied and slightly modified from KStyle. case KPE_ListViewBranch: { - // Typical Windows style listview branch element (dotted line). - - // Create the dotline pixmaps if not already created - if ( !verticalLine ) - { - // make 128*1 and 1*128 bitmaps that can be used for - // drawing the right sort of lines. - verticalLine = new QBitmap( 1, 129, true ); - horizontalLine = new QBitmap( 128, 1, true ); - QPointArray a( 64 ); - QPainter p2; - p2.begin( verticalLine ); - - int i; - for( i=0; i < 64; i++ ) - a.setPoint( i, 0, i*2+1 ); - p2.setPen( color1 ); - p2.drawPoints( a ); - p2.end(); - QApplication::flushX(); - verticalLine->setMask( *verticalLine ); - - p2.begin( horizontalLine ); - for( i=0; i < 64; i++ ) - a.setPoint( i, i*2+1, 0 ); - p2.setPen( color1 ); - p2.drawPoints( a ); - p2.end(); - QApplication::flushX(); - horizontalLine->setMask( *horizontalLine ); - } - p->setPen( cg.mid() ); - - if (flags & Style_Horizontal) - { - int point = r.x(); - int other = r.y(); - int end = r.x()+r.width(); - int thickness = r.height(); - - while( point < end ) - { - int i = 128; - if ( i+point > end ) - i = end-point; - p->drawPixmap( point, other, *horizontalLine, 0, 0, i, thickness ); - point += i; - } - - } else { - int point = r.y(); - int other = r.x(); - int end = r.y()+r.height(); - int thickness = r.width(); - int pixmapoffset = (flags & Style_NoChange) ? 0 : 1; // ### Hackish - - while( point < end ) - { - int i = 128; - if ( i+point > end ) - i = end-point; - p->drawPixmap( other, point, *verticalLine, 0, pixmapoffset, thickness, i ); - point += i; - } - } - + p->drawLine( r.topLeft(), r.bottomRight() ); break; } - + default: KStyle::drawKStylePrimitive(kpe, p, widget, r, cg, flags, opt); }