kdenonbeta/akregator/debian

2004-07-14 Thread Pierre Habouzit
CVS commit by habouzit: 

typos


  M +3 -4  changelog   1.22


--- kdenonbeta/akregator/debian/changelog  #1.21:1.22
@@ -4,8 +4,7 @@
   * modified descriptions in control.
   * merged some lines in copyright.
-  * some vqrious fixes to changelog, control files (on Jean-Michel Kelbert
-advices).
-  * add some /usr/share/doc symlinks
-  * cleaning lintian overrides
+  * some various fixes to changelog and control files.
+  * add some /usr/share/doc symlinks.
+  * cleaning lintian overrides.
   * First upload to debian (ITP closes: #251871).
 




kdenonbeta/akregator/debian

2004-07-14 Thread Pierre Habouzit
CVS commit by habouzit: 

lintian things


  Aakregator.lintian   1.1
  M +1 -0  changelog   1.21
  M +5 -1  rules   1.4
  Rsource.lintian-overrides   1.4


--- kdenonbeta/akregator/debian/changelog  #1.20:1.21
@@ -7,4 +7,5 @@
 advices).
   * add some /usr/share/doc symlinks
+  * cleaning lintian overrides
   * First upload to debian (ITP closes: #251871).
 

--- kdenonbeta/akregator/debian/rules  #1.3:1.4
@@ -9,8 +9,12 @@
 DEB_INSTALL_DOCS_ALL :=
 DEB_INSTALL_DOCS_akregator := AUTHORS README NEWS
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
+DEB_INSTALL_CHANGELOGS_akregator := ChangeLog
 
 DEB_INSTALL_MANPAGES_akregator := debian/akregator.1
 
+install/akregator::
+mkdir -p debian/akregator/usr/share/lintian/overrides/
+cp debian/akregator.lintian 
debian/akregator/usr/share/lintian/overrides/akregator
+
 clean::
 rm -f debian/compat




kdenonbeta/akregator/debian

2004-07-14 Thread Pierre Habouzit
CVS commit by habouzit: 

cosmetic


  Aakregator-konq-plugin.links   1.1
  Aakregator-kontact-plugin.links   1.1
  M +1 -0  changelog   1.20
  M +0 -1  source.lintian-overrides   1.4


--- kdenonbeta/akregator/debian/changelog  #1.19:1.20
@@ -6,4 +6,5 @@
   * some vqrious fixes to changelog, control files (on Jean-Michel Kelbert
 advices).
+  * add some /usr/share/doc symlinks
   * First upload to debian (ITP closes: #251871).
 

--- kdenonbeta/akregator/debian/source.lintian-overrides  #1.3:1.4
@@ -1,4 +1,3 @@
 akregator: postinst-has-useless-call-to-ldconfig
 akregator: postrm-has-useless-call-to-ldconfig
-akregator: native-package-with-dash-version
 akregator: menu-item-contains-unknown-tag kderemove /usr/lib/menu/akregator:7




Bug#259471: kdm should depend on kdebase or at least kdebase-bin

2004-07-14 Thread Lars Goldschlager
Package: kdm
Version: 3.2.2-1

kdm requires greeter widgets which are included in kdebase-bin,
kdebase-bin or kdebase are not depends of kdm, they should be.



kdenonbeta/akregator/debian

2004-07-14 Thread Pierre Habouzit
CVS commit by habouzit: 

last touch


  M +2 -0  rules   1.3
  M +1 -0  source.lintian-overrides   1.3


--- kdenonbeta/akregator/debian/rules  #1.2:1.3
@@ -13,2 +13,4 @@
 DEB_INSTALL_MANPAGES_akregator := debian/akregator.1
 
+clean::
+rm -f debian/compat

--- kdenonbeta/akregator/debian/source.lintian-overrides  #1.2:1.3
@@ -2,2 +2,3 @@
 akregator: postrm-has-useless-call-to-ldconfig
 akregator: native-package-with-dash-version
+akregator: menu-item-contains-unknown-tag kderemove /usr/lib/menu/akregator:7




Re: kdm not startking kicker/kwin properly

2004-07-14 Thread A.J. Aranyosi
Solved my own problem.  It seems that the kde packages failed to create
a link to startkde in /etc/X11/Xsession.d, so startkde never got run. 
Creating that link fixed everything.

On Tue, 2004-07-13 at 22:50, A.J. Aranyosi wrote:
> Hi,
> 
> Having a weird kde problem (I'm a Gentoo user myself, but it's my
> girlfriend's machine, and I'm less familiar with Debian).  She's using
> Testing, running KDE 3.2.2; these problems appeared when she upgraded
> from stable to testing.  The symptoms are these (in order, from less
> bizarre to more bizarre):
> 
> 1) Logging in from either kdm or xdm returns to the login screen (Big
> Shock: Some Error Caused X Startup To Fail) - same happens with an
> account created explicitly for testing;
> 
> 2) ~$USER/.xsession-errors is empty;
> 
> 3) /var/log/XFree86.0.0g and /var/log/kdm.log have no useful info about
> the error;
> 
> 4) She has no problem logging in using a failsafe WM;
> 
> 5) After logging in using a failsafe WM, she can run kwin and kicker
> from the command line and get essentially a fully-working KDE system;
> 
> So there doesn't seem to be anything wrong with KDE, but for some reason
> she can't use it to login properly.  It looks like kdm is not starting
> kwin properly for some reason.  Any ideas what might be the problem?
> 



