Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/kde
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6547/10.3/unstable/main/finkinfo/kde
Modified Files:
baghira.info bundle-kde.info kio-kmd.patch kmud.patch
Added Files:
kdeadmin3.info kdeadmin3.patch
Removed Files:
baghira.patch
Log Message:
new baghira, added kdeadmin3 to kde, some patch pedantry
--- NEW FILE: kdeadmin3.patch ---
diff -uNr kdeadmin-3.4.2/configure.in.in kdeadmin-3.4.2-patched/configure.in.in
--- kdeadmin-3.4.2/configure.in.in 2005-07-20 12:42:20.000000000 -0400
+++ kdeadmin-3.4.2-patched/configure.in.in 2005-08-30 15:41:28.000000000
-0400
@@ -8,3 +8,5 @@
AC_CHECK_HEADERS(sys/stropts.h stropts.h)
AC_CHECK_HEADERS(sys/time.h)
AC_HEADER_TIME
+
+DO_NOT_COMPILE="$DO_NOT_COMPILE kdat ksysv lilo-config kuser"
diff -uNr kdeadmin-3.4.2/kpackage/debAptInterface.cpp
kdeadmin-3.4.2-patched/kpackage/debAptInterface.cpp
--- kdeadmin-3.4.2/kpackage/debAptInterface.cpp 2005-07-20 12:42:16.000000000
-0400
+++ kdeadmin-3.4.2-patched/kpackage/debAptInterface.cpp 2005-08-30
16:26:26.000000000 -0400
@@ -470,8 +470,8 @@
cmd += "\\";
cmd += "n";
}
- cmd += "> /etc/apt/sources.list.n; if [ $? = 0 ]; then ";
- cmd += "mv /etc/apt/sources.list /etc/apt/sources.list.b; mv
/etc/apt/sources.list.n /etc/apt/sources.list; fi'";
+ cmd += "> @PREFIX@/etc/apt/sources.list.n; if [ $? = 0 ]; then ";
+ cmd += "mv @PREFIX@/etc/apt/sources.list @PREFIX@/etc/apt/sources.list.b; mv
@PREFIX@/etc/apt/sources.list.n @PREFIX@/etc/apt/sources.list; fi'";
QStringList rlist = kpty->run(cmd,TRUE,TRUE);
diff -uNr kdeadmin-3.4.2/kpackage/debAptInterface.h
kdeadmin-3.4.2-patched/kpackage/debAptInterface.h
--- kdeadmin-3.4.2/kpackage/debAptInterface.h 2005-07-20 12:42:16.000000000
-0400
+++ kdeadmin-3.4.2-patched/kpackage/debAptInterface.h 2005-08-30
16:25:54.000000000 -0400
@@ -33,7 +33,7 @@
#include "debInterface.h"
-#define APT_SOURCE "/etc/apt/sources.list"
+#define APT_SOURCE "@PREFIX@/etc/apt/sources.list"
class DEBAPT: public DEB
{
diff -uNr kdeadmin-3.4.2/kpackage/debInterface.cpp
kdeadmin-3.4.2-patched/kpackage/debInterface.cpp
--- kdeadmin-3.4.2/kpackage/debInterface.cpp 2005-07-20 12:42:16.000000000
-0400
+++ kdeadmin-3.4.2-patched/kpackage/debInterface.cpp 2005-08-30
16:26:54.000000000 -0400
@@ -407,7 +407,7 @@
QStringList ret;
QString name = p->getProperty("name");
- from = "zcat /usr/share/doc/";
+ from = "zcat @PREFIX@/share/doc/";
from += name;
from += "/changelog.Debian.gz";
@@ -416,7 +416,7 @@
if (!kpty->Result)
return ret;
else {
- from = "zcat /usr/share/doc/";
+ from = "zcat @PREFIX@/share/doc/";
from += name;
from += "/changelog.gz";
diff -uNr kdeadmin-3.4.2/kpackage/debInterface.h
kdeadmin-3.4.2-patched/kpackage/debInterface.h
--- kdeadmin-3.4.2/kpackage/debInterface.h 2005-07-20 12:42:16.000000000
-0400
+++ kdeadmin-3.4.2-patched/kpackage/debInterface.h 2005-08-30
16:27:19.000000000 -0400
@@ -45,10 +45,10 @@
class updateLoc;
class cacheObj;
-#define AVAIL "/var/lib/dpkg/available"
-#define STATUS "/var/lib/dpkg/status"
+#define AVAIL "@PREFIX@/var/lib/dpkg/available"
+#define STATUS "@PREFIX@/var/lib/dpkg/status"
-#define INFODIR "/var/lib/dpkg/info/"
+#define INFODIR "@PREFIX@/var/lib/dpkg/info/"
class DEB: public pkgInterface
Index: kio-kmd.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/kde/kio-kmd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kio-kmd.patch 7 Feb 2004 21:37:11 -0000 1.1
+++ kio-kmd.patch 31 Aug 2005 15:58:47 -0000 1.2
@@ -1,4 +1,3 @@
-diff -uNr kmd-0.3/Makefile.am kmd-0.3-new/Makefile.am
--- kmd-0.3/Makefile.am Sat Mar 8 18:10:13 2003
+++ kmd-0.3-new/Makefile.am Sun Feb 1 10:35:37 2004
@@ -15,8 +15,8 @@
Index: bundle-kde.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/kde/bundle-kde.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- bundle-kde.info 26 Aug 2005 13:27:22 -0000 1.18
+++ bundle-kde.info 31 Aug 2005 15:58:47 -0000 1.19
@@ -1,11 +1,11 @@
Package: bundle-kde
Version: 3.4.2
-Revision: 11
+Revision: 12
Description: KDE - convenience package: KDE 3.4
Type: bundle
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: arts (>= 1.4.2-11), kdelibs3 (>= %v-11), kdebase3 (>= %v-11),
kdeaccessibility3 (>= %v-11), kdeaddons3 (>= %v-11), kdeartwork3 (>= %v-11),
kdeedu3 (>= %v-11), kdegames3 (>= %v-11), kdegraphics3 (>= %v-11), kdenetwork3
(>= %v-11), kdepim3 (>= %v-11), kdesdk3 (>= %v-11), kdetoys3 (>= %v-11),
kdeutils3 (>= %v-11), kdewebdev3 (>= %v-11), koffice (>= 1.4.1-1)
+Depends: arts (>= 1.4.2-11), kdelibs3 (>= %v-11), kdebase3 (>= %v-11),
kdeaccessibility3 (>= %v-11), kdeaddons3 (>= %v-11), kdeadmin3 (>= %v-11),
kdeartwork3 (>= %v-11), kdeedu3 (>= %v-11), kdegames3 (>= %v-11), kdegraphics3
(>= %v-11), kdenetwork3 (>= %v-11), kdepim3 (>= %v-11), kdesdk3 (>= %v-11),
kdetoys3 (>= %v-11), kdeutils3 (>= %v-11), kdewebdev3 (>= %v-11), koffice (>=
1.4.1-1)
Homepage: http://fink.sourceforge.net/news/kde.php
DescDetail: <<
Index: kmud.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/kde/kmud.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kmud.patch 7 Feb 2004 21:37:11 -0000 1.3
+++ kmud.patch 31 Aug 2005 15:58:47 -0000 1.4
@@ -1,4 +1,3 @@
-diff -uNr kmud2/Makefile.am kmud2-new/Makefile.am
--- kmud2/Makefile.am Thu Jun 6 13:13:29 2002
+++ kmud2-new/Makefile.am Sun Feb 1 11:00:03 2004
@@ -14,8 +14,8 @@
@@ -12,7 +11,6 @@
MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
-diff -uNr kmud2/lib/Makefile.am kmud2-new/lib/Makefile.am
--- kmud2/lib/Makefile.am Tue Aug 6 17:58:50 2002
+++ kmud2-new/lib/Makefile.am Sun Feb 1 10:59:38 2004
@@ -7,7 +7,7 @@
@@ -24,7 +22,6 @@
libkmud_la_SOURCES = \
kmudviewmanager.cpp \
kmudpart.cpp \
-diff -uNr kmud2/parts/mapper/Makefile.am kmud2-new/parts/mapper/Makefile.am
--- kmud2/parts/mapper/Makefile.am Sat Aug 10 15:31:23 2002
+++ kmud2-new/parts/mapper/Makefile.am Sun Feb 1 10:59:38 2004
@@ -5,11 +5,18 @@
@@ -49,7 +46,6 @@
kmudmapperfactory.cpp \
cmapelementutil.cpp \
cmaptoolbase.cpp \
-diff -uNr kmud2/parts/mapper/kmudmapper_init.cpp
kmud2-new/parts/mapper/kmudmapper_init.cpp
--- kmud2/parts/mapper/kmudmapper_init.cpp Wed Dec 31 19:00:00 1969
+++ kmud2-new/parts/mapper/kmudmapper_init.cpp Sun Feb 1 10:59:38 2004
@@ -0,0 +1,10 @@
@@ -63,7 +59,6 @@
+ }
+};
+
-diff -uNr kmud2/parts/mapper/kmudmapperfactory.cpp
kmud2-new/parts/mapper/kmudmapperfactory.cpp
--- kmud2/parts/mapper/kmudmapperfactory.cpp Sat Apr 13 11:39:39 2002
+++ kmud2-new/parts/mapper/kmudmapperfactory.cpp Sun Feb 1 10:59:38 2004
@@ -20,15 +20,6 @@
@@ -82,7 +77,6 @@
KmudMapperFactory::KmudMapperFactory(QObject* parent, const char* name)
: KmudFactory(parent, name)
{
-diff -uNr kmud2/parts/mapper/plugins/movetracker/Makefile.am
kmud2-new/parts/mapper/plugins/movetracker/Makefile.am
--- kmud2/parts/mapper/plugins/movetracker/Makefile.am Sun Jun 9 06:05:36 2002
+++ kmud2-new/parts/mapper/plugins/movetracker/Makefile.am Sun Feb 1
11:40:56 2004
@@ -5,8 +5,8 @@
@@ -96,7 +90,6 @@
libkmudmapper_movetracker_la_SOURCES = \
cmapmovetrackerfactory.cpp \
cmapviewmovetracker.cpp \
-diff -uNr kmud2/parts/mapper/plugins/speedwalk/Makefile.am
kmud2-new/parts/mapper/plugins/speedwalk/Makefile.am
--- kmud2/parts/mapper/plugins/speedwalk/Makefile.am Sun Jun 9 06:05:37 2002
+++ kmud2-new/parts/mapper/plugins/speedwalk/Makefile.am Sun Feb 1
11:36:09 2004
@@ -5,8 +5,8 @@
@@ -110,7 +103,6 @@
libkmudmapper_speedwalk_la_SOURCES = \
cmapspeedwalkfactory.cpp \
cmappluginspeedwalk.cpp \
-diff -uNr kmud2/parts/mapper/plugins/standard/Makefile.am
kmud2-new/parts/mapper/plugins/standard/Makefile.am
--- kmud2/parts/mapper/plugins/standard/Makefile.am Sun Mar 9 12:39:34 2003
+++ kmud2-new/parts/mapper/plugins/standard/Makefile.am Sun Feb 1
11:33:17 2004
@@ -5,8 +5,8 @@
@@ -124,7 +116,6 @@
libkmudmapper_standard_la_SOURCES = \
cmapstandardfactory.cpp \
cmapcmdmoveelements.cpp \
-diff -uNr kmud2/parts/mapper/plugins/standard/propertyPanes/Makefile.am
kmud2-new/parts/mapper/plugins/standard/propertyPanes/Makefile.am
--- kmud2/parts/mapper/plugins/standard/propertyPanes/Makefile.am Wed Aug
8 16:33:33 2001
+++ kmud2-new/parts/mapper/plugins/standard/propertyPanes/Makefile.am Sun Feb
1 11:30:31 2004
@@ -5,5 +5,6 @@
--- NEW FILE: kdeadmin3.info ---
Package: kdeadmin3
Version: 3.4.2
Revision: 11
Description: KDE - miscellaneous administrative tools
License: GPL/LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: kcron (>= %v-%r), kpackage (>= %v-%r), secpolicy (>= %v-%r)
BuildDepends: arts-dev (>= 1.4.2-11), autoconf2.5, automake1.7, cctools (>=
446-1) | cctools-single-module, fink (>= 0.20.2.1-1), freetype219,
kdebase3-unified-dev (>= %v-11), kdelibs3-unified-dev (>= %v-11), libart2,
libiconv-dev, libidn, libjpeg, libpng3 (>= 1.2.5-4), qt3 (>= 3.3.3-17), x11-dev
Replaces: %N-dev (<< %v-%r)
BuildConflicts: unsermake
GCC: 3.3
CustomMirror: <<
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
Source: mirror:kde:stable/%v/src/kdeadmin-%v.tar.bz2
Source-MD5: ef1d4be02bbe384d46e807421dd52fed
SourceDirectory: kdeadmin-%v
Source2: mirror:custom:kde-admindir-3.4.2-2.tar.bz2
Source2-MD5: d23ce8a8448b901cffeebb6bfc12bcd4
Source2ExtractDir: kdeadmin-%v
PatchScript: <<
sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1
#perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;
s,HAVE_GCC_VISIBILITY=1,HAVE_GCC_VISIBILITY=0,g; s,-fvisibility=hidden
-fvisibility-inlines-hidden,,g;' admin/*
perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --includedir=%p/include --libdir=%p/lib --prefix=%p
--with-qt-dir=%p --with-qt-includes=%p/include/qt --with-extra-libs=%p/lib
--with-extra-includes=%p/include --enable-mt --with-pic --enable-rpath
--enable-shared=yes --enable-static=no --mandir=%i/share/man --with-xinerama
--with-pam --disable-final --with-distribution='Fink/Mac OS X'
--disable-dependency-tracking
CompileScript: <<
#!/bin/sh -e
export HOME=/tmp
export PREFIX="%p"
. ./environment-helper.sh
export lt_cv_sys_max_cmd_len=65536
export CC=gcc-3.3 CXX=g++-3.3
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
./build-helper.sh configure %N %v %r ./configure %c
./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"
<<
InstallScript: <<
#!/bin/sh -e
export PREFIX="%p"
. ./environment-helper.sh
./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/%N-base
<<
DocFiles: AUTHORS COPYING INSTALL README
SplitOff: <<
Package: kcron
Description: KDE - crontab editor
Recommends: %N (>= %v-%r)
Depends: kdelibs3-unified (>= %v-11)
Files: <<
bin/kcron
share/applications/kde/kcron*
share/apps/kcron
share/icons/crystalsvg/16x16/apps/kcron*
share/icons/crystalsvg/32x32/apps/kcron*
<<
DescDetail: <<
KCron is an application for scheduling programs to run in the
background. It is a graphical user interface to cron, the
UNIX system scheduler.
<<
<<
SplitOff2: <<
Package: kpackage
Description: KDE - software package tool
Recommends: %N (>= %v-%r)
Depends: apt, kdelibs3-unified (>= %v-11)
Files: <<
lib/kde3/kfile_deb.*
lib/kde3/kfile_rpm.*
share/services/kfile_deb.*
share/services/kfile_rpm.*
bin/kpackage
share/applications/kde/kpackage*
share/apps/kpackage
share/icons/crystalsvg/128x128/apps/kpackage*
share/icons/crystalsvg/16x16/apps/kpackage*
share/icons/crystalsvg/32x32/apps/kpackage*
share/icons/crystalsvg/48x48/apps/kpackage*
share/icons/crystalsvg/64x64/apps/kpackage*
<<
DescDetail: <<
This is a frontend to both .rpm and .deb package formats. It allows
you to view currently installed packages, browse available packages,
and install/remove them.
<<
<<
SplitOff3: <<
Package: secpolicy
Description: KDE - PAM security policy viewer
Recommends: %N (>= %v-%r)
Depends: kdelibs3-unified (>= %v-11)
Files: <<
bin/secpolicy
<<
DescDetail: <<
This tool allows you to manipulate the PAM configuration
files for each "service" you have created to use PAM.
<<
<<
Homepage: http://www.kde.org/
DescDetail: <<
Various miscellaneous administrative tools for KDE.
Install the kdeadmin3 package if you want to install all of the
kdeadmin packages.
<<
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
Note that depending on your version of Apple's X11, this can cause
strange resizing issues with the kicker (KDE task bar).
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-ssl-shlibs kdelibs3-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
Index: baghira.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/kde/baghira.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- baghira.info 3 Jul 2005 16:48:45 -0000 1.3
+++ baghira.info 31 Aug 2005 15:58:47 -0000 1.4
@@ -1,9 +1,8 @@
Package: baghira
-Version: 0.6c
+Version: 0.6e
Revision: 11
-BuildDepends: autoconf2.5, automake1.9, freetype219, kdebase3-ssl-dev (>=
3.4.0-11) | kdebase3-dev (>= 3.4.0-11), qt3 (>= 3.3.3-17)
-Depends: kdelibs3-ssl (>= 3.4.0-11) | kdelibs3 (>= 3.4.0-11), qt3-shlibs (>=
3.3.3-17)
-Recommends: kdebase3-ssl (>= 3.4.0-1) | kdebase3 (>= 3.4.0-1)
+BuildDepends: autoconf2.5, automake1.7, freetype219, kdebase3-unified-dev (>=
3.4.2-11), qt3 (>= 3.3.3-17)
+Depends: kdebase3-unified (>= 3.4.2-11), qt3-shlibs (>= 3.3.3-17)
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
CustomMirror: <<
@@ -12,11 +11,10 @@
nam-CA: http://www.southofheaven.net/befunk
<<
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: 18928e218daec99a103588d35e8a6555
-Source2: mirror:custom:kde-admindir-3.4.1.tar.bz2
-Source2-MD5: 0388fc87fa950791209ad4ab791b32cd
+Source-MD5: 987b598c00ba09dad8ff62ea405f9873
+Source2: mirror:custom:kde-admindir-3.4.2-2.tar.bz2
+Source2-MD5: d23ce8a8448b901cffeebb6bfc12bcd4
Source2ExtractDir: %n-%v
-Patch: %n.patch
ConfigureParams: --includedir=%p/include --libdir=%p/lib --with-qt-dir=%p
--with-qt-includes=%p/include/qt --with-extra-libs=%p/lib
--with-extra-includes=%p/include --enable-mt --with-pic --enable-rpath
--enable-shared=yes --enable-static=no --mandir=%i/share/man --with-xinerama
--disable-final --with-distribution='Fink/Mac OS X'
--disable-dependency-tracking
CompileScript: <<
--- baghira.patch DELETED ---
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
