summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/feed-browser/includes/config.inc2
-rw-r--r--contrib/feed-browser/includes/functions.inc14
-rw-r--r--contrib/feed-browser/update.php12
-rw-r--r--contrib/python/.mtn2git_empty0
-rwxr-xr-xcontrib/python/generate-manifest.py326
-rw-r--r--packages/ipsec-tools/ipsec-tools.inc3
-rw-r--r--packages/libvncserver/libvncserver_0.8.2.bb2
-rw-r--r--packages/nfs-utils/nfs-utils_1.0.6.bb4
-rw-r--r--packages/python/python-2.4.3-manifest.inc6
-rw-r--r--packages/xorg-xserver/xserver-kdrive_git.bb10
10 files changed, 360 insertions, 19 deletions
diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
index 1397d2c947..0a270a8eb0 100644
--- a/contrib/feed-browser/includes/config.inc
+++ b/contrib/feed-browser/includes/config.inc
@@ -1,6 +1,6 @@
<?php
-define('DB_FILENAME', './feeds2.db');
+define('DB_FILENAME', './feeds.db');
$feeds = array(
array(
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
index 4edf3f4369..4b0b898118 100644
--- a/contrib/feed-browser/includes/functions.inc
+++ b/contrib/feed-browser/includes/functions.inc
@@ -79,15 +79,20 @@ function insert_feeds ($db)
if(isset($feeds))
{
+ $id = 1;
+
foreach($feeds as $distro)
{
foreach($distro['feeds'] as $feed)
{
- sqlite_query($db, "INSERT INTO feeds (f_name, f_uri) VALUES
+ sqlite_query($db, "INSERT INTO feeds (f_id, f_name, f_uri) VALUES
(
+ {$id},
'{$distro['distro_name']} {$distro['distro_version']} {$feed['name']}',
'{$distro['feed_base_url']}{$feed['url']}'
)");
+
+ $id++;
}
}
}
@@ -166,7 +171,7 @@ function pkgdetails ($package)
{
$result = db_query("SELECT * FROM packages,feeds
WHERE (packages.p_name='$package' OR packages.p_provides='$package')
- AND feeds.f_name = packages.p_feed
+ AND feeds.f_id = packages.p_feed
ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC ");
// display first result
@@ -421,9 +426,10 @@ function check_database()
if (db_table_exists ($db, 'feeds') === FALSE)
{
sqlite_query ($db, "CREATE TABLE feeds (
- f_name varchar(20),
+ f_id int(8),
+ f_name varchar(32),
f_uri varchar(100),
- f_comments varchar(500))");
+ f_comments varchar(500))");
insert_feeds ($db) ;
}
diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
index 94c8608616..786e898494 100644
--- a/contrib/feed-browser/update.php
+++ b/contrib/feed-browser/update.php
@@ -42,7 +42,7 @@ check_database();
$start = time();
$p_count = 0;
-$feeds = db_query("SELECT f_name, f_uri FROM feeds");
+$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
foreach($feeds as $feed)
{
@@ -59,8 +59,8 @@ foreach($feeds as $feed)
'name'=>'', 'version'=>'', 'arch'=>'', 'depends'=>'',
'maintainer'=>'', 'homepage'=>'', 'section'=>'', 'replaces'=>'',
'provides'=>'', 'recommends'=>'', 'conflicts'=>'', 'size'=>'',
- 'md5sum'=>'', 'source'=>'', 'feed'=>'', 'file'=>'', 'desc'=>''
- );
+ 'md5sum'=>'', 'source'=>'', 'feed'=>$feed['f_id'], 'file'=>'', 'desc'=>''
+ );
while (!feof($packagesgz_h))
{
@@ -75,7 +75,7 @@ foreach($feeds as $feed)
'name'=>'', 'version'=>'', 'arch'=>'', 'depends'=>'',
'maintainer'=>'', 'homepage'=>'', 'section'=>'', 'replaces'=>'',
'provides'=>'', 'recommends'=>'', 'conflicts'=>'', 'size'=>'',
- 'md5sum'=>'', 'source'=>'', 'feed'=>'', 'file'=>'', 'desc'=>''
+ 'md5sum'=>'', 'source'=>'', 'feed'=>$feed['f_id'], 'file'=>'', 'desc'=>''
);
}
@@ -161,7 +161,7 @@ function insert_ipkgs(&$package_info)
{
db_query_n("INSERT INTO packages VALUES (
'{$package_info['name']}', '{$package_info['version']}',
- '{$package_info['arch']}', '{$package_info['depends']}',
+ '{$package_info['arch']}', '{$package_info['depends']}',
'{$package_info['maintainer']}', '{$package_info['homepage']}',
'{$package_info['section']}', '{$package_info['replaces']}',
'{$package_info['provides']}', '{$package_info['recommends']}',
@@ -169,7 +169,7 @@ function insert_ipkgs(&$package_info)
'{$package_info['md5sum']}', '{$package_info['source']}',
'{$package_info['feed']}', '{$package_info['file']}',
'{$package_info['desc']}'
- )");
+ )");
}
?>
diff --git a/contrib/python/.mtn2git_empty b/contrib/python/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/contrib/python/.mtn2git_empty
diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py
new file mode 100755
index 0000000000..2fd681dc01
--- /dev/null
+++ b/contrib/python/generate-manifest.py
@@ -0,0 +1,326 @@
+#!/usr/bin/env python
+
+# generate Python Manifest for the OpenEmbedded build system
+# (C) 2002-2006 Michael Lauer <mickey@Vanille.de>
+# MIT license
+
+import os
+import sys
+import time
+
+VERSION = "2.4.3"
+# increase when touching python-core
+BASEREV = 0
+
+__author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+__version__ = "$Revision: 1.20 $"
+
+class MakefileMaker:
+
+ def __init__( self, outfile ):
+ """initialize"""
+ self.packages = {}
+ self.sourcePrefix = "/lib/python%s/" % VERSION[:3]
+ self.targetPrefix = "${libdir}/python%s" % VERSION[:3]
+ self.output = outfile
+ self.out( "#" * 120 )
+ self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on %s" % ( sys.argv[0], time.asctime() ) )
+ self.out( "###" )
+ self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" )
+ self.out( "###" )
+ self.out( "### Warning: Manual edits will be lost!" )
+ self.out( "###" )
+ self.out( "#" * 120 )
+ #
+ # helper functions
+ #
+
+ def out( self, data ):
+ """print a line to the output file"""
+ print >> self.output, data
+
+ def setPrefix( self, sourcePrefix, targetPrefix ):
+ """set a file prefix for addPackage files"""
+ self.sourcePrefix = sourcePrefix
+ self.targetPrefix = targetPrefix
+
+ def doProlog( self ):
+ self.out( """ """ )
+ self.out( "" )
+
+ def addPackage( self, revision, name, description, dependencies, filenames ):
+ """add a package to the Makefile"""
+ if type( filenames ) == type( "" ):
+ filenames = filenames.split()
+ fullFilenames = []
+ for filename in filenames:
+ if filename[0] != "/":
+ fullFilenames.append( ( "%s%s" % ( self.sourcePrefix, filename ), "%s%s" % ( self.targetPrefix, filename ) ) )
+ else:
+ fullFilenames.append( ( filename, filename ) )
+ self.packages[name] = revision, description, dependencies, fullFilenames
+
+ def doBody( self ):
+ """generate body of Makefile"""
+
+ global VERSION
+
+ #
+ # generate provides line
+ #
+
+ provideLine = 'PROVIDES+="'
+ for name in self.packages:
+ provideLine += "%s " % name
+ provideLine += '"'
+
+ self.out( provideLine )
+ self.out( "" )
+
+ #
+ # generate package line
+ #
+
+ packageLine = 'PACKAGES="'
+ for name in self.packages:
+ packageLine += "%s " % name
+ packageLine += '"'
+
+ self.out( packageLine )
+ self.out( "" )
+
+ #
+ # generate package variables
+ #
+
+ for name, data in self.packages.iteritems():
+ rev, desc, deps, files = data
+
+ #
+ # write out the description, revision and dependencies
+ #
+ self.out( 'DESCRIPTION_%s="%s"' % ( name, desc ) )
+ self.out( 'PR_%s="ml%d"' % ( name, rev + BASEREV ) )
+ self.out( 'RDEPENDS_%s="%s"' % ( name, deps.replace( ",", "" ) ) )
+
+ line = 'FILES_%s="' % name
+
+ #
+ # check which directories to make in the temporary directory
+ #
+
+ dirset = {} # if python had a set-datatype this would be sufficient. for now, we're using a dict instead.
+ for source, target in files:
+ dirset[os.path.dirname( target )] = True
+
+ #
+ # generate which files to copy for the target (-dfR because whole directories are also allowed)
+ #
+
+ for source, target in files:
+ line += "%s " % target
+
+ line += '"'
+ self.out( line )
+
+# for source, target in files:
+# if ( source.find( "lib-dynload" ) != -1 ) or \
+# ( source.endswith( "python" ) ) or \
+# ( source.endswith( "pydoc" ) ): # MACHDEP
+# self.out( "\t cp -dfR $(STAGING_LIBDIR)/..%s $(IPKTMP_DIR)%s/;" % ( source, os.path.dirname( target ) ) )
+# else:
+# self.out( "\t cp -dfR $(STAGING_DIR)%s $(IPKTMP_DIR)%s/;" % ( source, os.path.dirname( target ) ) )
+#
+ self.out( "" )
+
+ def doEpilog( self ):
+ self.out( """""" )
+ self.out( "" )
+
+ def make( self ):
+ self.doProlog()
+ self.doBody()
+ self.doEpilog()
+
+if __name__ == "__main__":
+
+ if len( sys.argv ) > 1:
+ os.popen( "rm -f ./%s" % sys.argv[1] )
+ outfile = file( sys.argv[1], "w" )
+ else:
+ outfile = sys.stdout
+
+ m = MakefileMaker( outfile )
+
+ # Add packages here. Only specify dlopen-style library dependencies here, no ldd-style dependencies!
+ # Parameters: revision, name, description, dependencies, filenames
+ #
+
+ m.setPrefix( "/", "/usr/" )
+
+ m.addPackage( 1, "python-core", "Python Interpreter and core modules (needed!)", "",
+ "lib/python2.4/__future__.* lib/python2.4/copy.* lib/python2.4/copy_reg.* lib/python2.4/ConfigParser.py " +
+ "lib/python2.4/getopt.* lib/python2.4/linecache.* lib/python2.4/new.* " +
+ "lib/python2.4/os.* lib/python2.4/posixpath.* " +
+ "lib/python2.4/warnings.* lib/python2.4/site.* lib/python2.4/stat.* " +
+ "lib/python2.4/UserDict.* lib/python2.4/UserList.* lib/python2.4/UserString.* " +
+ "lib/python2.4/lib-dynload/binascii.so lib/python2.4/lib-dynload/struct.so lib/python2.4/lib-dynload/time.so " +
+ "lib/python2.4/lib-dynload/xreadlines.so lib/python2.4/types.* bin/python" )
+
+ m.addPackage( 0, "python-devel", "Python Development Package", "python-core",
+ "include lib/python2.4/config" ) # package
+
+ m.addPackage( 0, "python-idle", "Python Integrated Development Environment", "python-core, python-tkinter",
+ "bin/idle lib/python2.4/idlelib" ) # package
+
+ m.addPackage( 0, "python-pydoc", "Python Interactive Help Support", "python-core, python-lang, python-stringold, python-re",
+ "bin/pydoc lib/python2.4/pydoc.*" )
+
+ m.setPrefix( "/lib/python2.4/", "${libdir}/python2.4/" )
+
+ m.addPackage( 0, "python-audio", "Python Audio Handling", "python-core",
+ "wave.* chunk.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" )
+
+ m.addPackage( 0, "python-bsddb", "Python Berkeley Database Bindings", "python-core",
+ "bsddb" ) # package
+
+ m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core",
+ "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" )
+
+ m.addPackage( 0, "python-compile", "Python Bytecode Compilation Support", "python-core",
+ "py_compile.* compileall.*" )
+
+ m.addPackage( 0, "python-compiler", "Python Compiler Support", "python-core",
+ "compiler" ) # package
+
+ m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core, python-zlib",
+ "gzip.* zipfile.*" )
+
+ m.addPackage( 0, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core",
+ "lib-dynload/crypt.so lib-dynload/md5.so lib-dynload/rotor.so lib-dynload/sha.so" )
+
+ m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold",
+ "lib-dynload/_csv.so csv.* optparse.* textwrap.*" )
+
+ m.addPackage( 1, "python-curses", "Python Curses Support", "python-core",
+ "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package
+
+ m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core, python-codecs",
+ "_strptime.* calendar.* lib-dynload/datetime.so" )
+
+ m.addPackage( 0, "python-db", "Python File-Based Database Support", "python-core",
+ "anydbm.* dumbdbm.* whichdb.* " )
+
+ m.addPackage( 0, "python-distutils", "Python Distribution Utilities", "python-core",
+ "config distutils" ) # package
+
+ m.addPackage( 0, "python-email", "Python Email Support", "python-core, python-io, python-re",
+ "email" ) # package
+
+ m.addPackage( 0, "python-fcntl", "Python's fcntl Interface", "python-core",
+ "lib-dynload/fcntl.so" )
+
+ m.addPackage( 0, "python-hotshot", "Python Hotshot Profiler", "python-core",
+ "hotshot lib-dynload/_hotshot.so" )
+
+ m.addPackage( 0, "python-html", "Python HTML Processing", "python-core",
+ "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " )
+
+ m.addPackage( 0, "python-gdbm", "Python GNU Database Support", "python-core, libgdbm3",
+ "lib-dynload/gdbm.so" )
+
+ m.addPackage( 0, "python-image", "Python Graphical Image Handling", "python-core",
+ "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" )
+
+ m.addPackage( 0, "python-io", "Python Low-Level I/O", "python-core, python-math",
+ "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so "
+ "pipes.* socket.* tempfile.* StringIO.* " )
+
+ m.addPackage( 0, "python-lang", "Python Low-Level Language Support", "python-core",
+ "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " +
+ "lib-dynload/itertools.so lib-dynload/collections.so " +
+ "atexit.* code.* codeop.* dis.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* traceback.* linecache.* weakref.*" )
+
+ m.addPackage( 0, "python-logging", "Python Logging Support", "python-core",
+ "logging" ) # package
+
+ m.addPackage( 0, "python-lib-old-and-deprecated", "Python Deprecated Libraries", "python-core",
+ "lib-old" ) # package
+
+ m.addPackage( 0, "python-tkinter", "Python Tcl/Tk Bindings", "python-core",
+ "lib-dynload/_tkinter.so lib-tk" ) # package
+
+ m.addPackage( 0, "python-math", "Python Math Support", "python-core",
+ "lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" )
+
+ m.addPackage( 0, "python-mime", "Python MIME Handling APIs", "python-core, python-io",
+ "mimetools.* quopri.* rfc822.*" )
+
+ m.addPackage( 0, "python-mmap", "Python Memory-Mapped-File Support", "python-core, python-io",
+ "lib-dynload/mmap.so " )
+
+ m.addPackage( 0, "python-unixadmin", "Python Unix Administration Support", "python-core",
+ "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" )
+
+ m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, python-datetime, python-io, python-lang, python-logging, python-mime",
+ "*Cookie*.* " +
+ "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" )
+
+ m.addPackage( 0, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient",
+ "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" )
+
+ m.addPackage( 0, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-re",
+ "pickle.* shelve.* lib-dynload/cPickle.so" )
+
+ m.addPackage( 0, "python-pprint", "Python Pretty-Print Support", "python-core",
+ "pprint.*" )
+
+ m.addPackage( 0, "python-profile", "Python Basic Profiling Support", "python-core",
+ "profile.* pstats.*" )
+
+ m.addPackage( 0, "python-re", "Python Regular Expression APIs", "python-core",
+ "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin
+
+ m.addPackage( 0, "python-readline", "Python Readline Support", "python-core, libreadline4",
+ "lib-dynload/readline.so rlcompleter.*" )
+
+ m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core",
+ "lib-dynload/resource.so" )
+
+ m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core, python-re",
+ "commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" )
+
+ m.addPackage( 0, "python-subprocess", "Python Subprocess Support", "python-core, python-io, python-re",
+ "subprocess.*" )
+
+ m.addPackage( 0, "python-stringold", "Python String APIs [deprecated]", "python-core, python-re",
+ "lib-dynload/strop.so string.*" )
+
+ m.addPackage( 0, "python-syslog", "Python's syslog Interface", "python-core",
+ "lib-dynload/syslog.so" )
+
+ m.addPackage( 0, "python-terminal", "Python Terminal Controlling Support", "python-core, python-io",
+ "pty.* tty.*" )
+
+ m.addPackage( 0, "python-tests", "Python Tests", "python-core",
+ "test" ) # package
+
+ m.addPackage( 0, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang",
+ "_threading_local.* bisect.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" )
+
+ m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang",
+ "unittest.*" )
+
+ m.addPackage( 0, "python-xml", "Python basic XML support.", "python-core, python-re",
+ "lib-dynload/pyexpat.so xml xmllib.*" ) # package
+
+ m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang",
+ "xmlrpclib.* SimpleXMLRPCServer.*" )
+
+ m.addPackage( 1, "python-zlib", "Python zlib Support.", "python-core",
+ "lib-dynload/zlib.so" )
+
+ m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core, python-mime",
+ "mailbox.*" )
+
+ m.make()
diff --git a/packages/ipsec-tools/ipsec-tools.inc b/packages/ipsec-tools/ipsec-tools.inc
index 2b1669f987..31ec6c87bf 100644
--- a/packages/ipsec-tools/ipsec-tools.inc
+++ b/packages/ipsec-tools/ipsec-tools.inc
@@ -3,7 +3,8 @@ Linux-2.6 IPsec implementation."
DEPENDS = "virtual/kernel openssl readline flex"
LICENSE = "BSD"
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "console/net"
+SECTION = "console/network"
+PR = "r1"
inherit autotools
diff --git a/packages/libvncserver/libvncserver_0.8.2.bb b/packages/libvncserver/libvncserver_0.8.2.bb
index 480a888745..8ceec7e62a 100644
--- a/packages/libvncserver/libvncserver_0.8.2.bb
+++ b/packages/libvncserver/libvncserver_0.8.2.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Patrik Gfeller <gfellerpatrik@gmx.net>"
SECTION = "libs"
PRIORITY = "optional"
PROVIDES = "x11vnc"
-DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg"
+DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg libxext"
PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz;md5sum=17a18e398af6c1730f72068022a152aa"
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 17bc5a6f9f..4f5e64b352 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -1,9 +1,9 @@
DESCRIPTION = "userspace utilities for kernel nfs"
PRIORITY = "optional"
-SECTION = "console/networking"
+SECTION = "console/network"
MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
file://acinclude-lossage.patch;patch=1 \
diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc
index 82c886658c..1d14654f85 100644
--- a/packages/python/python-2.4.3-manifest.inc
+++ b/packages/python/python-2.4.3-manifest.inc
@@ -1,5 +1,5 @@
########################################################################################################################
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Wed Aug 2 23:25:58 2006
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Fri Aug 25 15:00:35 2006
###
### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
###
@@ -148,8 +148,8 @@ RDEPENDS_python-netserver="python-core python-netclient"
FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* "
DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml0"
-RDEPENDS_python-curses="python-core libncurses5"
+PR_python-curses="ml1"
+RDEPENDS_python-curses="python-core"
FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
DESCRIPTION_python-syslog="Python's syslog Interface"
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 90fa12aebb..aa5784e1c7 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -1,22 +1,30 @@
PV = "1.1.0+git${SRCDATE}"
DEFAULT_PREFERENCE = "-2"
+PR = "r1"
+
LICENSE = "MIT"
DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
DESCRIPTION = "X server from freedesktop.org"
DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
DESCRIPTION_xserver-kdrive-fake = "Fake X server"
DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+FILES_${PN} += "${libdir}/xserver/SecurityPolicy"
+
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
FILES_xserver-kdrive-fake = "${bindir}/Xfake"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+RDEPENDS_xserver-kdrive-fbdev = "${PN}"
+RDEPENDS_xserver-kdrive-fake = "${PN}"
+RDEPENDS_xserver-kdrive-xephyr = "${PN}"
+
SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
file://kmode.patch;patch=1 \
file://disable-apm.patch;patch=1 \