Processed: fixed

2004-07-14 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> package kcontrol
Ignoring bugs not assigned to: kcontrol

> tags 237065 +fixed
Bug#237065: kcontrol crashes when trying to change a file association 
application
Tags were: sid
Tags added: fixed

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



Bug#237062: purges and updates fixed

2004-07-14 Thread Jon Dowland
package konqueror
tags 237067 +fixed
tags 237065 +fixed
tags 237062 +fixed

package kcontrol
tags 244547 +fixed
thanks

Today I purged all kde config files - previously I had only purged my own and
not system-wide config files; and reinstalled konqueror (which pulls in
kcontrol). The above 4 bugs no longer plague me.

Thanks to the kde/debian team(s) - keep up the good work.

-- 
Jonathan Dowland
http://jon.dowland.name/



Processed: purges and updates fixed

2004-07-14 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

> package konqueror
Ignoring bugs not assigned to: konqueror

> tags 237067 +fixed
Bug#237067: konqueror: buttons remain depressed after being clicked
Tags were: unreproducible sid
Tags added: fixed

> tags 237065 +fixed
Bug number 237065 belongs to package kcontrol, skipping.

> tags 237062 +fixed
Bug#237062: konqueror embeds pdf/ps viewers despite my settings to the contrary
Tags were: moreinfo unreproducible
Tags added: fixed

> package kcontrol
Ignoring bugs not assigned to: kcontrol

> tags 244547 +fixed
Bug#244547: kcontrol provides no options for configuration
Tags were: unreproducible sid
Tags added: fixed

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)



Bug#259419: kdelibs4: shortcuts changed and are overloaded

2004-07-14 Thread Patrick Beeson
Package: kdelibs4
Version: 4:3.2.3-2
Severity: normal

