kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
Some work on dpkg progress reporting. Not very good yet. Mumble.
M +0 -1 libcapture/dpkgpm.cpp 1.3
M +22 -7 libkapture/dpkgpm.cpp 1.4
M +1 -1 libkapture/kapturemanager.cpp 1.25
M +2 -3 libkapture/kapturemanager.h 1.12
--- kdenonbeta/kdedebian/kapture/libcapture/dpkgpm.cpp #1.2:1.3
@@ -70,5 +70,4 @@ bool DPkgPM::Go ()
if (! RunScripts (DPkg::Post-Invoke))
return false;
-return true;
}
return true;
--- kdenonbeta/kdedebian/kapture/libkapture/dpkgpm.cpp #1.3:1.4
@@ -48,5 +48,5 @@ bool kapture::DPkgPM::Go ()
m_prog - show ();
bool ret = capture::DPkgPM::Go ();
-delete m_prog;
+m_prog - enableButton (KDialogBase::Ok, true);
m_prog = 0;
return ret;
@@ -56,24 +56,39 @@ void kapture::DPkgPM::dpkgMonitor ()
{
kapp - processEvents ();
-char buf [501];
+char buf [1026];
int rv;
-rv = read (m_statusfd, buf, 500);
+rv = read (m_statusfd, buf, 1024);
if (rv == -1)
return;
std::cerr kapture::DPkgPM::dpkgMonitor () std::endl;
-buf [500] = 0;
+buf [1024] = 0;
buf [rv] = 0;
-m_prog - addMsg (buf);
+char *lp = buf;
+char *p = buf;
+bool c = true;
+while (c) {
+p ++;
+if (*p == 0) c = false;
+if (*p == '\n' || *p == 0) {
+*p = 0;
+m_prog - addMsg (lp);
+lp = p + 1;
+}
+}
}
DPkgProg::DPkgProg (QWidget *parent, const char * name)
-: KDialogBase (parent, name)
+: KDialogBase (parent, name, true, DPkg progress, Ok|Cancel, Cancel)
{
setModal (true);
m_l = new KListBox (this);
+m_l - setMinimumSize (QSize (500, 400));
setMainWidget (m_l);
+enableButton (Cancel, false);
+enableButton (Ok, false);
}
void DPkgProg::addMsg (std::string m)
{
+if (m != )
m_l - insertItem (m . c_str ());
}
--- kdenonbeta/kdedebian/kapture/libkapture/kapturemanager.cpp #1.24:1.25
@@ -21,5 +21,5 @@ KaptureManager *KaptureManager::s_inst =
/* {{{ */
-KaptureManager::KaptureManager ()
+KaptureManager::KaptureManager (int)
{
std::cerr KaptureManager::KaptureManager () std::endl;
--- kdenonbeta/kdedebian/kapture/libkapture/kapturemanager.h #1.11:1.12
@@ -42,5 +42,5 @@ namespace kapture {
return s_inst;
else
-return s_inst = new KaptureManager;
+return s_inst = new KaptureManager (0);
}
enum NotifyLevel { NNone, NError, NWarning, NInfo };
@@ -72,4 +72,5 @@ namespace kapture {
void setForwardEnabled (bool);
protected:
+KaptureManager (int);
static KaptureManager *s_inst;
QWidget *m_top; // as parent for dialogs
@@ -81,6 +82,4 @@ namespace kapture {
kapture::PkgSystem *m_pkgSystem;
// XXX config (kapture::Config *m_cfg;)
-private:
-KaptureManager ();
};
kdenonbeta/kdedebian/kapture/konsole [POSSIBLY UNSAFE]
CVS commit by mornfall: Importing private copy of konsolepart, so we can actually do something useful with it. A.cvsignore 1.1 ABlockArray.cpp 1.1 [no copyright] ABlockArray.h 1.1 [no copyright] AMakefile.am 1.1 ATECommon.h 1.1 [UNKNOWN] ATEHistory.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] ATEHistory.h 1.1 [UNKNOWN] ATEPty.cpp 1.1 [UNKNOWN] ATEPty.h 1.1 [UNKNOWN] ATEScreen.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] ATEScreen.h 1.1 [UNKNOWN] ATEWidget.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] ATEWidget.h 1.1 [UNKNOWN] ATEmuVt102.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] ATEmuVt102.h 1.1 [UNKNOWN] ATEmulation.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] ATEmulation.h 1.1 [UNKNOWN] Adefault.keytab.h 1.1 [no copyright GENERATED FILE] Akeytrans.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] Akeytrans.h 1.1 [UNKNOWN] Akonsole.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] Akonsole.h 1.1 [UNKNOWN] Akonsole_child.cpp 1.1 [GPL (v2+)] Akonsole_child.h 1.1 [GPL (v2+)] Akonsole_part.cpp 1.1 [POSSIBLY UNSAFE: system] [LGPL (v2+)] Akonsole_part.h 1.1 [POSSIBLY UNSAFE: system] [LGPL (v2+)] Akonsole_wcwidth.cpp 1.1 [no copyright] Akonsole_wcwidth.h 1.1 [no copyright] Akonsolebookmarkhandler.cpp 1.1 [no copyright] Akonsolebookmarkhandler.h 1.1 [no copyright] Akonsolebookmarkmenu.cpp 1.1 [no copyright] Akonsolebookmarkmenu.h 1.1 [no copyright] Akonsoleiface.h 1.1 [no copyright] Akwrited.cpp 1.1 [no copyright] Akwrited.h 1.1 [no copyright] Amain.cpp 1.1 [POSSIBLY UNSAFE: printf] [UNKNOWN] Aprintsettings.cpp 1.1 [LGPL] Aprintsettings.h 1.1 [LGPL] Aschema.cpp 1.1 [POSSIBLY UNSAFE: scanf] [GPL (v2+)] Aschema.h 1.1 [GPL (v2+)] Asession.cpp 1.1 [POSSIBLY UNSAFE: printf] [no copyright] Asession.h 1.1 [UNKNOWN] Asessioniface.h 1.1 [no copyright] Azmodem_dialog.cpp 1.1 [LGPL] Azmodem_dialog.h 1.1 [LGPL]
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall:
Fix the update w/o debtags crash. Hopefully.
M +4 -0 pkgtags.cpp 1.6
--- kdenonbeta/kdedebian/kapture/libcapture/pkgtags.cpp #1.5:1.6
@@ -268,4 +268,8 @@ int capture::pkgTagsUpdate (pkgAcquireSt
// Updates the package tag database (requires root)
{
+if (access (fn_dist_vocab, R_OK))
+return 1;
+mkdir ((_config-FindDir(Dir::State::lists) + tags/) . c_str (), 0755);
+
/// Update the system vocabulary
cerr Merging system vocabularies...\n;
kdeextragear-1/amarok/debian
CVS commit by mornfall:
Debian packages for 1.0 release:
- split engines from amarok, depend on at least one engine
- note that xmms is not supported, but solution is seeked
Aamarok-arts.install 1.1
Aamarok-gstreamer.install 1.1
M +8 -1 amarok.install 1.2
M +18 -0 changelog 1.2
M +21 -1 control 1.2
--- kdeextragear-1/amarok/debian/amarok.install #1.1:1.2
@@ -1 +1,8 @@
-debian/tmp/*
+debian/tmp/usr/share/apps/amarok/*
+debian/tmp/usr/share/icons/*
+debian/tmp/usr/share/config.kcfg/amarok.kcfg
+debian/tmp/usr/share/servicetypes/amarok_plugin.desktop
+debian/tmp/usr/share/applications/kde/amarok.desktop
+debian/tmp/usr/share/doc/*
+debian/tmp/usr/bin/*
+debian/tmp/etc/*
--- kdeextragear-1/amarok/debian/changelog #1.1:1.2
@@ -1,2 +1,20 @@
+amarok (1.0.0-1) unstable; urgency=low
+
+ * Build official 1.0.0 release.
+
+ -- Peter Rockai (mornfall) [EMAIL PROTECTED] Wed, 16 Jun 2004 23:48:52
+0200
+
+amarok (1.0-pre1-2) unstable; urgency=low
+
+ * Fix amarok-arts package, was missing mcop files. Duh.
+
+ -- Peter Rockai (mornfall) [EMAIL PROTECTED] Wed, 16 Jun 2004 23:25:29
+0200
+
+amarok (1.0-pre1-1) unstable; urgency=low
+
+ * First 1.0.0 prerelease.
+
+ -- Peter Rockai (mornfall) [EMAIL PROTECTED] Wed, 16 Jun 2004 10:18:31
+0200
+
amarok (1.0-beta4-2) unstable; urgency=low
--- kdeextragear-1/amarok/debian/control #1.1:1.2
@@ -4,4 +4,5 @@
Maintainer: Peter Rockai (mornfall) [EMAIL PROTECTED]
Build-Depends: cdbs (= 0.4.21), debhelper ( 4.0.18), kdelibs4-dev (=
4:3.2), kdemultimedia-dev (= 4:3.2), libtag1-dev (= 1.1),
libgstreamer0.8-dev, libgstreamer-plugins0.8-dev
+Build-Conflicts: xmms-dev
Standards-Version: 3.5.8.0
@@ -9,5 +10,5 @@
Section: sound
Architecture: any
-Depends: arts (= 1.2), ${shlibs:Depends}
+Depends: amarok-arts | amarok-gstreamer, ${shlibs:Depends}
Description: versatile and easy to use audio player for KDE
amaroK tries to be a little different, providing a simple drag and drop
@@ -24,2 +25,21 @@
This version is built with aRts and GStreamer support, NMM engine is not
yet included.
+ .
+ The xmms visualisation support was disabled in this release. We are working
+ on a solution though.
+
+Package: amarok-arts
+Section: sound
+Architecture: any
+Depends: arts (= 1.2), ${shlibs:Depends}
+Description: arts engine for amarok audio player
+ Arts support for amaroK, a versatile and easy to use audio player for KDE.
+ See package amarok for the actual player.
+
+Package: amarok-gstreamer
+Section: sound
+Architecture: any
+Depends: gstreamer0.8-plugins, ${shlibs:Depends}
+Description: gstreamer engine for amarok audio player
+ GStreamer support for amaroK, a versatile and easy to use audio player for
+ KDE. See package amarok for the actual player.
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Start work towards very basic dpkg progress interface. No worky ATM. Also cleanup KaptureManager pointers, it's singleton now. Plus few random changes. M +1 -1 TODO 1.33 M +2 -1 kapture/kapture.cpp 1.25 M +0 -1 kapture/kapture.h 1.11 M +0 -1 libcapture/pkgmanager.cpp 1.27 M +1 -1 libcapture/pkgmanager.h 1.19 M +1 -0 libcapture/pkgsystem.cpp 1.2 M +0 -1 libkapture/celemview.h 1.3 M +3 -4 libkapture/commitstatus.cpp 1.2 M +1 -3 libkapture/commitstatus.h 1.2 M +29 -1 libkapture/dpkgpm.cpp 1.3 M +13 -0 libkapture/dpkgpm.h 1.3 M +4 -2 libkapture/kapturemanager.cpp 1.24 M +6 -4 libkapture/kapturemanager.h 1.11 M +0 -1 libkapture/listtreeview.h 1.3 M +0 -1 libkapture/pkgcelemview.h 1.5 M +0 -1 libkapture/summaryview.h 1.3 M +0 -1 libkapture/treeview.h 1.7
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - get CElemPtr stuff into shape; mostly (still crashy with delete on deref on... some ref is slipping me, damnit) - template ParamT; works, looks good - optimize out some not-really-neccessary loops - safe CElemPtr's... looks good, seems worky (this commit was brought to you by a herd of flying plusses) M +122 -41 libcapture/celem.h 1.4 M +8 -6 libcapture/depgroupers.cpp 1.16 M +1 -0 libcapture/depgroupers.h 1.11 M +6 -6 libcapture/filters.cpp 1.17 M +2 -2 libcapture/grouper.cpp 1.25 M +20 -0 libcapture/param.h 1.5 M +31 -7 libcapture/pkgmanager.cpp 1.25 M +7 -3 libcapture/pkgmanager.h 1.18 M +35 -15libcapture/safeiterators.cpp 1.4 M +22 -17libcapture/safeiterators.h 1.4 M +1 -1 libcapture/tree.cpp 1.20 M +3 -2 libcapture/treefactory.h 1.6 M +1 -1 libcapture/treenode.cpp 1.8 M +4 -4 libcapture/treenode.h 1.10 M +1 -1 libkapture/listtreeview.cpp 1.14 M +9 -9 libkapture/listtreewidget.cpp 1.23 M +4 -4 libkapture/listtreewidget.h 1.15 M +6 -6 libkapture/pkgcelemview.cpp 1.6 M +1 -1 libkapture/pkgcelemview.h 1.4
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall: ... fix the CElemSPtr to not fuck up refcounting ... ... or at least not to free up referenced memory ... ... needs some fixes; and cleanup redundant code ... M +5 -2 celem.h 1.5 M +1 -2 depgroupers.cpp 1.17 M +3 -1 filters.cpp 1.18 M +8 -6 safeiterators.cpp 1.5 M +29 -4 safeiterators.h 1.5
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall: fix include_HEADERS, so that make runs... M +1 -1 Makefile.am 1.16 --- kdenonbeta/kdedebian/kapture/libcapture/Makefile.am #1.15:1.16 @@ -7,5 +7,5 @@ # these are the headers for your project -include_HEADERS = DebDBParser.h depgroupers.h filters.h grouper.h pkgcache.h pkggroup.h pkgmanager.h pkgtags.h safeiterators.h stl_util.h tagcollbuilder.h treebranchnode.h treedepnode.h treefactory.h treegroupnode.h tree.h treenode.h treepkgnode.h treevernode.h treevisitor.h Vocabulary.h ZlibParserInput.h celem.h +include_HEADERS = DebDBParser.h depgroupers.h filters.h grouper.h pkgcache.h pkggroup.h pkgmanager.h pkgtags.h safeiterators.h stl_util.h tagcollbuilder.h treefactory.h tree.h treenode.h treevisitor.h Vocabulary.h ZlibParserInput.h celem.h # let automoc handle all of the meta source files (moc)
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
Fix bunch of warnings. Yes, it still compiles runs. Found another bug
tho, out to fix that...
M +2 -3 kapture/Makefile.am 1.13
M +6 -7 kapture/kapture.cpp 1.24
M +0 -4 kapture/kapture.h 1.10
M +2 -1 libcapture/pkgmanager.cpp 1.26
M +2 -0 libcapture/stl_util.cpp 1.4
--- kdenonbeta/kdedebian/kapture/kapture/Makefile.am #1.12:1.13
@@ -19,9 +19,8 @@
# which sources should be compiled for kapture
-kapture_SOURCES = main.cpp kapture.cpp kaptureview.cpp \
-kapturepref.cpp
+kapture_SOURCES = main.cpp kapture.cpp kapturepref.cpp
# these are the headers for your project
-noinst_HEADERS = kapture.h kaptureview.h kapturepref.h
+noinst_HEADERS = kapture.h kapturepref.h
# let automoc handle all of the meta source files (moc)
--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp #1.23:1.24
@@ -33,4 +33,5 @@
#include qtimer.h
#include kde_terminal_interface.h
+#include kparts/part.h
#include libcapture/grouper.h
@@ -50,6 +51,5 @@ using namespace kapture;
/* {{{ */
Kapture::Kapture()
-: KDockMainWindow (0, Kapture),
-m_printer(0)
+: KDockMainWindow (0, Kapture)
{
// accept dnd
@@ -190,5 +190,4 @@ Kapture::~Kapture()
kdDebug () Kapture::~Kapture endl;
// PkgManager::destroy ();
-delete m_printer;
}
/* }}} */
@@ -244,5 +243,5 @@ void Kapture::saveProperties(KConfig *co
// later when this app is restored
-if (!m_view-currentURL().isNull()) {
+/* if (!m_view-currentURL().isNull()) {
#if KDE_IS_VERSION(3,1,3)
config-writePathEntry(lastURL, m_view-currentURL());
@@ -250,5 +249,5 @@ void Kapture::saveProperties(KConfig *co
config-writeEntry(lastURL, m_view-currentURL());
#endif
-}
+} */
}
/* }}} */
@@ -263,6 +262,6 @@ void Kapture::readProperties(KConfig *co
QString url = config-readPathEntry(lastURL);
-if (!url.isEmpty())
-m_view-openURL(KURL::fromPathOrURL(url));
+/* if (!url.isEmpty())
+m_view-openURL(KURL::fromPathOrURL(url)); */
}
/* }}} */
--- kdenonbeta/kdedebian/kapture/kapture/kapture.h #1.9:1.10
@@ -11,6 +11,4 @@
#include kdockwidget.h
-#include kaptureview.h
-
class KPrinter;
class KTabWidget;
@@ -87,6 +85,4 @@ class Kapture : public KDockMainWindow
void setupAccel();
void setupActions();
-KaptureView *m_view;
-KPrinter *m_printer;
};
--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp #1.25:1.26
@@ -93,4 +93,5 @@ bool PkgManager::loadAll ()
m_notify = n;
notifyRebuild ();
+return r;
}
/* {{{ */
@@ -514,5 +515,5 @@ bool PkgManager::doCommit (CommitStatus
_system-UnLock();
-int count = 0;
+unsigned count = 0;
for (pkgCache::PkgIterator mP = m_cache - PkgBegin (); ! mP . end (); mP
++) {
if (m_cache [mP] . Delete ()) {
--- kdenonbeta/kdedebian/kapture/libcapture/stl_util.cpp #1.3:1.4
@@ -91,4 +91,5 @@ static string escape( string s, string d
}
/* }}} */
+#if 0
/* {{{ */
static liststring explode_helper (string s, string delim)
@@ -106,4 +107,5 @@ static liststring explode_helper (stri
}
/* }}} */
+#endif
/* {{{ */
liststring capture::explode (string s, string delim)
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall:
Fix Depends node creation (busted in process of DepCElem(S)Ptr
debugging).
M +1 -1 depgroupers.cpp 1.18
--- kdenonbeta/kdedebian/kapture/libcapture/depgroupers.cpp #1.17:1.18
@@ -78,5 +78,5 @@ void Pkg2DepGrouper::addNode (TreeNode *
d - addDepend (D); */
} else {
-d = m_treeFact - make (0, de);
+d = m_treeFact - make (0, new DepCElem (*de));
cerr new depend ( d , parent =
(n ? n : r)
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - fix crash caused by inappropriate delete in Pkg2DepGrouper::addNode - fix the don't open same package multiple times again, hopefully fully this time - fix rendering of sections and depends - fix dependency borkage (ie, use TreeFactory, not new TreeNode) M +3 -3 kapture/kapture.cpp 1.20 M +8 -0 libcapture/celem.h 1.2 M +2 -3 libcapture/depgroupers.cpp 1.13 M +17 -1 libkapture/listtreewidget.cpp 1.21 M +2 -0 libkapture/listtreewidget.h 1.13
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - remove the now-redundant Tree * parameter from all addNode instances - update TODO - remove some stale code M +2 -2 TODO 1.30 M +9 -9 libcapture/depgroupers.cpp 1.14 M +7 -47 libcapture/depgroupers.h 1.9 M +2 -2 libcapture/filters.cpp 1.16 M +1 -1 libcapture/filters.h 1.10 M +8 -8 libcapture/grouper.cpp 1.24 M +2 -2 libcapture/grouper.h 1.18 M +3 -9 libcapture/tree.cpp 1.19
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
- biggie code sweeping
- rename s/nodeview/celemview/g
- ditch bunch of stale code
(doesn't compile atm; needs fixing inside files)
Alibkapture/celemview.cpp 1.1 [no copyright]
Alibkapture/celemview.h 1.1 [UNKNOWN]
Alibkapture/pkgcelemview.cpp 1.1 [no copyright]
Alibkapture/pkgcelemview.h 1.1 [UNKNOWN]
Alibkapture/pkgcelemviewcommonui.ui 1.1
Alibkapture/pkgcelemviewdetailsui.ui 1.1
M +0 -5 libcapture/treevisitor.h 1.3
M +3 -3 libkapture/Makefile.am 1.14
Rlibcapture/treedepnode.cpp 1.4
Rlibcapture/treedepnode.h 1.4
Rlibcapture/treegroupnode.cpp 1.1
Rlibcapture/treegroupnode.h 1.5
Rlibcapture/treepkgnode.cpp 1.4
Rlibcapture/treepkgnode.h 1.7
Rlibcapture/treevernode.cpp 1.3
Rlibcapture/treevernode.h 1.3
Rlibcapture/treevisitor.cpp 1.1
Rlibkapture/nodeview.cpp 1.3
Rlibkapture/nodeview.h 1.2
Rlibkapture/operationmenu.cpp 1.4
Rlibkapture/operationmenu.h 1.2
Rlibkapture/operationmenuui.ui 1.2
Rlibkapture/pkgnodeview.cpp 1.24
Rlibkapture/pkgnodeview.h 1.7
Rlibkapture/pkgnodeviewcommonui.ui 1.5
Rlibkapture/pkgnodeviewdetailsui.ui 1.1
--- kdenonbeta/kdedebian/kapture/libcapture/treevisitor.h #1.2:1.3
@@ -35,9 +35,4 @@ namespace capture {
virtual void visitGenericNode (TreeNode *n) {};
virtual void visitNode (TreeNode *n) { visitGenericNode (n); };
-/* virtual void visitNode (TreeBranchNode *n);
-virtual void visitNode (TreePkgNode *n);
-virtual void visitNode (TreeDepNode *n);
-virtual void visitNode (TreeVerNode *n);
-virtual void visitNode (TreeGroupNode *n); */
};
}
--- kdenonbeta/kdedebian/kapture/libkapture/Makefile.am #1.13:1.14
@@ -8,5 +8,5 @@
# these are the headers for your project
include_HEADERS = \
-nodeview.h pkgnodeview.h \
+celemview.h pkgcelemview.h \
treeview.h listtreeview.h \
kapturemanager.h \
@@ -29,7 +29,7 @@
# the Part's source, library search path, and link libraries
libkapture_la_SOURCES = \
-pkgnodeviewdetailsui.ui pkgnodeviewcommonui.ui listtreeviewui.ui \
+pkgcelemviewdetailsui.ui pkgcelemviewcommonui.ui listtreeviewui.ui \
acqprogress.cpp errordialog.cpp commitstatus.cpp \
-nodeview.cpp pkgnodeview.cpp \
+celemview.cpp pkgcelemview.cpp \
treeview.cpp \
listtreeview.cpp listtreewidget.cpp \
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: compile! M +1 -1 kapture/kapture.cpp 1.21 M +0 -1 libkapture/pkgcelemview.cpp 1.2 --- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp #1.20:1.21 @@ -39,5 +39,5 @@ #include libkapture/summaryview.h #include libkapture/kapturemanager.h -#include libkapture/pkgnodeview.h +#include libkapture/pkgcelemview.h #include libkapture/dpkgpm.h #include kapturepref.h --- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.cpp #1.1:1.2 @@ -13,5 +13,4 @@ #include libcapture/celem.h #include libcapture/treenode.h -#include libcapture/treepkgnode.h #include libcapture/param.h
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Migrate most of the stuff from TreeNode - CElemPtr. Kill some more stale code. Compiles and seems to work. M +19 -19kapture/kapture.cpp 1.22 M +2 -2 kapture/kapture.h 1.9 M +11 -0 libcapture/celem.h 1.3 M +21 -0 libcapture/param.h 1.4 M +5 -12 libkapture/celemview.cpp 1.2 M +7 -10 libkapture/celemview.h 1.2 M +29 -21libkapture/kapturemanager.cpp 1.22 M +15 -7 libkapture/kapturemanager.h 1.10 M +2 -21 libkapture/listtreeview.cpp 1.13 M +0 -5 libkapture/listtreeview.h 1.2 M +1 -110libkapture/listtreewidget.cpp 1.22 M +1 -50 libkapture/listtreewidget.h 1.14 M +74 -88libkapture/pkgcelemview.cpp 1.3 M +30 -33libkapture/pkgcelemview.h 1.2 M +2 -2 libkapture/pkgcelemviewcommonui.ui 1.2 M +2 -2 libkapture/pkgcelemviewdetailsui.ui 1.2 M +5 -11 libkapture/summaryview.cpp 1.6 M +0 -2 libkapture/summaryview.h 1.2 M +2 -4 libkapture/treeview.cpp 1.6 M +3 -5 libkapture/treeview.h 1.6
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
- fix slots/signals to connect (depends view still no worky tho)
- update TODO
M +1 -1 TODO 1.31
M +2 -1 libkapture/pkgcelemview.cpp 1.4
M +6 -6 libkapture/pkgcelemview.h 1.3
--- kdenonbeta/kdedebian/kapture/TODO #1.30:1.31
@@ -101,5 +101,5 @@
capture::PkgManager)
- ADD A LAYER BETWEEN TREE AND CACHE: CELEMS [done: 60%]
+ ADD A LAYER BETWEEN TREE AND CACHE: CELEMS [done: 80%]
CElem (short for CacheElement), is a polymorphic type containing some kind
of package cache information. Usually, this will be a wrapped up
--- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.cpp #1.3:1.4
@@ -57,5 +57,6 @@ PkgCElemView::PkgCElemView (QWidget *par
w = m_janus - addVBoxPage (QString (Common));
m_common = new PkgCElemViewCommon (w /* m_tabw */);
-connect (m_common, SIGNAL (versionChanged (pkgCache::VerIterator)), this,
SLOT (setVersion (pkgCache::VerIterator)));
+connect (m_common, SIGNAL (versionChanged (capture::VerCElemPtr)), this,
+SLOT (setVersion (capture::VerCElemPtr)));
w = m_janus - addVBoxPage (QString (Details));
--- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.h #1.2:1.3
@@ -66,5 +66,5 @@ namespace kapture {
virtual void rebuild ();
public slots:
-void setVersion (capture::VerCElemSPtr V);
+void setVersion (capture::VerCElemPtr V);
virtual bool showElem (CElemPtr n);
protected:
@@ -96,6 +96,6 @@ namespace kapture {
PkgCElemViewCommon (QWidget *parent = NULL, const char *name =
NULL);
public slots:
-void setPackage (capture::PkgCElemSPtr P);
-void setVersion (capture::VerCElemSPtr V, pkgRecords::Parser *P);
+void setPackage (capture::PkgCElemPtr P);
+void setVersion (capture::VerCElemPtr V, pkgRecords::Parser *P);
void setVersion (const char *ver);
void setStatus (int i);
@@ -108,5 +108,5 @@ namespace kapture {
void uninstall ();
signals:
-void versionChanged (capture::VerCElemSPtr V);
+void versionChanged (capture::VerCElemPtr V);
};
@@ -120,6 +120,6 @@ namespace kapture {
PkgCElemViewDetails (QWidget *parent = NULL, const char *name =
NULL);
public slots:
-void setPackage (capture::PkgCElemSPtr P);
-void setVersion (capture::VerCElemSPtr V, pkgRecords::Parser *P);
+void setPackage (capture::PkgCElemPtr P);
+void setVersion (capture::VerCElemPtr V, pkgRecords::Parser *P);
};
}
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
Fix dependency view. Also make Pkg2DepGrouper use specific version, not
just candidate one (well, if it is applied on PkgCElem, it will still
use candidate version). Makes dependency view respect the version combo
in pkgcelemview.
M +18 -13libcapture/depgroupers.cpp 1.15
M +1 -1 libcapture/depgroupers.h 1.10
M +2 -2 libkapture/pkgcelemview.cpp 1.5
--- kdenonbeta/kdedebian/kapture/libcapture/depgroupers.cpp #1.14:1.15
@@ -38,8 +38,8 @@ GROUPER_DESTR (Pkg2DepGrouper) {};
// --
GROUPER_CONSTR (Pkg2DepGrouper)
-: Grouper (f, a), m_nextInst (0), m_pkg (0)
+: Grouper (f, a), m_nextInst (0), m_ver (0)
{
-m_pkg = ParamNode::value (Param::get (a, package));
-cerr Pkg2DepGrouper::Pkg2DepGrouper package = m_pkg endl;
+m_ver = verCElem (ParamCElem::value (Param::get (a, package)));
+cerr Pkg2DepGrouper::Pkg2DepGrouper package = m_ver endl;
}
/* }}} */
@@ -50,19 +50,24 @@ void Pkg2DepGrouper::addNode (TreeNode *
PkgCElem *pe = 0;
DepCElem *de = 0;
+VerCElem *ve = 0;
if (! m_nextInst)
m_nextInst = m_next - instantiate ();
bool o = 0;
-if (n) {
+if (n) { // find the version to operate on; bit hairy...
m_nextInst - addNode (n, r);
+ve = verCElem (**n);
+if (! ve) {
pe = pkgCElem (**n);
-} else if (m_pkg) {
-pe = pkgCElem (**m_pkg);
-if (n)
-n - killChildren ();
+if (pe)
+ve = cElem (PkgManager::cache () - GetCandidateVer (*pe));
}
-if (n || pe) {
+} else if (m_ver) {
+ve = m_ver;
+/* if (n) // XXX: from stashing times; probably worthless
+n - killChildren (); */
+} // end finding the version
+if (ve) {
TreeNode *d = 0;
-de = cElem (PkgManager::cache () - GetCandidateVer (*pe) .
-DependsList ());
+de = ve - DependsList ();
for (; ! de - end (); ++ (* de)) {
if (o) {
--- kdenonbeta/kdedebian/kapture/libcapture/depgroupers.h #1.9:1.10
@@ -29,5 +29,5 @@ namespace capture {
// Pkg2DepGrouper - package - set of depends converter
// --
-GROUPER_DEF (Pkg2DepGrouper, Grouper, Grouper *m_nextInst; TreeNode
*m_pkg;);
+GROUPER_DEF (Pkg2DepGrouper, Grouper, Grouper *m_nextInst; VerCElemSPtr
m_ver;);
// DepTGrouper - dependency type grouper
--- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.cpp #1.4:1.5
@@ -99,5 +99,5 @@ bool PkgCElemView::showElem (capture::CE
/* }}} */
/* {{{ */
-void PkgCElemView::setVersion (VerCElemSPtr V)
+void PkgCElemView::setVersion (VerCElemPtr V)
{
pkgCache::VerFileIterator Vf;
@@ -112,5 +112,5 @@ void PkgCElemView::setVersion (VerCElemS
// Feeder *feed = new PkgDepFeeder (V);
Param::Map a;
-Param::set (a, package, ParamCElem::create (m_pkg));
+Param::set (a, package, ParamCElem::create (V));
GrouperChain *c = m_depList - grouper ();
kdDebug () chain: c endl;
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - code comment cleanups - monitor child dpkg process; also open status fd pipe for it [beware: this is terrible hack and should be fixed to be more reliable] - get rid of PkgManager::_commit flags (use _config again) - update TODO M +12 -8 TODO 1.32 M +4 -2 kapture/kapture.cpp 1.23 M +3 -2 kapture/kaptureui.rc 1.3 M +28 -2 libcapture/dpkgpm.cpp 1.2 M +3 -0 libcapture/dpkgpm.h 1.2 M +19 -31libcapture/grouper.h 1.19 M +7 -9 libcapture/pkgmanager.cpp 1.24 M +4 -4 libcapture/pkgmanager.h 1.17 M +10 -11libcapture/tree.h 1.13 M +14 -1 libkapture/dpkgpm.cpp 1.2 M +2 -1 libkapture/dpkgpm.h 1.2 M +6 -2 libkapture/kapturemanager.cpp 1.23
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - biggish refactoring of Tree stuff: add a new layer of indirection between the TreeNode and cache: CElem; more about this in the TODO - reduces code redundancy significantly, allows for united TreeNode - use visitors to avoid downcasting (downcast functions provided for convenience tho); maybe groupers should switch to visitor ;) - half the stuff is half-broken now; will fix later today (after i get up, that is ;p) Alibcapture/celem.cpp 1.1 [LGPL (v2+)] Alibcapture/celem.h 1.1 [LGPL (v2+)] Atests/libcapture/celem-test.cpp 1.1 [no copyright] M +43 -18TODO 1.29 M +6 -0 debian/changelog 1.6 M +5 -5 kapture/kapture.cpp 1.19 M +3 -5 libcapture/Makefile.am 1.15 M +30 -29libcapture/depgroupers.cpp 1.12 M +27 -29libcapture/filters.cpp 1.15 M +15 -14libcapture/grouper.cpp 1.23 M +2 -0 libcapture/pkggroup.cpp 1.9 M +2 -0 libcapture/pkggroup.h 1.9 M +2 -1 libcapture/tree.cpp 1.18 M +1 -3 libcapture/treebranchnode.cpp 1.9 M +0 -1 libcapture/treebranchnode.h 1.9 M +1 -3 libcapture/treedepnode.cpp 1.4 M +0 -1 libcapture/treedepnode.h 1.4 M +4 -13 libcapture/treefactory.h 1.5 M +0 -1 libcapture/treegroupnode.h 1.5 M +2 -2 libcapture/treenode.cpp 1.7 M +9 -22 libcapture/treenode.h 1.9 M +1 -3 libcapture/treepkgnode.cpp 1.4 M +0 -1 libcapture/treepkgnode.h 1.7 M +1 -3 libcapture/treevernode.cpp 1.3 M +0 -1 libcapture/treevernode.h 1.3 M +3 -3 libcapture/treevisitor.h 1.2 M +35 -47libkapture/listtreewidget.cpp 1.20 M +13 -5 libkapture/listtreewidget.h 1.12 M +2 -1 libkapture/pkgnodeview.cpp 1.24 M +1 -1 tests/libcapture/Makefile.am 1.3 M +4 -4 tests/libcapture/tree-test.cpp 1.4
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Macroify groupers. Sorry guys, call me evil, but i'm not going to type zillions of redundant lines to please someone's perverted aesthetics :P. Also start the work on persistent grouper data. Should figure out more on this and how will it interact with tree optimization. (Which should be prolly turned into a visitor, as i think of it ;)). M +21 -19libcapture/depgroupers.cpp 1.11 M +9 -6 libcapture/depgroupers.h 1.8 M +28 -31libcapture/filters.cpp 1.13 M +9 -52 libcapture/filters.h 1.9 M +17 -10libcapture/grouper.cpp 1.22 M +39 -36libcapture/grouper.h 1.16 M +3 -2 libcapture/pkggroup.cpp 1.8 M +1 -1 libcapture/pkggroup.h 1.8 M +4 -2 libcapture/tree.cpp 1.16 M +1 -1 libcapture/tree.h 1.11 M +9 -0 libcapture/treenode.cpp 1.5 M +6 -1 libcapture/treenode.h 1.7 M +12 -12libkapture/listtreewidget.cpp 1.18
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - ditch stashing stuff; was surprizingly easy; rebuild the tree from scratch, like before; conflicted with groupers generating new nodes - this makes all the nice TreeDepNode and Pkg2DepGrouper stuff work - introduce concept of node paths: it is about the best way to remember user data/status for a given node; like open status for example - make open/close branch state remembering (across refresh) work again M +1 -1 libcapture/filters.cpp 1.14 M +0 -9 libcapture/grouper.h 1.17 M +15 -73libcapture/tree.cpp 1.17 M +0 -4 libcapture/tree.h 1.12 M +2 -2 libcapture/treedepnode.cpp 1.3 M +3 -1 libcapture/treedepnode.h 1.3 M +11 -0 libcapture/treenode.cpp 1.6 M +2 -0 libcapture/treenode.h 1.8 M +1 -0 libcapture/treepkgnode.h 1.6 M +1 -0 libcapture/treevernode.h 1.2 M +48 -13libkapture/listtreewidget.cpp 1.19 M +6 -1 libkapture/listtreewidget.h 1.11 M +4 -4 libkapture/pkgnodeview.cpp 1.23
kdeextragear-1/amarok/debian
CVS commit by mornfall: Adding debian packaging. It will be maintained by Alejandro Exojo and myself. Aamarok.install 1.1 Achangelog 1.1 Acompat 1.1 Acontrol 1.1 Acopyright 1.1 Arules 1.1
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Reinstating the dependency view. Hopefully the right way this time. M +2 -2 TODO 1.28 M +60 -72libcapture/depgroupers.cpp 1.10 M +14 -20libcapture/depgroupers.h 1.7 M +10 -5 libcapture/filters.cpp 1.11 M +19 -6 libcapture/grouper.cpp 1.21 M +4 -1 libcapture/grouper.h 1.15 M +13 -2 libcapture/param.h 1.2 M +1 -0 libcapture/tree.h 1.10 M +6 -0 libcapture/treebranchnode.cpp 1.8 M +1 -0 libcapture/treebranchnode.h 1.8 M +16 -1 libcapture/treedepnode.cpp 1.2 M +2 -0 libcapture/treedepnode.h 1.2 M +1 -1 libcapture/treepkgnode.cpp 1.3 M +1 -1 libcapture/treevernode.cpp 1.2 M +2 -1 libkapture/kapturemanager.cpp 1.21 M +3 -3 libkapture/listtreeview.cpp 1.11 M +46 -2 libkapture/listtreewidget.cpp 1.17 M +13 -0 libkapture/listtreewidget.h 1.10 M +21 -15libkapture/pkgnodeview.cpp 1.22 M +5 -2 libkapture/treeview.cpp 1.5 M +5 -2 libkapture/treeview.h 1.5
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
Fix a rather nasty contract violation in Param::mergeMaps (swapped
argument meanings).
M +1 -0 libcapture/filters.cpp 1.12
M +4 -3 libcapture/param.h 1.3
M +2 -0 libkapture/listtreeview.cpp 1.12
--- kdenonbeta/kdedebian/kapture/libcapture/filters.cpp #1.11:1.12
@@ -90,4 +90,5 @@ PkgNameFilter::PkgNameFilter (const Para
{
m_str = ParamStr::value (Param::get (a, string));
+// cerr PkgNameFilter::PkgNameFilter: m_str = m_str endl;
}
/* }}} */
--- kdenonbeta/kdedebian/kapture/libcapture/param.h #1.2:1.3
@@ -41,7 +41,8 @@ namespace capture
}
static Map mergeMaps (const Map m1, const Map m2) {
-Map ret = m1;
-for (Map::const_iterator i = m2 . begin (); i != m2 . end ();
++ i)
-ret . insert (*i);
+Map ret = m2; // m2 has priority
+for (Map::const_iterator i = m1 . begin (); i != m1 . end ();
++ i) {
+ret . insert (*i); // will not overwrite existing entries
+}
return ret;
}
--- kdenonbeta/kdedebian/kapture/libkapture/listtreeview.cpp #1.11:1.12
@@ -44,4 +44,6 @@ void ListTreeView::filterStringChanged (
Param::Map a;
Param::set (a, string, ParamStr::create (string (text.utf8 (;
+/* kdDebug () string param: ParamStr::value (Param::get (a,
+string)) . c_str () endl; */
m_quickGrouper - applyArgs (a);
}
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - new Param class, to store parameters in relatively extensible, clean and practical way - change all Groupers to use a string, Param* map as argmap - fix the rest of the code to work with changed Grouper ifaces Alibcapture/param.h 1.1 [LGPL (v2+)] M +8 -8 libcapture/depgroupers.cpp 1.7 M +9 -9 libcapture/depgroupers.h 1.5 M +23 -40libcapture/filters.cpp 1.9 M +12 -12libcapture/filters.h 1.7 M +10 -8 libcapture/grouper.cpp 1.18 M +17 -15libcapture/grouper.h 1.12 M +5 -10 libcapture/pkggroup.cpp 1.6 M +3 -5 libcapture/pkggroup.h 1.6 M +15 -15libkapture/kapturemanager.cpp 1.19 M +2 -2 libkapture/listtreeview.cpp 1.10
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
compile!
M +2 -11 kapture/kapture.cpp 1.16
M +5 -5 tests/libcapture/grouper-test.cpp 1.2
M +1 -1 tests/libcapture/tree-test.cpp 1.3
--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp #1.15:1.16
@@ -6,12 +6,4 @@
// includes {{{
-#include kapture.h
-
-#include kapturepref.h
-
-#include kprinter.h
-#include qpainter.h
-#include qpaintdevicemetrics.h
-
#include kdeversion.h
#include kglobal.h
@@ -22,6 +14,4 @@
#include kkeydialog.h
#include kaccel.h
-//#include kio/netaccess.h
-//#include kfiledialog.h
#include kconfig.h
#include kurl.h
@@ -53,5 +43,6 @@
#include libkapture/pkgnodeview.h
#include libkapture/dpkgpm.h
-#include konsolewidget.h
+#include kapturepref.h
+#include kapture.h
/* }}} */
--- kdenonbeta/kdedebian/kapture/tests/libcapture/grouper-test.cpp #1.1:1.2
@@ -22,18 +22,18 @@ namespace tut {
void to::test1 ()
{
-argmap a;
+Param::Map a;
GrouperChain *c;
GrouperTNode *n0, *n1, *n2, *n3;
c = new GrouperChain (test);
-n0 = c - addFactory (SectGrouper, a, sect);
+n0 = c - addFactory (SectGrouper, sect);
ensure (IT (0)); ensure (IT (0) == n0);
-n1 = c - addFactory (EndGrouper, a, end);
+n1 = c - addFactory (EndGrouper, end);
ensure (IT (1)); ensure (IT (1) == n1);
-n2 = c - addFactory (PkgExistFilter, a, exist, Grouper::Custom,
1);
+n2 = c - addFactory (PkgExistFilter, exist, a, Grouper::Custom,
1);
ensure (IT (2));
ensure (IT (0) == n0);
ensure (IT (1) == n2);
ensure (IT (2) == n1);
-n3 = c - addFactory (PkgNameFilter, a, name, Grouper::BeforeLast);
+n3 = c - addFactory (PkgNameFilter, name, a, Grouper::BeforeLast);
ensure (IT (3));
ensure (IT (0) == n0);
--- kdenonbeta/kdedebian/kapture/tests/libcapture/tree-test.cpp #1.2:1.3
@@ -56,5 +56,5 @@ namespace tut {
Tree *t = new Tree;
GrouperChain *c = new GrouperChain (grouperchain);
-c - addFactory (EndGrouper, argmap (), end);
+c - addFactory (EndGrouper, end);
t - setGrouper (c);
t - setProducer (p);
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall: Making Groupers create TreeNodes (instead of NodeProducer), phase 1: pass Tree pointer to addNode, so that groupers can stash nodes. Needed now, as Groupers will soon become sole mass-producers of TreeNodes. Fixing Tree::addStashed to cope with this (instead of looping infinitely). M +12 -4 depgroupers.cpp 1.8 M +3 -2 depgroupers.h 1.6 M +5 -3 filters.cpp 1.10 M +1 -1 filters.h 1.8 M +5 -5 grouper.cpp 1.19 M +4 -4 grouper.h 1.13 M +2 -2 pkggroup.cpp 1.7 M +1 -1 pkggroup.h 1.7 M +6 -3 tree.cpp 1.14
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
Grant a wish to ervin: clicking on a package already having a tab just
brings the relevant tab into foreground, instead of opening new one.
M +10 -1 kapture/kapture.cpp 1.18
M +1 -1 libkapture/nodeview.cpp 1.3
M +2 -0 libkapture/nodeview.h 1.2
M +2 -0 libkapture/pkgnodeview.cpp 1.21
M +2 -1 libkapture/pkgnodeview.h 1.7
--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp #1.17:1.18
@@ -129,9 +129,18 @@ void Kapture::showNode (capture::TreeNod
{
NodeView *v = 0;
+for (int i = 0; i = m_nodesShown; i ++) {
+v = dynamic_cast NodeView * (m_nodeTabs - page (i));
+if (v)
+kdDebug () compare: v - node () vs n endl;
+if (v v - node () == n) {
+m_nodeTabs - setCurrentPage (i);
+return;
+}
+}
if (n - type () == TreeNode::PkgNode) {
m_nodesShown ++;
PkgNodeView *details = new kapture::PkgNodeView (this, details);
details - setManager (m_man);
-details - setPackage ((TreePkgNode::castNode (n)) - pkg ());
+details - showNode (n);
v = details;
}
--- kdenonbeta/kdedebian/kapture/libkapture/nodeview.cpp #1.2:1.3
@@ -9,5 +9,5 @@ using namespace kapture;
/* {{{ */
NodeView::NodeView (QWidget *parent, const char *name)
-: QWidget (parent, name), m_man (0)
+: QWidget (parent, name), m_man (0), m_node (0)
{
//PkgManager::registerWatcher (this);
--- kdenonbeta/kdedebian/kapture/libkapture/nodeview.h #1.1:1.2
@@ -33,4 +33,5 @@ namespace kapture {
~NodeView ();
void setManager (KaptureManager *man);
+TreeNode *node () { return m_node; };
// virtual void refresh ();
// virtual void rebuild ();
@@ -39,4 +40,5 @@ namespace kapture {
protected:
KaptureManager *m_man;
+TreeNode *m_node;
};
};
--- kdenonbeta/kdedebian/kapture/libkapture/pkgnodeview.cpp #1.20:1.21
@@ -100,4 +100,6 @@ void PkgNodeView::setPackage (pkgCache::
void PkgNodeView::setPackage (TreeNode *pkg)
{
+m_node = pkg;
+kdDebug () PkgNodeView::setPackage, m_node = m_node endl;
setPackage (TreePkgNode::castNode (pkg) - pkg ());
}
--- kdenonbeta/kdedebian/kapture/libkapture/pkgnodeview.h #1.6:1.7
@@ -67,8 +67,9 @@ namespace kapture {
virtual void rebuild ();
public slots:
-void setPackage (pkgCache::PkgIterator pkg);
void setPackage (TreeNode *pkg);
void setVersion (pkgCache::VerIterator V);
virtual bool showNode (capture::TreeNode *n);
+protected slots:
+void setPackage (pkgCache::PkgIterator pkg);
protected:
QBoxLayout *m_layout;
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - start work on rather experimental konsole embedding - reimplement DPkgPM in libcapture to allow fork/execvp override (mostly cut paste from libapt-pkg) - create a very preliminary kapture::DPkgPM; it takes TerminalInterface and tries to churn out dpkg process running in the terminal; fails miserably - reduce chattiness on cerr a bit Alibcapture/dpkgpm.cpp 1.1 [LGPL (v2+)] Alibcapture/dpkgpm.h 1.1 [LGPL (v2+)] Alibcapture/pkgsystem.cpp 1.1 [LGPL (v2+)] Alibcapture/pkgsystem.h 1.1 [LGPL (v2+)] Alibkapture/dpkgpm.cpp 1.1 [no copyright] Alibkapture/dpkgpm.h 1.1 [LGPL (v2+)] M +20 -9 kapture/kapture.cpp 1.15 M +6 -1 kapture/kapture.h 1.8 M +1 -1 libcapture/Makefile.am 1.13 M +6 -3 libcapture/pkgmanager.cpp 1.23 M +3 -3 libcapture/tree.cpp 1.13 M +1 -1 libkapture/Makefile.am 1.13 M +2 -0 libkapture/kapturemanager.cpp 1.18 M +3 -0 libkapture/kapturemanager.h 1.9
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
- fix the tree folds on refresh bug better (works with deep trees as
well, the former fix worked on first level only)
- update TODO
M +3 -0 TODO 1.26
M +13 -0 libkapture/listtreewidget.cpp 1.16
M +2 -4 libkapture/listtreewidget.h 1.9
--- kdenonbeta/kdedebian/kapture/TODO #1.25:1.26
@@ -74,4 +74,7 @@
- try to merge node production into groupers (not neccessarily feasible)
- try to fix the tree folds itself on refresh issue [done]
+ - make the groupers use some sane argument passing mechanizm instead of
+argmap (yuck...); possibly string-keyed, but using an object pointer as a
+value (possibly of some sensible base class type)
::: 0.3 (prealfa) :::
--- kdenonbeta/kdedebian/kapture/libkapture/listtreewidget.cpp #1.15:1.16
@@ -90,4 +90,17 @@ void ListTreeWidgetItem::setItemParent (
}
/* }}} */
+// detachItem - detach m_item from us (it is being deleted){{{
+// --
+void ListTreeWidgetItem::detachItem ()
+{
+// *cough* our destructor will delete all m_treeNode childrens'
+// m_item, meaning that these would go and double-delete them
+if (m_item)
+m_open = m_item - isOpen ();
+if (m_open)
+std::cerr open node: this std::endl;
+m_item = 0;
+}
+/* }}} */
// ListTreeWidgetPItem
--- kdenonbeta/kdedebian/kapture/libkapture/listtreewidget.h #1.8:1.9
@@ -54,4 +54,5 @@ namespace kapture {
ListTreeWidgetItem (ListTreeWidget *list, TreeNode *parent);
void setItemParent ();
+void detachItem ();
virtual ~ListTreeWidgetItem ();
protected:
@@ -77,8 +78,5 @@ namespace kapture {
virtual ~KListViewItemCustom ()
{
-// *cough* our destructor will delete all m_treeNode childrens'
-// m_item, meaning that these would go and double-delete them
-if (m_treeNode)
-m_treeNode - m_item = 0;
+m_treeNode - detachItem ();
}
};
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - final release fixes (summaryview, dist-upgrade) - cvs2cl changelog - update TODO (postponing few 0.2 goals to 0.3) - write some NEWS - the bug mentioned in README was fixed i believe = removed - fix the compile failures in testsuite M +1636 -0 ChangeLog 1.2 M +9 -1 NEWS 1.2 M +0 -3 README 1.10 M +13 -9 TODO 1.27 M +6 -4 libcapture/pkgcache.cpp 1.24 M +1 -0 libcapture/pkgcache.h 1.20 M +1 -1 libcapture/pkgmanager.h 1.16 M +3 -3 libkapture/kapturemanager.cpp 1.17 M +2 -2 libkapture/pkgnodeview.cpp 1.20 M +1 -0 libkapture/summaryview.cpp 1.5 M +31 -9 libkapture/summaryviewui.ui 1.6 M +9 -7 tests/libcapture/tree-test.cpp 1.2
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - built the 0.2 package (commiting the required changes and fixes) - add the tut files (unit testing framework i'm using, http://tut-framework.sf.net) - grant a wish to ervin: make it possible to close the last PkgView Atests/Makefile.am 1.1 Atests/tut-main.cpp 1.1 [no copyright] Atests/tut.h 1.1 [no copyright] Atests/tut_reporter.h 1.1 [no copyright] M +14 -0 debian/changelog 1.5 M +1 -1 debian/control 1.4 M +0 -4 debian/kapture.install 1.3 M +14 -11kapture/kapture.cpp 1.14 M +1 -1 libcapture/Makefile.am 1.12 M +1 -1 libkapture/Makefile.am 1.12
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - make all TreeNodes branchable, ie allow all nodes to have children - doubly link the sibling TreeNode's in a Tree: makes tree rebuilding O(n) instead of O(mn), where n is # of non-stashed nodes and m # of stashed nodes (m moved around 500 - 2000, n about 1 - m) - more code cleanups - start Pkg2DepGrouper impl (commented out for now...) M +37 -20libcapture/depgroupers.cpp 1.5 M +30 -21libcapture/depgroupers.h 1.4 M +4 -1 libcapture/filters.cpp 1.8 M +1 -0 libcapture/grouper.cpp 1.13 M +2 -3 libcapture/tree.cpp 1.9 M +1 -1 libcapture/tree.h 1.7 M +1 -48 libcapture/treebranchnode.cpp 1.6 M +3 -6 libcapture/treebranchnode.h 1.5 M +65 -3 libcapture/treenode.cpp 1.3 M +7 -5 libcapture/treenode.h 1.5 M +2 -2 libkapture/pkgnodeview.cpp 1.17
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
- fix a double-free bug, caused by the fact that m_item deletes all it's
children, while we deleted also all the m_items manually, in
descend-recursion order (so the parent first triggered the delete of
all m_items in a subtree and then individual nodes delete their respective
m_items again)
M +3 -3 libcapture/tree.cpp 1.10
M +20 -11libkapture/listtreewidget.h 1.6
--- kdenonbeta/kdedebian/kapture/libcapture/tree.cpp #1.9:1.10
@@ -221,8 +221,8 @@ void Tree::refresh ()
void Tree::clear ()
{
-if (m_root)
delete m_root;
-// m_feed = 0;
m_root = 0;
+delete m_stash;
+m_stash = 0;
}
--- kdenonbeta/kdedebian/kapture/libkapture/listtreewidget.h #1.5:1.6
@@ -26,4 +26,5 @@ namespace capture {
namespace kapture {
using namespace capture;
+class KListViewItemCustom;
class ListTreeWidget: public KListView, public Tree
@@ -42,17 +43,7 @@ namespace kapture {
TreeNode *stash () { return m_stash; };
};
-class KListViewItemCustom: public KListViewItem
-{
-public:
-TreeNode *m_treeNode;
-KListViewItemCustom (KListView *v, TreeNode *n)
-: KListViewItem (v), m_treeNode (n)
-{};
-KListViewItemCustom (KListViewItem *i, TreeNode *n)
-: KListViewItem (i), m_treeNode (n)
-{};
-};
class ListTreeWidgetItem: virtual public TreeNode
{
+friend class KListViewItemCustom;
public:
ListTreeWidgetItem (ListTreeWidget *list, TreeNode *parent);
@@ -65,4 +56,22 @@ namespace kapture {
TreeNode *m_itemParent;
};
+class KListViewItemCustom: public KListViewItem
+{
+public:
+ListTreeWidgetItem *m_treeNode;
+KListViewItemCustom (KListView *v, ListTreeWidgetItem *n)
+: KListViewItem (v), m_treeNode (n)
+{};
+KListViewItemCustom (KListViewItem *i, ListTreeWidgetItem *n)
+: KListViewItem (i), m_treeNode (n)
+{};
+virtual ~KListViewItemCustom ()
+{
+// *cough* our destructor will delete all m_treeNode childrens'
+// m_item, meaning that these would go and double-delete them
+if (m_treeNode)
+m_treeNode - m_item = 0;
+}
+};
class ListTreeWidgetGItem: virtual public ListTreeWidgetItem, virtual
public TreeGroupNode
{
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - add TreeVerNode and TreeDepNode types (for later use) - add TreeVisitor, for working with various TreeNodes - some Pkg2DepGrouper fixes; uncommented the code - more code cleanups Alibcapture/treedepnode.cpp 1.1 [LGPL (v2+)] Alibcapture/treedepnode.h 1.1 [LGPL (v2+)] Alibcapture/treevernode.cpp 1.1 [LGPL (v2+)] Alibcapture/treevernode.h 1.1 [LGPL (v2+)] Alibcapture/treevisitor.cpp 1.1 [LGPL (v2+)] Alibcapture/treevisitor.h 1.1 [LGPL (v2+)] M +3 -2 libcapture/Makefile.am 1.11 M +15 -18libcapture/depgroupers.cpp 1.6 M +1 -83 libcapture/feeder.cpp 1.6 M +0 -50 libcapture/feeder.h 1.10 M +1 -1 libcapture/grouper.cpp 1.14 M +1 -1 libcapture/pkggroup.cpp 1.5 M +3 -21 libcapture/tree.cpp 1.11 M +7 -5 libcapture/tree.h 1.8 M +1 -0 libcapture/treebranchnode.h 1.6 M +8 -3 libcapture/treefactory.h 1.3 M +37 -31libcapture/treenode.cpp 1.4 M +6 -2 libcapture/treenode.h 1.6 M +1 -0 libcapture/treepkgnode.h 1.5 M +32 -14libkapture/listtreewidget.cpp 1.13 M +18 -0 libkapture/listtreewidget.h 1.7
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Add package keep button to the PkgNodeView and the needed hooks into libcapture. Also handle Upgraded status in PkgStatusGrouper. M +3 -1 libcapture/grouper.cpp 1.16 M +8 -0 libcapture/pkgmanager.cpp 1.22 M +7 -0 libcapture/pkgmanager.h 1.15 M +8 -0 libkapture/pkgnodeview.cpp 1.18 M +1 -0 libkapture/pkgnodeview.h 1.6 M +102 -94 libkapture/pkgnodeviewcommonui.ui 1.5
kdenonbeta/kdedebian/kapture/libkapture
CVS commit by mornfall: Support PkgUpgrade state in PkgNodeView and ListTreeWidget as well. M +2 -0 listtreewidget.cpp 1.14 M +2 -0 pkgnodeview.cpp 1.19 --- kdenonbeta/kdedebian/kapture/libkapture/listtreewidget.cpp #1.13:1.14 @@ -109,4 +109,6 @@ void ListTreeWidgetPItem::refresh () case PkgCache::PkgInstall: m_item - setText (1, install); break; +case PkgCache::PkgUpgrade: +m_item - setText (1, upgrade); break; case PkgCache::PkgUninstall: m_item - setText (1, uninstall); break; --- kdenonbeta/kdedebian/kapture/libkapture/pkgnodeview.cpp #1.18:1.19 @@ -197,4 +197,6 @@ void PkgNodeViewCommon::refresh () case PkgCache::PkgInstall: m_status - setText (Will be installed); break; +case PkgCache::PkgUpgrade: +m_status - setText (Will be upgraded); break; case PkgCache::PkgUninstall: m_status - setText (Will be uninstalled); break;
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - fix the trees are folded on refresh issue (hopefully) - update TODO M +14 -8 TODO 1.25 M +15 -1 libcapture/grouper.cpp 1.17 M +1 -1 libcapture/tree.cpp 1.12 M +2 -1 libcapture/treebranchnode.cpp 1.7 M +4 -1 libcapture/treebranchnode.h 1.7 M +2 -1 libcapture/treefactory.h 1.4 M +11 -7 libkapture/listtreewidget.cpp 1.15 M +2 -1 libkapture/listtreewidget.h 1.8
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - more fixes of the modified Tree/Node/Grouper code; it actually semi-works now (still got some problems tho) - add unit testing (for now only few tests for tree and stl_util) - clean up all the IterType remnants in active code Atests/libcapture/Makefile.am 1.1 Atests/libcapture/stl_util-test.cpp 1.1 [no copyright] Atests/libcapture/tree-test.cpp 1.1 [no copyright] M +1 -1 Makefile.am 1.4 M +14 -37libcapture/feeder.h 1.9 M +6 -6 libcapture/grouper.cpp 1.10 M +2 -3 libcapture/grouper.h 1.9 M +0 -2 libcapture/pkgcache.cpp 1.21 M +1 -1 libcapture/pkggroup.cpp 1.4 M +21 -11libcapture/tree.cpp 1.8 M +2 -0 libcapture/treebranchnode.cpp 1.5 M +9 -9 libkapture/kapturemanager.cpp 1.16 M +5 -1 libkapture/listtreewidget.cpp 1.11 Rtests/stl_util.cpp 1.1
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - start some code clean up; fixing XXXs, compiler warnings, cleaning up code formatting, removing stale code, etc; work in progress - add grouper-test (1 test right now) to libcapture tests... Atests/libcapture/grouper-test.cpp 1.1 [no copyright] M +1 -1 Makefile.am 1.5 M +8 -42 libcapture/grouper.cpp 1.11 M +2 -2 libcapture/grouper.h 1.10 M +52 -26libkapture/listtreewidget.cpp 1.12 M +1 -1 libkapture/listtreewidget.h 1.5 M +1 -1 tests/libcapture/Makefile.am 1.2
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - reduce compiler chattiness during compile (iow, fix some warnings) - move libcapture/pkgcache-test.cpp - tests/libcapture/ Atests/libcapture/pkgcache-test.cpp 1.1 [no copyright] M +0 -4 libcapture/Makefile.am 1.10 M +4 -0 libcapture/grouper.cpp 1.12 M +9 -17 libcapture/pkgcache.cpp 1.22 M +1 -1 libcapture/pkgcache.h 1.18 M +0 -1 libcapture/pkgmanager.cpp 1.21 M +1 -22 libcapture/pkgtags.cpp 1.5 M +2 -2 libcapture/safeiterators.cpp 1.3 M +1 -1 libcapture/safeiterators.h 1.3 M +2 -3 libkapture/pkgnodeview.cpp 1.16 Rlibcapture/pkgcache-test.cpp 1.11
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Big feeder/grouper/tree refactoring, part 1. More details later... M +1 -1 TODO 1.24 M +4 -3 kapture/kapture.cpp 1.13 M +2 -0 libcapture/depgroupers.cpp 1.4 M +2 -0 libcapture/depgroupers.h 1.3 M +15 -9 libcapture/feeder.cpp 1.5 M +11 -22libcapture/feeder.h 1.8 M +28 -18libcapture/filters.cpp 1.7 M +8 -15 libcapture/filters.h 1.6 M +32 -41libcapture/grouper.cpp 1.9 M +8 -38 libcapture/grouper.h 1.8 M +7 -4 libcapture/pkggroup.cpp 1.3 M +1 -2 libcapture/pkggroup.h 1.5 M +53 -24libcapture/tree.cpp 1.5 M +19 -5 libcapture/tree.h 1.4 M +1 -1 libcapture/treebranchnode.cpp 1.4 M +2 -10 libcapture/treebranchnode.h 1.4 M +2 -2 libcapture/treegroupnode.h 1.4 M +11 -7 libcapture/treenode.h 1.4 M +6 -0 libcapture/treepkgnode.cpp 1.2 M +3 -10 libcapture/treepkgnode.h 1.4 M +2 -3 libkapture/kapturemanager.cpp 1.14 M +1 -1 libkapture/listtreeview.cpp 1.7 M +45 -18libkapture/listtreewidget.cpp 1.8 M +14 -5 libkapture/listtreewidget.h 1.2 M +8 -7 libkapture/pkgnodeview.cpp 1.14 M +2 -0 libkapture/pkgnodeview.h 1.5 M +5 -3 libkapture/treeview.cpp 1.3 M +2 -1 libkapture/treeview.h 1.3
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Refactor ListTreeWidget, make it play nice with the refactored Tree / Node / Grouper stuff. To explain more about the recent changes in Tree construction/refresh process: I shunned the Feeder concept, replacing it with NodeProducer; this pushes creation of TreeNodes into sooner phases of construction. All groupers now operate on TreeNode pointers instead of pkgCache::*Iterator. Also, the nodes are now more persistent, being reconstructed only on pkgCache changes; groupers can operate on existing trees now instead of constructing new ones every time. M +36 -9 libcapture/tree.cpp 1.6 M +6 -0 libcapture/tree.h 1.5 M +2 -3 libkapture/listtreeview.cpp 1.8 M +62 -40libkapture/listtreewidget.cpp 1.9 M +8 -3 libkapture/listtreewidget.h 1.3
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Speed up listtreeview a lot, changing the way it is filled with KListViewItems. Also fix a stupid multiple-virtual-inheritance bug with uninitialized (0-initialized) parent in TreeNode, when constructing ListTreeWidget*Items. Also added a hack to capture::Tree in form of foreach-like functions (iterateAll and iterateLeaves), using (eek) function pointers to call back. M +58 -3 libcapture/tree.cpp 1.7 M +4 -1 libcapture/tree.h 1.6 M +2 -0 libcapture/treenode.cpp 1.2 M +2 -2 libkapture/kapturemanager.cpp 1.15 M +1 -1 libkapture/listtreeview.cpp 1.9 M +33 -40libkapture/listtreewidget.cpp 1.10 M +15 -2 libkapture/listtreewidget.h 1.4 M +9 -8 libkapture/pkgnodeview.cpp 1.15
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Get rid of KMdi in kapture. We are now using a (sane) mix of KDockWidgets and KTabWidgets. Other than that, i adjusted some column widths in listviews (listtreeview, acqstatus) and changed layout of summaryview slightly (again). M +89 -34kapture/kapture.cpp 1.11 M +52 -70kapture/kapture.h 1.7 M +3 -3 libkapture/acqprogress.cpp 1.15 M +4 -0 libkapture/listtreewidget.cpp 1.7 M +2 -19 libkapture/summaryviewui.ui 1.4
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - implement SafePkgIterator and SafeVerIterator: these will remain valid even after cache rebuild; used by PkgDepFeeder, for example; use when you can't handle the rebuild notify yourself sanely - reload cache after _commit - prevent crashes in Pkg*DepFeeder (ie, use Safe*Iterator) Alibcapture/safeiterators.cpp 1.1 [LGPL (v2+)] Alibcapture/safeiterators.h 1.1 [LGPL (v2+)] M +2 -2 libcapture/Makefile.am 1.9 M +3 -3 libcapture/feeder.cpp 1.4 M +4 -2 libcapture/feeder.h 1.5 M +6 -1 libcapture/pkgmanager.cpp 1.18 M +3 -2 libcapture/pkgmanager.h 1.13 M +3 -3 libkapture/acqprogress.cpp 1.12
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - brand new SummaryView widget, to replace the old OperationMenu - add KActions for update, upgrade, etc.; toolbar is just experiment - add getStats method to PkgCache, computing stats for SummaryView - call refresh () on Watchers just after rebuild () - rehash TODO Alibkapture/summaryview.cpp 1.1 [no copyright] Alibkapture/summaryview.h 1.1 [UNKNOWN] Alibkapture/summaryviewui.ui 1.1 M +94 -101 TODO 1.21 M +6 -0 debian/changelog 1.4 M +14 -16kapture/kapture.cpp 1.10 M +2 -2 kapture/kapture.h 1.6 M +7 -2 kapture/kaptureui.rc 1.2 M +0 -3 libcapture/feeder.h 1.6 M +22 -0 libcapture/pkgcache.cpp 1.19 M +12 -0 libcapture/pkgcache.h 1.16 M +2 -1 libcapture/pkgmanager.cpp 1.19 M +2 -1 libkapture/Makefile.am 1.11
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - move watcher (de)registration to Watcher con/destructor respectively: avoid whole class of bugs from forgotten (de)registration - new: tree optimization - remove empty branchnodes - new: section grouper creates multi-level hierarchy (for eg. contrib) - make PkgNodeView use Safe*Iterator, fix crash obey refresh/rebuild - change the SummaryView widget a bit (add more stats, etc.) - silence some warnings (non-virtual destructors return w/o value) M +1 -1 TODO 1.22 M +2 -2 libcapture/depgroupers.cpp 1.3 M +4 -0 libcapture/feeder.h 1.7 M +10 -3 libcapture/grouper.cpp 1.7 M +1 -1 libcapture/grouper.h 1.6 M +1 -0 libcapture/pkgcache.cpp 1.20 M +2 -0 libcapture/pkgcache.h 1.17 M +4 -0 libcapture/pkgmanager.cpp 1.20 M +2 -0 libcapture/pkgmanager.h 1.14 M +0 -2 libcapture/safeiterators.cpp 1.2 M +2 -1 libcapture/safeiterators.h 1.2 M +19 -2 libcapture/tree.cpp 1.3 M +1 -0 libcapture/tree.h 1.3 M +0 -1 libcapture/treebranchnode.cpp 1.3 M +1 -0 libkapture/listtreeview.cpp 1.6 M +15 -4 libkapture/listtreeviewui.ui 1.2 M +1 -1 libkapture/listtreewidget.cpp 1.6 M +2 -2 libkapture/nodeview.cpp 1.2 M +16 -16libkapture/pkgnodeview.cpp 1.13 M +6 -6 libkapture/pkgnodeview.h 1.4 M +4 -1 libkapture/summaryview.cpp 1.2 M +217 -107 libkapture/summaryviewui.ui 1.2 M +1 -0 libkapture/treeview.cpp 1.2
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
Fix sort order in acqprogress. Yay, we are getting there =).
M +1 -2 TODO 1.23
M +12 -11libkapture/acqprogress.cpp 1.13
M +2 -2 libkapture/acqprogress.h 1.9
--- kdenonbeta/kdedebian/kapture/TODO #1.22:1.23
@@ -71,6 +71,5 @@
::: 0.3 (prealfa) :::
- FINISH ACQPROGRESS IMPL IN LIBKAPTURE [done: 50%]
-
+ FINISH ACQPROGRESS IMPL IN LIBKAPTURE [done: 60%]
IMPLEMENT PACKAGEMANAGER (PM) INTERFACE [done: 50%]
--- kdenonbeta/kdedebian/kapture/libkapture/acqprogress.cpp #1.12:1.13
@@ -45,4 +45,5 @@ kapture::AcqStatus::Item::Item (QListVie
setText (2, SizeToStr (item . Owner - FileSize) . c_str () + QString
(B));
setText (3, item . Description . c_str ());
+// cerr create: id = item . Owner - ID , myId = m_item
. Owner - ID endl;
if (hit)
setText (0, Hit);
@@ -73,11 +74,11 @@ kapture::AcqStatus::Item::~Item ()
// AcqStatus::Item::compare - item comparison /* {{{ */
// -
-int kapture::AcqStatus::Item::compare (QListViewItem *i, int col, bool ascend)
+int kapture::AcqStatus::Item::compare (QListViewItem *i, int col, bool ascend)
const
{
-int id = ((Item *) i) - m_id;
-//if (ascend)
-return (m_id = id) - (m_id = id);
-//else
-//return (m_id = id) - (m_id = id)
+int id1 = m_item . Owner - ID;
+int id2 = ((Item *) i) - m_item . Owner - ID;
+// cerr compare: descr1 = m_item . Description , descr2 =
((Item *) i) - m_item . Description endl;
+// cerr compare: id1 = id1 , id2 = id2 endl;
+return (id1 = id2) - (id1 = id2);
}
/* }}} */
@@ -162,9 +163,9 @@ void kapture::AcqStatus::Item::paintCell
kapture::AcqStatus::Item *kapture::AcqStatus::findItem (pkgAcquire::ItemDesc
Itm)
{
-cerr find item: ID =
+/* cerr find item: ID =
Itm . Owner - ID
; result =
(void *)m_items [Itm . Owner - ID]
- endl;
+ endl; */
return m_items [Itm . Owner - ID];
}
@@ -180,5 +181,5 @@ kapture::AcqStatus::AcqStatus(QWidget *p
addColumn (Size);
addColumn (Description);
-// setSorting( -1, false );
+setSorting (1);
setColumnWidth (0, 120);
setColumnWidth (1, 180);
@@ -214,7 +215,7 @@ void kapture::AcqStatus::Start()
void kapture::AcqStatus::IMSHit(pkgAcquire::ItemDesc Itm)
{
+Itm . Owner - ID = ID ++;
Item *i = new Item (this, Itm, true);
i - setProgress (100);
-ID ++;
m_items . push_back (i);
Update = true; // XXX what?
--- kdenonbeta/kdedebian/kapture/libkapture/acqprogress.h #1.8:1.9
@@ -42,5 +42,5 @@ namespace kapture {
int column, int width, int alignment);
virtual ~Item ();
-virtual int compare (QListViewItem *i, int col, bool
ascend);
+virtual int compare (QListViewItem *i, int col, bool
ascend) const;
virtual void pulse (pkgAcquire::Worker *);
};
kdenonbeta/kdedebian/kapture/libkapture
CVS commit by mornfall: - implement AcqProgress::Fail () [not tested yet] - fix the summary widget (widget naming fuckage happened) - make the AcqProgress scroll down as items are added; YAY! :) M +26 -27acqprogress.cpp 1.14 M +4 -4 summaryview.cpp 1.3 M +9 -9 summaryviewui.ui 1.3
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - add KNOWN BUGS to README - fix PkgNodeViewCommon layout - improved AcqProgress quite a bit (progressbars now work, Hits/Gets are displayed as well) M +4 -2 README 1.9 M +2 -0 libcapture/depgroupers.cpp 1.2 M +2 -0 libcapture/feeder.cpp 1.3 M +66 -63libkapture/acqprogress.cpp 1.10 M +6 -13 libkapture/acqprogress.h 1.8 M +4 -0 libkapture/errordialog.cpp 1.2 M +272 -379 libkapture/pkgnodeviewcommonui.ui 1.4
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Start the work on making extState handling optional in libcapture. For now this means it can be disabled at PkgCache construction time. Also started to implement methods to shield PkgCache user from effects of this schizophreny in the class (for now it means package state querying, will add others on as-needed basis). M +46 -8 libcapture/pkgcache.cpp 1.17 M +5 -1 libcapture/pkgcache.h 1.15 M +12 -20libkapture/listtreewidget.cpp 1.5
kdenonbeta/kdedebian/kapture/libkapture
CVS commit by mornfall: Add missing files. They got lost in some commit few days ago. Aww. Aerrordialog.cpp 1.1 [no copyright] Aerrordialog.h 1.1 [UNKNOWN]
kdenonbeta/kdedebian/kapture [POSSIBLY UNSAFE]
CVS commit by mornfall: - update TODO - start to sort out the package installation mess - start to use _error for error reporting (hm, will need some support for real-time warning/error display...) M +5 -1 TODO 1.19 M +77 -70libcapture/pkgmanager.cpp 1.15 [POSSIBLY UNSAFE: printf] M +4 -0 libcapture/pkgmanager.h 1.10 M +1 -1 libkapture/Makefile.am 1.9 M +8 -0 libkapture/kapturemanager.cpp 1.11 M +4 -1 libkapture/kapturemanager.h 1.7
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall:
Fix few debtags-related crashes (startup without debtags, empty
debtags filter).
M +7 -3 filters.cpp 1.4
M +7 -10 pkgmanager.cpp 1.14
--- kdenonbeta/kdedebian/kapture/libcapture/filters.cpp #1.3:1.4
@@ -131,4 +131,5 @@ MAKE_GROUPER_FACTORY (PkgTagFilter)
PkgTagFilter::PkgTagFilter (const argmap a)
{
+m_filter = false;
argmap::const_iterator found = a . find (string);
if (found != a . end ()) {
@@ -144,6 +145,7 @@ PkgTagFilter::PkgTagFilter (const argmap
/* for (OpSet string::iterator i = m_items . begin (); i != m_items
. end (); i ++)
cerr have item in m_items: *i endl; */
+if (m_expr)
m_filter = true;
-} else m_filter = false;
+};
}
/* }}} */
@@ -156,5 +158,7 @@ bool PkgTagFilter::filterCondition (Feed
cerr evaling on tagset: ;
for (OpSet string::const_iterator i = t - */
-return m_expr - eval (t ? *t : OpSet string ());
+if (t)
+return m_expr - eval (*t);
+else return true;
/* if (m_expr - eval (t ? *t : OpSet string ()))
return true;
--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp #1.13:1.14
@@ -155,6 +155,11 @@ bool PkgManager::loadTags ()
m_tagColl = new TagCollection std::string;
-// XXX check for presence!
-// XXX allow updates
+if (access (/var/lib/debtags/implications, R_OK)
+|| access (/var/lib/debtags/derived-tags, R_OK)
+|| access (/var/lib/debtags/package-tags, R_OK))
+{
+cerr WARNING: could not open tags database; please run update
endl;
+return false;
+}
FilterChainstring inp;
@@ -174,17 +179,9 @@ bool PkgManager::loadTags ()
capture::TagcollBuilder string builder (m_tagColl);
-// TagcollConsumer *cons = builder;
inp . setConsumer (builder);
loadTagColl (/var/lib/debtags/package-tags, merger);
merger . output (inp);
-// *m_tagColl = builder - collection ();
PkgCacheTagcollBuilder cacheTags (m_cache);
m_tagColl - output (cacheTags);
-/* {
-OpSet string items;
-items = m_tagColl - getAllItems ();
-for (OpSet string::iterator i = items . begin (); i != items . end
(); i ++)
-cerr have item in m_items: *i endl;
-} */
notifyRebuild ();
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - update TODO - yet another status display fix (hm, seems to work, finally) - fixes in pkgcache.cpp: - there were spurious conflicts when multiple versions of package were installed and their conflicts were different: the non-candidate version was considered as well in reverse-conflicts - the extstate init function had wrong idea of already installed; rc status packages were considered wanted as well - extstate init wrongly called processPriAgents instead of updateAWanted - some libkapture AcqStatus work (nothing groundbreaking though) M +10 -8 TODO 1.17 M +33 -78libcapture/pkgcache.cpp 1.16 M +1 -0 libcapture/pkgcache.h 1.14 M +23 -6 libkapture/acqprogress.cpp 1.8 M +4 -1 libkapture/acqprogress.h 1.7 M +11 -7 libkapture/listtreewidget.cpp 1.4 M +13 -12libkapture/pkgnodeview.cpp 1.10
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - TODO: update + some reprioritization - debian/changelog: new build for kalyxo archive - debian/compat: add to the repo (hmm... should i?) - implement (well, fix, it was mostly done already) debtags update in terms of libapt-pkg fetcher interface; works now, uses the standard AcqProgress from libkapture without too many problems (apart from that AcqProgress is a bit broken right now ;p) - fix crash in AcqProgress Adebian/compat 1.1 M +32 -16TODO 1.18 M +6 -0 debian/changelog 1.3 M +4 -1 libcapture/pkgmanager.cpp 1.13 M +7 -5 libcapture/pkgtags.cpp 1.3 M +1 -0 libcapture/pkgtags.h 1.3 M +2 -1 libkapture/acqprogress.cpp 1.9
kdenonbeta/kdedebian/kapture/libcapture [POSSIBLY UNSAFE]
CVS commit by mornfall: More debtags work. Compiles, still not tested. Borrowed some files from debtags source by Enrico Zini. This needs large refactoring, unfortunately. Expect more work in this department... ADebDBParser.cc 1.1 [LGPL] ADebDBParser.h 1.1 [GPL (v2+)] AVocabulary.cc 1.1 [POSSIBLY UNSAFE: printf] [GPL (v2+)] AVocabulary.h 1.1 [GPL (v2+)] AZlibParserInput.cc 1.1 [LGPL] AZlibParserInput.h 1.1 [LGPL] M +2 -1 Makefile.am 1.8 M +69 -40pkgtags.cpp 1.2 M +3 -0 pkgtags.h 1.2
kdenonbeta/kdedebian/kapture [POSSIBLY UNSAFE]
CVS commit by mornfall: - fix the package status display (will be removed/installed) - fix the annoying PKG tab titles (use package name instead) - start the extended state init routine (should work, but will need progress meter or sth, as on my machine it takes like 70 seconds... aww; otherwise, it seems to work quite well, still needs some fixes in pkgcache.cpp (python is triggering a situation where wanted == unwanted) M +2 -2 kapture/kapture.cpp 1.9 M +22 -0 libcapture/pkgcache.cpp 1.14 M +1 -0 libcapture/pkgcache.h 1.13 M +1 -0 libcapture/pkgmanager.cpp 1.12 M +1 -1 libkapture/listtreewidget.cpp 1.3 M +8 -4 libkapture/pkgnodeview.cpp 1.9 [POSSIBLY UNSAFE: printf]
kdenonbeta/kdedebian/kast
CVS commit by mornfall: Welcome the KaST: Kalyxo System Tools The kast system is based on the debconf Debian configuration framework. It should work quite like progeny configlets. Kastlib is the layer between debconf protocol and your code... For now, it includes transparent handling of debconf variables and lists/dictionaries on top of debconf. NOTE: The library is subject to change as we need different features in our ongoing frontend and backend work. AREADME 1.1 Akastlib.py 1.1 Akastlib.templates 1.1 Akasttest.py 1.1
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - update README with some propaganda talk (and possibly some useful info) - update TODO - implement Changed filter (to show packages which changed a_wanted in this session) - make PkgCache::updateAWanted do what it should (ie, mark appropriate packages as a_wanted); still needs cleanup implementation - implement PkgCache::applyAWanted - more debug in PkgManager::_commit - use CommitStatus class in PkgCache and provide KDE implementation in KaptureManager - make the progress dialog use setModal, instead of exec () and single shot timer (oh my, i should read docs better next time ;p) - reflect the a_wanted status in ListTreeWidget M +50 -6 README 1.8 M +3 -3 TODO 1.15 M +14 -0 libcapture/filters.cpp 1.3 M +14 -0 libcapture/filters.h 1.4 M +1 -0 libcapture/grouper.cpp 1.5 M +51 -5 libcapture/pkgcache.cpp 1.12 M +26 -6 libcapture/pkgmanager.cpp 1.10 M +4 -3 libcapture/pkgmanager.h 1.9 M +6 -5 libkapture/acqprogress.cpp 1.7 M +31 -25libkapture/kapturemanager.cpp 1.9 M +17 -3 libkapture/kapturemanager.h 1.5 M +3 -0 libkapture/listtreeview.cpp 1.3 M +14 -2 libkapture/listtreewidget.cpp 1.2 M +1 -1 libkapture/operationmenu.cpp 1.4
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall: Another set of improvements for pkgcache.cpp. The AMAS can now handle most situations gracefully. There are still corner cases (which are solved, but in insanely long time), but they are reasonably uncommon now (and mostly related to broken input -- ie b0rked packages that conflict with well everything else). Also, substantial speedup again, as i eliminated a nasty bug that caused irrelevant reverse-depends to be taken into account (which also caused severe problems with certain dependency subgraphs). M +17 -8 pkgcache-test.cpp 1.11 M +103 -130 pkgcache.cpp 1.11 M +11 -5 pkgcache.h 1.12
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: update TODO M +27 -24TODO 1.14
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall: - remove loads of obsolete code - make it a bit more readable (ie clean up a bit - add madison-lite to pkgcache-test as it should manifest the libdigest-md5-perl problem (which it does not, i guess it's because of the delay optimization; i'm however not sure whether this 100% solves the problem, so it needs some testing or even reasoning why it did (not) solve it) M +2 -0 pkgcache-test.cpp 1.9 M +0 -198pkgcache.cpp 1.9 M +39 -43pkgcache.h 1.10
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: fix the breakage from last commit, ie: compile! M +1 -1 libcapture/pkgcache-test.cpp 1.10 M +12 -30libcapture/pkgcache.cpp 1.10 M +3 -3 libcapture/pkgcache.h 1.11 M +2 -3 libkapture/pkgnodeview.cpp 1.7
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Slight cleanups and commenting in pkgcache.cpp. We have a nasty bug there, which i'm not sure how to deal with... Laters. Also fixed libkapture/pkgnodeview.cpp so it links and works again with recent libcapture modifications. M +8 -8 libcapture/pkgcache-test.cpp 1.8 M +17 -61libcapture/pkgcache.cpp 1.7 M +1 -1 libcapture/pkgcache.h 1.8 M +4 -2 libkapture/pkgnodeview.cpp 1.6
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Further improvements in the pkgcache.cpp priority handling code. We now compute wanted and unwanted priorities separately, in 2 independent (agent) runs. This should help reduce number of computations. Also, i changed way that packages are picked to satisfy depends. The criterion now is maximal (wanted_pri - unwanted_pri) as opposed to minimal unwanted_pri as previously. This fixes some symptoms of the provides problem (however it doesn't solve the root of the problem i believe)... M +1 -1 TODO 1.13 M +6 -6 libcapture/pkgcache-test.cpp 1.7 M +114 -42 libcapture/pkgcache.cpp 1.6 M +13 -4 libcapture/pkgcache.h 1.7
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Reworked the libcapture/pkgcache.cpp priority-computing algorithm substantially. It now uses a multi-agent system, where the system rebalances itself after a change (that introduces instability). The nodes are individual packages, the agents are simple, reactive: when run, they compute their priorities and when the result is different than the old priority, they notify their neighbours. Still not perfect, but work is underway to improve it. Thanks go to Kevin Ottens for help with underlying theory and for ideas with implementation. Also fixed the pkgnodeview, so you can actually try out the new code. Checking a package for installation will change the status of all needed (depended-upon) packages to will install. Try it! However, unchecking the item again won't un-mark all the packages, as it should, but this is a known bug. M +1 -1 TODO 1.12 M +1 -0 kapture/kapture.cpp 1.7 M +5 -4 libcapture/pkgcache-test.cpp 1.6 M +368 -173 libcapture/pkgcache.cpp 1.5 M +44 -11libcapture/pkgcache.h 1.6 M +4 -1 libcapture/pkgmanager.cpp 1.9 M +22 -7 libkapture/pkgnodeview.cpp 1.5 M +1 -1 part/kapture_part.cpp 1.3
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
- add a prerequisites section to readme
- fix typo in libkapture/pkgnodeview.cpp
M +7 -0 README 1.7
M +1 -1 libkapture/listtreeview.cpp 1.2
M +1 -1 libkapture/pkgnodeview.cpp 1.4
--- kdenonbeta/kdedebian/kapture/README #1.6:1.7
@@ -4,4 +4,11 @@
(or maybe something else...)
+PREREQUISITES
+You need libtagcoll-dev debian package (or equivalent for other distributions)
+and libapt-pkg-dev to build kapture. I have at least one report from rpm-based
+system user, who said kapture compiles and runs for him (after commenting out
+the loadTags () from libcapture/pkgmanager.cpp, PkgManager constructor, as
+there is no debtags system on Arklinux)... Hello rasta :).
+
SUPPORT FOR KDE 3.1 WAS SCRAPPED DUE TO AUTOTOOLS PROBLEMS
YOU NEED KDE 3.2
--- kdenonbeta/kdedebian/kapture/libkapture/listtreeview.cpp #1.1:1.2
@@ -41,5 +41,5 @@ void ListTreeView::filterStringChanged (
kdDebug () ListTreeView::filterStringChanged ( text );
endl;
argmap a;
-a [string] = std::string (text);
+a [string] = std::string (text.utf8 ());
m_quickGrouper - setArgs (a);
}
--- kdenonbeta/kdedebian/kapture/libkapture/pkgnodeview.cpp #1.3:1.4
@@ -205,5 +205,5 @@ void PkgNodeViewCommon::setWanted (bool
{
PkgCache::ExtState *st = (PkgManager::cache ()) - extState (m_pkg);
-st - a_wanted = w;
+st - u_wanted = w;
PkgManager::notifyRefresh ();
}
kdenonbeta/kdedebian/kapture/libkapture
CVS commit by mornfall:
Make the progress dialog more reasonable (but it's still broken).
M +12 -8 acqprogress.cpp 1.5
--- kdenonbeta/kdedebian/kapture/libkapture/acqprogress.cpp #1.4:1.5
@@ -156,5 +156,8 @@ kapture::AcqStatus::AcqStatus(QWidget *p
void kapture::AcqStatus::Done(pkgAcquire::ItemDesc Itm)
{
- Update = true;
+Item * i = m_items [Itm . Owner - ID - 1];
+cerr done item with ID = Itm . Owner - ID - 1 i =
(void *)i endl;
+if (i)
+i - setProgress (100);
};
/*}}}*/
@@ -184,5 +187,5 @@ void kapture::AcqStatus::IMSHit(pkgAcqui
Item *i = new Item (0, this, 0 /*previous item?*/,
QString (SizeToStr (Itm.Owner - FileSize) . c_str ()) + QString
(B),
-/* QString (Itm . Owner - ID) + */ QString (Itm.Description .
c_str ()));
+/* QString (Itm . Owner - ID) + */ QString (Itm.Description .
c_str ()) + (HIT));
i - setProgress (100);
// m_lastItem = i;
@@ -209,6 +212,4 @@ void kapture::AcqStatus::Fetch(pkgAcquir
return;
-cerr fetch called... endl;
-
Itm.Owner-ID = ID++;
@@ -217,4 +219,5 @@ void kapture::AcqStatus::Fetch(pkgAcquir
/* QString (Itm . Owner - ID) + */ QString (Itm.Description .
c_str ()));
m_items . push_back (i);
+cerr fetch called on ID = ID - 1 i = (void *)i endl;
/* cout _(Get:) Itm.Owner-ID ' ' Itm.Description;
* if (Itm.Owner-FileSize != 0)
@@ -283,13 +286,14 @@ bool kapture::AcqStatus::Pulse(pkgAcquir
pkgAcquireStatus::Pulse(Owner);
- /* XXX FIX for (pkgAcquire::Worker *I = Owner-WorkersBegin(); I != 0;
+ for (pkgAcquire::Worker *I = Owner-WorkersBegin(); I != 0;
I = Owner-WorkerStep(I))
{
if (I - CurrentItem) {
- Item *i = m_items [I - ID];
+ Item *i = m_items [I - CurrentItem - Owner - ID - 1];
+cerr refreshing item with ID = I - CurrentItem - Owner
- ID i = (void *)i endl;
if (i)
i - setProgress (long (double (I - CurrentSize * 100.0) /
double (I-TotalSize)));
}
- } */
+ }
KApplication::kApplication () - processEvents ();
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Improve debian packaging, add ChangeLog (compilation fails without it it seems). AChangeLog 1.1 M +6 -0 debian/changelog 1.2 M +54 -5 debian/control 1.2 M +0 -2 debian/kapture.install 1.2 M +1 -0 debian/libcapture-dev.install 1.2 M +2 -2 debian/libcapture0.install 1.2 M +1 -0 debian/libkapture-dev.install 1.2 M +2 -2 debian/libkapture0.install 1.2
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: add missing file (hopefuly the right one this time) Akaptureiface.h 1.3 [no copyright]
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall:
Split the big grouper.{h,cpp} files into better-digestable pieces. It
compiles, but segfaults for me right now (i guess this is an older bug,
since i have a dist-upgrade running in background), i'll investigate
later.
Afilters.cpp 1.1 [LGPL (v2+)]
Afilters.h 1.1 [LGPL (v2+)]
M +2 -1 Makefile.am 1.5
M +2 -319grouper.cpp 1.3
M +0 -123grouper.h 1.3
M +2 -1 pkggroup.h 1.3
kdenonbeta/kdedebian/kapture/libcapture
CVS commit by mornfall: Whoops, add the forgotten files... Adepgroupers.cpp 1.1 [LGPL (v2+)] Adepgroupers.h 1.1 [LGPL (v2+)]
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - lots of renaming fun (PkgTree - Tree, PkgTreeNode - TreeNode, PkgTreeItem - TreePkgNode, PkgSubTree - TreeBranchNode, Pkg*Grouper* - *Grouper*, PkgFeeder - Feeder, PkgTreeFactory - TreeFactory), should clarify things a bit - lot of work done on the priority package-selection stuff in capture::PkgCache, it mostly works as intended now (test it with libcapture/pkgcache-test) - start work on PkgGroup concept (for creating groups of packages in the tree, installable together) - first try on more human-parseable Grouper and GrouperChain marshaller - move capture::argmap decl to stl_util.h, make argmap (de)marshaller delimeters user-selectable - update TODO - other minor changes, i am really short on time now (as i write this), i hope i didn't break it too much and see ya :) CCMAIL: [EMAIL PROTECTED] Alibcapture/feeder.cpp 1.1 [no copyright] Alibcapture/feeder.h 1.1 [LGPL (v2+)] Alibcapture/grouper.cpp 1.1 [LGPL (v2+)] Alibcapture/grouper.h 1.1 [LGPL (v2+)] Alibcapture/pkggroup.cpp 1.1 [LGPL (v2+)] Alibcapture/pkggroup.h 1.1 [LGPL (v2+)] Alibcapture/tree.cpp 1.1 [LGPL (v2+)] Alibcapture/tree.h 1.1 [LGPL (v2+)] Alibcapture/treebranchnode.cpp 1.1 [LGPL (v2+)] Alibcapture/treebranchnode.h 1.1 [LGPL (v2+)] Alibcapture/treefactory.h 1.1 [LGPL] Alibcapture/treegroupnode.cpp 1.1 [LGPL (v2+)] Alibcapture/treegroupnode.h 1.1 [LGPL (v2+)] Alibcapture/treenode.cpp 1.1 [LGPL (v2+)] Alibcapture/treenode.h 1.1 [LGPL (v2+)] Alibcapture/treepkgnode.cpp 1.1 [LGPL (v2+)] Alibcapture/treepkgnode.h 1.1 [LGPL (v2+)] Alibkapture/detailview.cpp 1.1 [no copyright] Alibkapture/detailview.h 1.1 [UNKNOWN] Apart/kapturepart.desktop 1.1 Apart/kapturepart_shell.rc 1.1 M +26 -1 TODO 1.7 M +7 -7 kapture/kapture.cpp 1.5 M +6 -3 libcapture/Makefile.am 1.3 M +15 -11libcapture/pkgcache-test.cpp 1.2 M +226 -106 libcapture/pkgcache.cpp 1.2 M +9 -3 libcapture/pkgcache.h 1.2 M +1 -1 libcapture/pkgitem.h 1.2 M +3 -3 libcapture/pkgmanager.cpp 1.3 M +1 -1 libcapture/pkgmanager.h 1.3 M +20 -11libcapture/stl_util.cpp 1.3 M +6 -5 libcapture/stl_util.h 1.2 M +2 -0 libkapture/.cvsignore 1.2 M +2 -1 libkapture/Makefile.am 1.4 M +9 -9 libkapture/kapturemanager.cpp 1.3 M +7 -7 libkapture/kapturemanager.h 1.3 M +7 -7 libkapture/pkgdetails.cpp 1.3 M +9 -9 libkapture/pkgdetails.h 1.3 M +51 -39libkapture/pkglist.cpp 1.3 M +17 -17libkapture/pkglist.h 1.3 M +7 -7 libkapture/pkglistview.cpp 1.3 M +8 -8 libkapture/pkglistview.h 1.3 M +4 -4 libkapture/pkgview.cpp 1.3 M +12 -12libkapture/pkgview.h 1.3 M +9 -9 part/partview.cpp 1.3 M +4 -4 part/partview.h 1.3 Rlibcapture/pkgfeeder.cpp 1.1 Rlibcapture/pkgfeeder.h 1.2 Rlibcapture/pkggrouper.cpp 1.2 Rlibcapture/pkggrouper.h 1.2 Rlibcapture/pkgsubtree.cpp 1.2 Rlibcapture/pkgsubtree.h 1.2 Rlibcapture/pkgtree.cpp 1.2 Rlibcapture/pkgtree.h 1.2 Rlibcapture/pkgtreefactory.h 1.1 Rlibcapture/pkgtreeitem.cpp 1.1 Rlibcapture/pkgtreeitem.h 1.1 Rlibcapture/pkgtreenode.cpp 1.2 Rlibcapture/pkgtreenode.h 1.1
kdenonbeta/kdedebian/kapture [POSSIBLY UNSAFE]
CVS commit by mornfall: - created new directory layout (see below) - implement generic group-creating grouper (PkgGroupGrouper) - reimplement PkgSectGrouper on top of PkgGroupGrouper - implement proper PkgDepGrouper on top of PkgGroupGrouper - implement PkgDepTGrouper to group dependencies by their type (Depends, Recommends, Suggests, Conflicts) - implement PkgDepEndGrouper, an interface between IterDepend and IterPackage type groupers (uses PkgSimpleFeeder for now, doesn't support AllTargets, ie only SmartTargetPkg is shown) - add constructTreeRoot () to PkgTreeFactory for creation of (now semi-special) root element of the tree - make PkgDetails manage pkgRecords::Parser for current version and pass it around to it's children - make PkgDetails KJanusWidget (with IconList face for now) - implement first version of AcqStatus GUI, based on KMails ImapProgressDialog DIRECTORIES (from README) libcapture/ -- set of generic data structures and algorithms for APT frontend building; will include all the code for building package trees, filtering, package download and installation, debtags and similar libkapture/ -- library of UI elements building on top of libcapture; will include tree and icon view of packages, UI for managing filters and groupers, UI for showing package details (using januswidget), package installation wizard, progress widgets and more (TODO) pkgpart/ -- simple kpart built on top of libkapture: allows for viewing one package and installing it; should use support of local repository from libcapture (XXX: needed?) part/ -- more complex kpart showing an operationmenu, a set of package views (tabbed with operationmenu), one packagedetails view and forward/back buttons for navigation kapture/ -- complex UI built on top of libkapture using kmdi; sports a set of package views in form of toolviews, arbitrary number of detail views in form of document views (ie tabbed, childframe or toplevel) and operationmenu toolview KMDI I started to work on KMDI face for kapture. It turned out it's not feasible to make MDI KPart, so i finally factored the code into proper libs/modules. Now we have multiple faces for kapture, see above. With this commit, the code is a bit confused... In kapture/, there lives the kpart shell as used in earlier versions. This will be moved into part/ and kapture/ will be created from the ground up as KMdi face for libkapture. It won't use the part/ or pkgpart/, but will be complementing these. It will be the full-blown interface with support for all the fancy layout and multi-view stuff we want. If you seek simple and still quite useable interface, take a look at part/. I will try to keep part/ up-to-date, but well, it's not the main focus now. If you would like to help maintaining it, you're welcome. BUILDING WITH KDE 3.1 (from README) You will need to get a copy of qextmdi source from kdevelop cvs in kdevelop/lib/qextmdi. Put it to this source directory under name qextmdi and run patch -p0 qextmdi.diff. This should make it possible to compile and run kapture under KDE 3.1. Your mileage may vary. You are welcome to report problems. CCMAIL: [EMAIL PROTECTED] Aqextmdi.diff 1.1 Alibcapture/.cvsignore 1.1 Alibcapture/Makefile.am 1.1 Alibcapture/pkgfeeder.cpp 1.1 [no copyright] Alibcapture/pkgfeeder.h 1.1 [LGPL (v2+)] Alibcapture/pkggrouper.cpp 1.1 [LGPL (v2+)] Alibcapture/pkggrouper.h 1.1 [LGPL (v2+)] Alibcapture/pkgitem.h 1.1 [LGPL (v2+)] Alibcapture/pkgmanager.cpp 1.1 [LGPL (v2+)] Alibcapture/pkgmanager.h 1.1 [LGPL (v2+)] Alibcapture/pkgsubtree.cpp 1.1 [LGPL (v2+)] Alibcapture/pkgsubtree.h 1.1 [LGPL (v2+)] Alibcapture/pkgtree.cpp 1.1 [LGPL (v2+)] Alibcapture/pkgtree.h 1.1 [LGPL (v2+)] Alibcapture/pkgtreefactory.h 1.1 [LGPL] Alibcapture/pkgtreeitem.cpp 1.1 [LGPL (v2+)] Alibcapture/pkgtreeitem.h 1.1 [LGPL (v2+)] Alibcapture/pkgtreenode.cpp 1.1 [LGPL (v2+)] Alibcapture/pkgtreenode.h 1.1 [LGPL (v2+)] Alibcapture/stl_util.cpp 1.1 [LGPL (v2+)] Alibcapture/stl_util.h 1.1 [LGPL (v2+)] Alibkapture/.cvsignore 1.1 Alibkapture/Makefile.am 1.1 Alibkapture/acqprogress.cpp 1.1 [POSSIBLY UNSAFE: printf] [no copyright] Alibkapture/acqprogress.h 1.1 [no copyright] Alibkapture/kaptureconfig.cpp 1.1 [no copyright] Alibkapture/kaptureconfig.h 1.1 [UNKNOWN] Alibkapture/kaptureconfigbase.kcfgc 1.1 Alibkapture/kapturemanager.cpp 1.1 [no copyright] Alibkapture/kapturemanager.h 1.1 [UNKNOWN] Alibkapture/operationmenu.cpp 1.1 [no copyright] A
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: - start of package status display (shows Keep or Install for now) - add upgrade functionality (marks upgradable packages as Install for now) We are nearing status, where kapture can do most of the tasks of apt-cache and apt-get. We are not yet there however. The missing bits are: - commiting changes (ie, the install/upgrade/whatever run) - progress information - single package operations (install this package, remove this package) Implementing these shouldn't be hard. The problem is, that this is inadequate in interactive environment = we need to track wanted status in addition to apt-pkg status. Also, we possibly want to save this status for next runs. However, this long-term status modifies the involved algorithms slightly, so we'll see... However, this should only mean incremental modifications and improvements, no major revampings. M +6 -1 kapture_part.cpp 1.9 M +1 -0 kapture_part.h 1.4 M +1 -0 operationmenu.cpp 1.2 M +12 -0 pkglist.cpp 1.12 M +1 -0 pkglist.h 1.10 M +7 -0 pkgmanager.cpp 1.5 M +15 -3 pkgsubtree.cpp 1.6 M +1 -0 pkgsubtree.h 1.7 M +7 -0 pkgtree.cpp 1.10 M +1 -1 pkgtree.h 1.7 M +1 -1 pkgtreeitem.cpp 1.7 M +2 -2 pkgtreeitem.h 1.9 M +1 -1 pkgtreenode.h 1.12
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: - fix dependency view (a bit) - still doesn't use PkgDepFeeder as it should (and PkgDepFeeder is crippled right now) - make it possible to mark packages for (de)installation - via sucky combobox in the PkgDetailsCommon (UI suggestions anyone?) NOTE: setting package to install won't mark it's depends for install; darn... will investigate CCMAIL: [EMAIL PROTECTED] M +12 -1 mainview.cpp 1.6 M +2 -0 pkgdetails.cpp 1.5 M +14 -0 pkgdetailscommon.cpp 1.3 M +1 -0 pkgdetailscommon.h 1.3 M +106 -75 pkgdetailscommonui.ui 1.4 M +16 -0 pkgfeeder.cpp 1.3 M +9 -1 pkgfeeder.h 1.3 M +3 -3 pkglist.cpp 1.13 M +0 -8 pkglistview.cpp 1.4 M +3 -3 pkgmanager.cpp 1.6 M +5 -1 pkgmanager.h 1.5 M +2 -1 pkgsubtree.cpp 1.7 M +3 -1 pkgtree.cpp 1.11
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: make PkgManager into singleton M +1 -1 Makefile.am 1.6 M +1 -2 kapture_part.cpp 1.8 M +2 -12 mainview.cpp 1.5 M +0 -3 mainview.h 1.4 M +1 -1 pkgfeeder.cpp 1.2 M +1 -3 pkgfeeder.h 1.2 M +2 -10 pkglist.cpp 1.11 M +0 -3 pkglist.h 1.9 M +6 -8 pkglistview.cpp 1.3 M +0 -2 pkglistview.h 1.3 M +6 -4 pkgmanager.cpp 1.4 M +35 -7 pkgmanager.h 1.4 M +2 -13 pkgtree.cpp 1.9 M +0 -3 pkgtree.h 1.6 M +2 -0 pkgtreenode.h 1.11 M +1 -6 pkgview.cpp 1.7 M +0 -2 pkgview.h 1.5
kdenonbeta/kdedebian/kapture/kapture [POSSIBLY UNSAFE]
CVS commit by mornfall: - add support for apt-get update operation; however, the progress indicator is borrowed from apt-get for now, so you will see update progress only in terminal window you used to start kapture; needs GUI progress meter implementation (can wait) - removed PkgDepTree, as it was replaced by PkgFeeder concept (see below) - fix most of the memory leaks (thanks valgrind); comprises adding/implementing destructors where appropriate - fix bug in stl_util.cpp (domi, we both missed it; however, it was introduced by me) - reset minpos to 0 when cutting string into 2 pieces - reorganize pkggrouper.cpp, group method impls by class, use folding - fix PkgGrouperFactory's loadFromString and saveToString (they should work properly now) - fix infinite loop in PkgFilterGrouper::addPackage (when discarding package, it didn't advance the feeder to a next one) - move PkgFeeder and related stuff into pkgfeeder.h - implement PkgCacheFeeder (properly, PkgSimpleFeeder was a bit insane proof of concept) - make PkgManager notify interested objects about cache changes (only on update for now), make PkgTree use this concept (see pkgmanager.h - PkgManager::Watcher and pkgtree.h) - implement PkgSubTree tree-building for real (was marked as todo in source and methods were empty; it worked because QListViewItems build their own hierarchy) - adapt PkgTree and PkgList (from kapture) to use PkgFeeder properly - few other minor changes CCMAIL: [EMAIL PROTECTED] Aacqprogress.cc 1.1 [POSSIBLY UNSAFE: printf] [no copyright] Aacqprogress.h 1.1 [no copyright] Akapture.kcfg 1.1 Aoperationmenu.cpp 1.1 [no copyright] Apkgfeeder.cpp 1.1 [no copyright] Apkgfeeder.h 1.1 [LGPL (v2+)] M +4 -3 Makefile.am 1.5 M +12 -0 kapture_part.cpp 1.7 M +3 -0 kapture_part.h 1.3 M +9 -1 mainview.cpp 1.4 M +4 -0 mainview.h 1.3 M +7 -2 operationmenu.h 1.2 M +6 -9 operationmenuui.ui 1.2 M +7 -2 pkgdetails.cpp 1.4 M +1 -0 pkgdetails.h 1.4 M +101 -57 pkggrouper.cpp 1.11 M +5 -39 pkggrouper.h 1.13 M +16 -6 pkglist.cpp 1.9 M +3 -1 pkglist.h 1.7 M +16 -10pkglistview.cpp 1.2 M +4 -5 pkglistview.h 1.2 M +81 -4 pkgmanager.cpp 1.2 M +17 -1 pkgmanager.h 1.2 M +32 -4 pkgsubtree.cpp 1.5 M +6 -0 pkgsubtree.h 1.6 M +33 -22pkgtree.cpp 1.8 M +12 -15pkgtree.h 1.5 M +7 -0 pkgtreeitem.cpp 1.6 M +5 -0 pkgtreeitem.h 1.8 M +3 -1 pkgtreenode.h 1.10 M +1 -0 pkgview.h 1.4 M +12 -6 stl_util.cpp 1.6
kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
General:
- update TODO
- cvsignore *ui.h *ui.cpp
libcapture
- introduce capture::PkgManager (first try)
- implement capture::PkgFeeder: This class abstracts the PkgIterator
away from addPackage in grouper and enables us to feed eg. DepIterator
into grouper. This needs matching the grouper type and feeder type.
Ie, there are going to be different types of groupers and feeders,
with regards to respective IterType (see pkggrouper.h)
- unpointerize argmaps in pkggrouper.*
- add PkgGrouperFactory:: saveToString, loadFromString; saves
configuration of whole chain into a string and loads it back into
objects; needed for user-configurable chains
- add PkgCustomGrouper: creates chain from argmap-marshalled
PkgFactoryChain; usefulness of this is questionable right now (as
PkgGrouperFactory gained save/load to/from string); will see
- add stl_util.{h,cpp}: marshallers and demarshallers (ugly, fragile,
sucky) for liststring and argmap (aka mapstring,string); needed
for saving PkgGrouperFactory into string
- stab at PkgDepTree (will be obsoleted by PkgDepFeeder anyway)
- add some comments to few classes
kapture:
- add Dominique to authors list
- create kapture::MainView: TabWidget contianer grouping different
package views and the OperationMenu; should be capable of
adding/removing its views and also saving and loading them to
a KConfig (this isn't implemented yet however)
- create kapture::OperationMenu: simple menu to perform the most common
tasks (mock-up for now -- no functionality implemented yet)
- move the version combobox in PkgDetailsCommon upwards, next to package
name and highlight both Package and Version
- create generic PkgView (abstract, defines interface for PkgView's to
be used in MainView) and PkgListView implementation for this
- first stab at KConfig, kconfig_compiler, KConfigSkeleton and friends;
not functional right now, mostly skeletons
Domi: Sorry for big commit... Also, this is full of warnings and maybe
broken code... I will clean up myself, don't bother. I hope i will be
able to commit today...
CCMAIL: [EMAIL PROTECTED]
Akapture/kaptureconfig.cpp 1.1 [no copyright]
Akapture/kaptureconfig.h 1.1 [UNKNOWN]
Akapture/kaptureconfigbase.kcfgc 1.1
Akapture/mainview.cpp 1.1 [no copyright]
Akapture/mainview.h 1.1 [UNKNOWN]
Akapture/mainviewui.ui 1.1
Akapture/operationmenu.h 1.1 [UNKNOWN]
Akapture/operationmenuui.ui 1.1
Akapture/pkglistview.cpp 1.1 [no copyright]
Akapture/pkglistview.h 1.1 [UNKNOWN]
Akapture/pkglistviewui.ui 1.1
Akapture/pkgmanager.cpp 1.1 [LGPL (v2+)]
Akapture/pkgmanager.h 1.1 [LGPL (v2+)]
Akapture/stl_test.cpp 1.1 [no copyright]
Akapture/stl_util.cpp 1.1 [LGPL (v2+)]
Akapture/stl_util.h 1.1 [LGPL (v2+)]
M +2 -1 TODO 1.3
M +2 -4 kapture/.cvsignore 1.2
M +12 -5 kapture/Makefile.am 1.3
M +30 -46kapture/kapture_part.cpp 1.5
M +8 -8 kapture/kapture_part.h 1.2
M +2 -1 kapture/main.cpp 1.2
M +9 -3 kapture/pkgdetails.cpp 1.3
M +5 -3 kapture/pkgdetails.h 1.3
M +125 -75 kapture/pkgdetailscommonui.ui 1.3
M +127 -26 kapture/pkggrouper.cpp 1.9
M +81 -22kapture/pkggrouper.h 1.10
M +6 -4 kapture/pkglist.cpp 1.8
M +4 -3 kapture/pkglist.h 1.6
M +28 -9 kapture/pkgtree.cpp 1.7
M +16 -8 kapture/pkgtree.h 1.4
M +11 -0 kapture/pkgtreeitem.h 1.7
M +6 -2 kapture/pkgtreenode.h 1.9
M +5 -17 kapture/pkgview.cpp 1.6
M +12 -9 kapture/pkgview.h 1.3
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: - started commenting the classes (will continue soon... don't know when exactly) off-topic: Happy holidays to everyone! =) CCMAIL: [EMAIL PROTECTED] M +48 -10pkggrouper.h 1.7 M +12 -3 pkgtree.h 1.3 M +5 -2 pkgtreenode.h 1.6
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: - add TODO - add PkgExistGrouper (filters out ghost (no-available-version) packages) - make dealing with multiple versions saner - add version combobox to PkgDetailsCommon - make it show data for selected version - make PkgDetailsCommon use grid layout (that's what it was made for) - reorder PkgGrouperFactory constructor args and make it propagate it's parameters to child if they aren't set explicitly (eliminating the need to pass the params to all the chain members again and again) - make PkgList show current and installed versions NOTE: The code is becoming human-parseable slowly... Still, i have made up some design in my mind that's not incarnated in code yet. Stay tuned: more to come. ATODO 1.1 M +1 -0 kapture/kapture_part.cpp 1.4 M +26 -0 kapture/pkgdetails.cpp 1.2 M +9 -2 kapture/pkgdetails.h 1.2 M +58 -4 kapture/pkgdetailscommon.cpp 1.2 M +9 -2 kapture/pkgdetailscommon.h 1.2 M +287 -335 kapture/pkgdetailscommonui.ui 1.2 M +37 -2 kapture/pkggrouper.cpp 1.6 M +15 -4 kapture/pkggrouper.h 1.6 M +21 -9 kapture/pkglist.cpp 1.5 M +7 -1 kapture/pkglist.h 1.4 M +1 -0 kapture/pkgsubtree.h 1.4 M +1 -0 kapture/pkgtreeitem.h 1.5 M +1 -1 kapture/pkgtreenode.h 1.5 M +12 -2 kapture/pkgview.cpp 1.3 M +2 -0 kapture/pkgview.h 1.2 M +1 -1 kapture/pkgviewui.ui 1.3
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: - unconstify and unpointerize iterators - first stab on package details view Apkgdetails.cpp 1.1 [no copyright] Apkgdetails.h 1.1 [UNKNOWN] Apkgdetailscommon.cpp 1.1 [no copyright] Apkgdetailscommon.h 1.1 [UNKNOWN] Apkgdetailscommonui.ui 1.1 M +9 -3 Makefile.am 1.2 M +4 -4 pkggrouper.cpp 1.5 M +3 -5 pkggrouper.h 1.5 M +4 -4 pkglist.cpp 1.4 M +3 -3 pkglist.h 1.3 M +2 -2 pkgtree.cpp 1.5 M +2 -2 pkgtreeitem.cpp 1.4 M +6 -6 pkgtreeitem.h 1.4 M +1 -1 pkgtreenode.h 1.4 M +23 -19pkgviewui.ui 1.2
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: First working version of grouper. Can successfully load package list into a listview. May not compile right now... M +5 -0 kapture_part.cpp 1.2 M +86 -3 pkggrouper.cpp 1.3 M +38 -28pkggrouper.h 1.3 M +55 -0 pkglist.cpp 1.2 M +29 -6 pkglist.h 1.2 M +1 -0 pkgsubtree.h 1.3 M +22 -1 pkgtree.cpp 1.3 M +2 -1 pkgtreeitem.cpp 1.3 M +5 -7 pkgtreeitem.h 1.3 M +1 -0 pkgtreenode.h 1.3 M +3 -5 pkgview.cpp 1.2
kdenonbeta/kdedebian/kdebconf
CVS commit by mornfall: Importing the KDE DebConf frontend here... might be of some use in the KDE's CVS. There is still work to be done. There is a readme explaining how to test this (you need Debian unstable installation however). You might need to adjust directories (from the README). CCMAIL: [EMAIL PROTECTED] AREADME 1.1 ADebconf/Element/Kde.pm 1.1 ADebconf/Element/Kde/Boolean.pm 1.1 ADebconf/Element/Kde/Multiselect.pm 1.1 ADebconf/Element/Kde/Note.pm 1.1 ADebconf/Element/Kde/Password.pm 1.1 ADebconf/Element/Kde/Select.pm 1.1 ADebconf/Element/Kde/String.pm 1.1 ADebconf/Element/Kde/Text.pm 1.1 ADebconf/FrontEnd/Kde.pm 1.1 ADebconf/FrontEnd/Kde/WizardUi.pm 1.1 ADebconf/FrontEnd/Kde/WizardUi.ui 1.1
kdenonbeta/kdedebian/kapture (silent)
CVS commit by mornfall: CVS_SILENT Make it clear what this beast is... M +4 -4 README 1.2 --- kdenonbeta/kdedebian/kapture/README #1.1:1.2 @@ -1,4 +1,4 @@ -kapture v0.1 -Peter Rockai [EMAIL PROTECTED] --- -This is where you should describe why kapture is so great +KAPTURE -- the APT frontend for KDE (and more) +CAPTURE -- the library for building APT (G)UIs + Common APT UI Representation Extension + (or maybe something else...)
kdenonbeta/kdedebian/kapture
CVS commit by mornfall: Importing kapture into CVS. If you cannot read my mind, this is probably useless to you. I wanted to show that i am coding on this (and that this isn't that vapourwareish like it might seem)... It might be able to do something useful before end of the year. Watch the commits -- the very basic functionality isn't that far away. But right now, please do not bother: it won't even compile. There might be some huge design errors and all. For your sanity sake, please abstain from reading the code for now. I will tell you when it's ready to receive someone else's (ie yours -- as opposed to my own) work. CCMAIL: [EMAIL PROTECTED] A.cvsignore 1.1 AAUTHORS 1.1 ACOPYING 1.1 AINSTALL 1.1 AMakefile.am 1.1 AMakefile.cvs 1.1 ANEWS 1.1 AREADME 1.1 AVERSION 1.1 Aconfigure.in.in 1.1 Akapture/Makefile.am 1.1 Akapture/kapture.cpp 1.1 [UNKNOWN] Akapture/kapture.desktop 1.1 Akapture/kapture.h 1.1 [no copyright] Akapture/kapture_part.cpp 1.1 [no copyright] Akapture/kapture_part.desktop 1.1 Akapture/kapture_part.h 1.1 [no copyright] Akapture/kapture_part.rc 1.1 Akapture/kapture_shell.rc 1.1 Akapture/main.cpp 1.1 [no copyright] Akapture/pkggrouper.cpp 1.1 [no copyright] Akapture/pkggrouper.h 1.1 [UNKNOWN] Akapture/pkglist.cpp 1.1 [no copyright] Akapture/pkglist.h 1.1 [UNKNOWN] Akapture/pkgsubtree.cpp 1.1 [no copyright] Akapture/pkgsubtree.h 1.1 [UNKNOWN] Akapture/pkgtree.cpp 1.1 [no copyright] Akapture/pkgtree.h 1.1 [UNKNOWN] Akapture/pkgtreeitem.cpp 1.1 [no copyright] Akapture/pkgtreeitem.h 1.1 [UNKNOWN] Akapture/pkgtreenode.cpp 1.1 [no copyright] Akapture/pkgtreenode.h 1.1 [UNKNOWN] Akapture/pkgview.cpp 1.1 [no copyright] Akapture/pkgview.h 1.1 [UNKNOWN] Akapture/pkgviewui.ui 1.1
kdenonbeta/kdedebian/kapture/kapture
CVS commit by mornfall: Fix/add copyright headers (LGPL for the CAPTURE library)... Just in case. More will follow (i won't CC the list again, be not afraid). CCMAIL: [EMAIL PROTECTED] M +18 -0 pkggrouper.cpp 1.2 M +18 -7 pkggrouper.h 1.2 M +18 -0 pkgsubtree.cpp 1.2 M +17 -7 pkgsubtree.h 1.2 M +18 -0 pkgtree.cpp 1.2 M +18 -7 pkgtree.h 1.2 M +18 -0 pkgtreeitem.cpp 1.2 M +17 -7 pkgtreeitem.h 1.2 M +18 -0 pkgtreenode.cpp 1.2 M +17 -7 pkgtreenode.h 1.2
Re: Debian archive kde-3.1-beta2 paths broken
On Fri, Oct 04, 2002 at 06:27:42PM +0900, Julian Stoev wrote: Just to let you know, that the archive paths for kde-3.1-beta2 Debian packages are broken and the archive can not be used with apt in Debian. Or at least I can not figure how to use it... :( For examle currently the path (in one mirror) to the archive is http://www.ibiblio.org/pub/packages/desktops/kde/unstable/kde-3.1-beta2/Debian/woody/i386/ But according to the paths found in http://www.ibiblio.org/pub/packages/desktops/kde/unstable/kde-3.1-beta2/Debian/woody/i386/Packages.gz the packages are expected to be in http://www.ibiblio.org/pub/packages/desktops/kde/unstable/kde-3.1-beta2/Debian/dists/woody/main/binary-i386/ I suggest a symbolic link from Debian/woody/i386 to dists/woody/main/binary-i386/ This will be fast solution, which will propagate in seconds if you mirror with rsync. Ralf, could you do this please? Or sed -e 's!dists/woody/main/binary-i386/!woody/i386/!' Packages.old Packages gzip Packages and upload the file? This should work imho, but the symlink approach seems better to me anyway. Thanks. Good luck and thanks for the packages! Sorry for the inconvenience. I have no write access to ftp.kde.org, so everything takes bit more time. I will try to make things work out of the box next time :). --JS
Re: KDE debs building
On Mon, Sep 16, 2002 at 01:33:27AM +0200, Ralf Nolden wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Sunday 15 September 2002 20:08, Yenar Calentaure wrote: Hi Yenar, thanks for your kind and quick answer - I've got CVS write access, so does Chris. We'll be glad to take any patches and put them into CVS that would help automate the build process. I myself have a DSL line so up/download is not an issue for me; I could also use the 2mbit line in the company I work for now. Ok. I have some time issues lately, but i'll try to contribute as much as possible. KDE on Debian is best system i had so far :). For now, i see one major problem with packaging of CVS. The list of installed files is somewhat in flux. For now, i had this idea: write perl script, that will parse control file containing regexp rules, run make -n install on sources, extract list of source and destination files and their attributes (executable, mode, etc.) and build file lists from these. Rules like: Package: kdelibs-bin Match-mode: executable Match-dest: /usr/bin/ Exclude-mode: others-write Package: kdelibs4 Match-dest: /usr/lib/kde3/.*so[0-9.-]*|/usr/lib/.*so[0-9.-]* Package: kdelibs-data Match-src: pics/| Match-dest: /usr/share (this is just to illustrate what i try to propose, not anything that matches reality) You know what i mean. I can make something like this this week (hopefully). I believe that most of package file-lists can be expressed this way more flexibly than with hardcoded filenames. And i believe that this can extend lifetime of packaging information, too. Sure, before release it should be hand-checked and fine-tuned, but i think it is good enough for cvs snapshots (if one or two files end up in wrong package, it won't end the world). Also, like Charles de Miramon pointed out, we should take care of daily or at least weekly builds from CVS that can be installed side by side of a stable environment for the translators and doc writers who need a recent KDE from CVS but can't/won't want to go through the development process. I'll try to convince my informatics teacher to let me upload my builds weekly :). I'll see what i can do. Btw., i build on woody. Ralf cheers yenar