The new kdelibs in the testing distro makes kate have different
default shortcuts.  For example, CTRL-S used to save but now it is
mapped to both save and search so a menu pops up for me to choose
which one when I press CTRL-S.  On two machines (one has the problem
and the doesn't), the only difference between kate installations were
the kdelibs versions.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.4.25
Locale: LANG=C, LC_CTYPE=C

Versions of packages kdelibs4 depends on:
ii  kdelibs-bin4:3.2.3-2 KDE core binaries
ii  kdelibs-data   4:3.2.3-2 KDE core shared data
ii  libart-2.0-2   2.3.16-5  Library of functions for 2D graphi
ii  libarts1   1.2.3-1   aRts Sound system
ii  libasound2 1.0.5-1   Advanced Linux Sound Architecture 
ii  libaudio2  1.6d-1The Network Audio System (NAS). (s
ii  libaudiofile0  0.2.6-4   Open-source version of SGI's audio
ii  libbz2-1.0 1.0.2-1   A high-quality block-sorting file 
ii  libc6  2.3.2.ds1-13  GNU C Library: Shared libraries an
ii  libcupsys2-gnu 1.1.20final+cvs20040330-4 Common UNIX Printing System(tm) - 
ii  libesd00.2.29-1  Enlightened Sound Daemon - Shared 
ii  libfam0c1022.7.0-5   client library to control the FAM 
ii  libgcc11:3.3.4-2 GCC support library
ii  libglib2.0-0   2.4.2-1   The GLib library of C routines
ii  libice64.3.0.dfsg.1-4Inter-Client Exchange library
ii  libjpeg62  6b-9  The Independent JPEG Group's JPEG 
ii  libmad00.15.1b-1 MPEG audio decoder library
ii  libogg01.1.0-1   Ogg Bitstream Library
ii  libpcre3   4.5-1.1   Perl 5 Compatible Regular Expressi
ii  libpng12-0 1.2.5.0-6 PNG library - runtime
ii  libqt3c102-mt  3:3.2.3-4 Qt GUI Library (Threaded runtime v
ii  libsm6 4.3.0.dfsg.1-4X Window System Session Management
ii  libstdc++5 1:3.3.4-2 The GNU Standard C++ Library v3
ii  libtiff3g  3.5.7-2   Tag Image File Format library
ii  libvorbis0a1.0.1+gt3b2+20040215-3The Vorbis General Audio Compressi
ii  libvorbisfile3 1.0.1+gt3b2+20040215-3The Vorbis General Audio Compressi
ii  libx11-6   4.3.0.dfsg.1-4X Window System protocol client li
ii  libxext6   4.3.0.dfsg.1-4X Window System miscellaneous exte
ii  libxml22.6.10-3  GNOME XML library
ii  libxrender10.8.3-7   X Rendering Extension client libra
ii  libxslt1.1 1.1.7-1   XSLT processing library - runtime 
ii  libxt6 4.3.0.dfsg.1-4X Toolkit Intrinsics
ii  xbase-clients  4.3.0.dfsg.1-4miscellaneous X clients
ii  xlibs  4.3.0.dfsg.1-4X Window System client libraries m
ii  zlib1g 1:1.2.1.1-3   compression library - runtime

-- no debconf information



kdenonbeta/kdedebian/kapture/libcapture

2004-07-14 Thread Peter Rockai
CVS commit by mornfall: 

Reduce time complexity of agent processing pass significantly. Achieved
by changing the deque that served as an agent queue to std::list (no
idea why it was deque before... no random access operations were done,
unlike many middle-removals) and adding a random-access cache indexed by
package id and agent type (want/unwant). The overall speedup is about
factor 14 (full init of extended state takes < 5 seconds (was > 60),
single package change about 0.15 second... WHEEE!).


  M +25 -9 pkgcache.cpp   1.25
  M +10 -4 pkgcache.h   1.21





Bug#238541: (no subject)

2004-07-14 Thread hiasl
It's a kwin bug! kwin 3.2.3 resolves this.

hiasl



kdenonbeta/kdedebian/kapture

2004-07-14 Thread Peter Rockai
CVS commit by mornfall: 

- add PkgStatusGrouper to upgrade-view
- update TODO.


  M +25 -16TODO   1.48
  M +1 -0  libcapture/groupermanager.cpp   1.6


--- kdenonbeta/kdedebian/kapture/TODO  #1.47:1.48
@@ -167,4 +167,10 @@
   - fix multiple-tabs-for-same-package problem [done]
 
+  KURRENT: THE UPGRADER [done: 40%]
+  Alternative UI for kapture. Shows only one package tree, by default limited
+  to changed|upgradable packages, no detailviews and only 2 buttons: update &
+  upgrade. It is mostly working, but needs more testing and fixing some
+  shortcomings.
+
   BETTER FEEDBACK SYSTEM [done: 0%]
   Improve the current progress and status feedback system to a point where it
@@ -201,5 +207,5 @@
   just provides registry of the capabilities of individual filters.
 
-  FILTER PARAMETER SETTINGS UI [done: 0%]
+  FILTER PARAMETER SETTINGS UI [done: 20%]
   In libkapture, make it possible to register a widget for a filter, which
   would allow to set up it's parameters. It should be available via button in
@@ -210,19 +216,4 @@
   and produces argmap to feed into the grouper.
 
-  HUMAN WRITEABLE/PARSEABLE GROUPERCHAIN EXTERNAL REP [done: 0%]
-  Write parser and serializer for GrouperChain, so that external
-  representation would be easy to read & write (for human). Make it fit into
-  apt tagfile. Proposed format:
-  --%--
-  grouper PkgNameFilter (string="sth");
-  chain "subchain-1" {
-grouper PkgDescrFilter (string="blaha");
-grouper PkgTagFilter (string="admin && ui::qt");
-  };
-  grouper PkgNameFilter (string="sthElse");
-  --%--
-  This would be whitespace independent and quite well-parseable. Can be
-  stuffed into a tagfile using one-space indent (like in description).
-
 ::: 0.5 (prealfa) :::
 
@@ -242,4 +233,19 @@
   kcontrol icon mode.
   
+  HUMAN WRITEABLE/PARSEABLE GROUPERCHAIN EXTERNAL REP [done: 0%]
+  Write parser and serializer for GrouperChain, so that external
+  representation would be easy to read & write (for human). Make it fit into
+  apt tagfile. Proposed format:
+  --%--
+  grouper PkgNameFilter (string="sth");
+  chain "subchain-1" {
+grouper PkgDescrFilter (string="blaha");
+grouper PkgTagFilter (string="admin && ui::qt");
+  };
+  grouper PkgNameFilter (string="sthElse");
+  --%--
+  This would be whitespace independent and quite well-parseable. Can be
+  stuffed into a tagfile using one-space indent (like in description).
+
 ::: 0.6 (prealfa) :::
 
@@ -293,4 +299,7 @@
   else). However, dist-upgrade needs a change in behaviour to respect user
   preferences.
+It should be enough to rerun the priority engine on the new cache
+  contents (by touching all installed packages), marking all wanted packages
+  for install in the result.
 
 ::: 0.7 (prealfa) :::

--- kdenonbeta/kdedebian/kapture/libcapture/groupermanager.cpp  #1.5:1.6
@@ -92,4 +92,5 @@ void GrouperManager::setupDefault (void)
 c -> addFactory ("PkgExistFilter", "exist");
 c -> addFactory ("FilterOrGroup", "upgrade-or-change", uoc);
+c -> addFactory ("PkgStatusGrouper", "status");
 c -> addFactory ("SectGrouper", "section");
 c -> addFactory ("EndGrouper", "end");




Bug#259369: XIM support broken in QT-apps

2004-07-14 Thread Arne Götje (高盛華)
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Package: kde
Version: 3.2.3 / 3.2.2

I'm using unstable. Since the latest KDE related upgrades to 3.2.3 
yesterday where applicable, XIM support does not work anymore in any 
QT-based application when used together wih xmodmap. Before the upgrade 
that had worked.

Other applications (GTK, X) are not affected.

When xmodmap is not used, XIM support works in QT apps.
Xmodmap has become necessary in my case because of bug #235684.
Without xmodmap some keys (not necessarily the 'b' key, but 'e' or 
'n'...) don't work anymore in KDE and any application started from 
there. (Note: I don't have a sparc, but normal x86 architechture).

I'm not sure which package is responsible for this bug, so I file it to 
the metapackage. :)

- -- 
Arne Götje (高盛華) <[EMAIL PROTECTED]> 
(Spam catcher.  Address might change in future!)
PGP/GnuPG key: 1024D/685D1E8C
Fingerprint: 2056 F6B7 DEA8 B478 311F  1C34 6E9F D06E 685D 1E8C
Key available at wwwkeys.pgp.net.   Encrypted e-mail preferred.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFA9PR5bp/QbmhdHowRAij8AJ4mBjOGTTg18p5DJp4gz3F/o98OMQCg1AEd
lkLxG9lfd74sV1XTjORIzgA=
=4U6f
-END PGP SIGNATURE-



Bug#259333: marked as done (bad dependencies, kde depends on kdegames and kde-amusements)

2004-07-14 Thread Debian Bug Tracking System
Your message dated Wed, 14 Jul 2004 08:46:48 +0200
with message-id <[EMAIL PROTECTED]>
and subject line Bug#259333: bad dependencies, kde depends on kdegames and 
kde-amusements
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--
Received: (at submit) by bugs.debian.org; 14 Jul 2004 04:37:05 +
>From [EMAIL PROTECTED] Tue Jul 13 21:37:05 2004
Return-path: <[EMAIL PROTECTED]>
Received: from faire.strategicdata.com.au (mail.strategicdata.com.au) 
[202.44.177.161] 
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BkbVx-0001sx-00; Tue, 13 Jul 2004 21:37:05 -0700
Received: from rack002.mel.strategicdata.com.au (localhost [127.0.0.1])
by delivermail.mel.strategicdata.com.au (Postfix) with ESMTP id 
27731EC028
for <[EMAIL PROTECTED]>; Wed, 14 Jul 2004 14:37:03 +1000 (EST)
Received: from localhost ([127.0.0.1])
by rack002.mel.strategicdata.com.au (MailMonitor for SMTP v1.2.1 ) ;
Wed, 14 Jul 2004 14:37:03 +1000 (EST)
Received: by mail.strategicdata.com.au (Postfix, from userid 1030)
id AB5B9EC028; Wed, 14 Jul 2004 14:37:02 +1000 (EST)
Date: Wed, 14 Jul 2004 14:37:02 +1000
To: [EMAIL PROTECTED]
Subject: bad dependencies, kde depends on kdegames and kde-amusements
Message-ID: <[EMAIL PROTECTED]>
Mail-Followup-To: [EMAIL PROTECTED]
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.6i
From: [EMAIL PROTECTED] (Jens Porup)
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 


Package: kdegames
Version: 4:3.2.3-1

kde mistakenly depends on kdegames and kde-amusements.

I want to cut games out of my desktops, and this makes it impossible:

[EMAIL PROTECTED]:~# apt-get remove kdegames
Reading Package Lists... Done
Building Dependency Tree... Done
The following packages will be REMOVED:
kde kde-amusements kdegames
0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded.
Need to get 0B of archives.
After unpacking 81.9kB disk space will be freed.
Do you want to continue? [Y/n]



---
Received: (at 259333-done) by bugs.debian.org; 14 Jul 2004 06:46:56 +
>From [EMAIL PROTECTED] Tue Jul 13 23:46:56 2004
Return-path: <[EMAIL PROTECTED]>
Received: from apate.telenet-ops.be [195.130.132.57] 
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BkdXc-0004IO-00; Tue, 13 Jul 2004 23:46:56 -0700
Received: from localhost (localhost.localdomain [127.0.0.1])
by apate.telenet-ops.be (Postfix) with SMTP
id 7A2282B402B; Wed, 14 Jul 2004 08:46:53 +0200 (MEST)
Received: from appel (D5768DE4.kabel.telenet.be [213.118.141.228])
by apate.telenet-ops.be (Postfix) with ESMTP
id 473F22B4021; Wed, 14 Jul 2004 08:46:53 +0200 (MEST)
Received: from domi by appel with local (Exim 3.36 #1 (Debian))
id 1BkdXV-kq-00; Wed, 14 Jul 2004 08:46:49 +0200
To: [EMAIL PROTECTED] (Jens Porup)
Cc: [EMAIL PROTECTED]
Subject: Re: Bug#259333: bad dependencies, kde depends on kdegames and
 kde-amusements
References: <[EMAIL PROTECTED]>
From: Dominique Devriese <[EMAIL PROTECTED]>
Date: Wed, 14 Jul 2004 08:46:48 +0200
In-Reply-To: <[EMAIL PROTECTED]> (Jens Porup's
 message of "Wed, 14 Jul 2004 14:37:02 +1000")
Message-ID: <[EMAIL PROTECTED]>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) XEmacs/21.4 (Security Through
 Obscurity, linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: Dominique Devriese <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Jens Porup writes:

> Package: kdegames Version: 4:3.2.3-1

> kde mistakenly depends on kdegames and kde-amusements.

Hi,

The kde package is a metapackage which depends on all packages that
are part of the official KDE release.  Kdegames and kde-amusements are
such packages.  If you do not want the entire KDE release, there is no
reason why you should keep the kde metapackage installed.  You can
instead use kde-

kdenonbeta/kdedebian/kapture

2004-07-14 Thread Peter Rockai
CVS commit by mornfall: 

Use problem resolver for keep operation, should avoid broken packages on
partial upgrade. Few fixes to upgrade-tree, so it actually works as
expected. Fix PkgStatusFilter to report only installed packages in
'upgradable' mode. TODO ++.


  M +5 -0  TODO   1.47
  M +22 -7 libcapture/filters.cpp   1.22
  M +1 -0  libcapture/filters.h   1.22
  M +1 -1  libcapture/groupermanager.cpp   1.5
  M +4 -0  libcapture/pkgmanager.cpp   1.35


--- kdenonbeta/kdedebian/kapture/TODO  #1.46:1.47
@@ -176,4 +176,9 @@
   their stuff into the embedded konsole.
 
+  MAKE CHANGES MORE ROBUST [done: 15%]
+  - make use of apt-pkg's problem resolver
+  - check for various error conditions
+  - add broken-fixing (-f) mode
+
   PROGRESS/DPKG EMBEDDED INTO KAPTURE WINDOW [done: 40%]
   Embed acqprogress, dpkg and stuff into main kapture window and create

--- kdenonbeta/kdedebian/kapture/libcapture/filters.cpp  #1.21:1.22
@@ -203,4 +203,5 @@ GROUPER_CONSTR_B (PkgStatusFilter, Filte
 {
 string s = ParamStr::value (Param::get (a, "string"));
+cerr << "PkgStatusFilter (" << s << ");" << endl;
 if (s == "inst" || s == "install")
 m_status = PkgCache::PkgInstall;
@@ -221,8 +222,13 @@ bool PkgStatusFilter::filterCondition (T
 PkgCElemPtr e = pkgCElem (**n);
 if (! e) return false;
-if (m_string == "upgradable")
-return (PkgManager::cache() -> GetCandidateVer (*e))
-!= *(e -> CurrentVer ());
 int s = PkgManager::cache () -> packageState (*e);
+if (m_string == "upgradable") {
+bool r = s == PkgCache::PkgKeepI &&
+(PkgManager::cache() -> GetCandidateVer (*e))
+!= *(e -> CurrentVer ());
+if (r)
+std::cerr << "upgradable: " << e -> Name () << std::endl;
+return r;
+}
 return s == m_status;
 }
@@ -242,9 +248,11 @@ GROUPER_CONSTR_B (FilterOrGroup, FilterG
 _a << std::endl;
 string t = ParamStr::value (Param::get (a, _t));
-std::cerr << "type: " << t << std::endl;
+Param::Map submap = ParamT::value (Param::get (a, _a),
+Param::Map ());
+std::cerr << "type: " << t << ", submap: " << Param::mapToString
+(submap) << std::endl;
 m_vec . push_back (
-dynamic_cast  (GrouperFactory (t,
-ParamT::value (Param::get (a, _a),
-Param::Map ())) . instantiate ()));
+dynamic_cast  (GrouperFactory (t, submap)
+. instantiate ()));
 }
 }
@@ -259,2 +267,9 @@ bool FilterOrGroup::filterCondition (Tre
 }
 /* }}} */
+bool FilterOrGroup::affected (long f)
+{
+bool a = 0;
+for (t_FiltVec::iterator i = m_vec . begin (); i != m_vec . end (); i ++)
+a |= (* i) -> affected (f);
+return a;
+}

--- kdenonbeta/kdedebian/kapture/libcapture/filters.h  #1.21:1.22
@@ -62,4 +62,5 @@ namespace capture {
 FILT_CLASS (FilterOrGroup, "OR Group");
 FILT_FLAGS (IsSystem);
+bool affected (long c);
 };
 /* }}} */

--- kdenonbeta/kdedebian/kapture/libcapture/groupermanager.cpp  #1.4:1.5
@@ -86,5 +86,5 @@ void GrouperManager::setupDefault (void)
 Param::Map upgr;
 Param::set (upgr, "string", ParamStr::create ("upgradable"));
-Param::set (uoc, "change-a", ParamT::create (upgr));
+Param::set (uoc, "upgrade-a", ParamT::create (upgr));
 
 c = new GrouperChain ("upgrade-tree");

--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp  #1.34:1.35
@@ -352,6 +352,10 @@ bool PkgManager::_install (pkgCache::Pkg
 bool PkgManager::_keep (pkgCache::PkgIterator i)
 {
+pkgProblemResolver fix (cache ());
+/* fix . Clear (i);
+fix . Protect (i); */
 cache () -> MarkKeep (i, true);
 m_changes |= InstallChange;
+fix . ResolveByKeep ();
 _notifyRefresh ();
 return true;