Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/03 12:03:47+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/03 12:03:21+02:00 utwente.nl!koen
libpixman_cvs.bb, libsvg-cairo_cvs.bb, cairo_cvs.bb:  lower default for _cvs

2005/06/03 12:02:31+02:00 utwente.nl!koen
Add libpixman 0.1.5 snapshot

2005/06/03 11:58:13+02:00 utwente.nl!koen
Add libsvg-cairo 0.1.5 snapshot

2005/06/03 11:52:47+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/06/03 11:52:37+02:00 uni-frankfurt.de!mickeyl
python:
add python-logging
add python-datetime
add cookielib to python-netclient
add python-logging and python-datetime as dependencies for python-netclient

2005/06/03 11:50:13+02:00 utwente.nl!koen
Add cairo 0.5.0 snapshot to avoid more cvs API breakage

BKrev: 42a03389qsmXzGKlqsXJl89V1cJaZA

8 files changed, 20 insertions, 8 deletions

diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cairo/cairo_0.5.0.bb
diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb
index bda6c885c5..fc37ec5673 100644
--- a/packages/cairo/cairo_cvs.bb
+++ b/packages/cairo/cairo_cvs.bb
@@ -7,7 +7,7 @@ DEPENDS = "x11 libpixman libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 PR = "r2"
-
+DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=cairo"
 S = "${WORKDIR}/cairo"
 
diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cairo/libsvg-cairo_0.1.5.bb
diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb
index 9df6c548a8..47c255c07c 100644
--- a/packages/cairo/libsvg-cairo_cvs.bb
+++ b/packages/cairo/libsvg-cairo_cvs.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "libsvg cairo"
 DESCRIPTION = "SVG rendering library"
-
+DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo"
 S = "${WORKDIR}/libsvg-cairo"
 
diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libpixman/libpixman_0.1.5.bb
diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb
index 527ec36fea..7b88f4c054 100644
--- a/packages/libpixman/libpixman_cvs.bb
+++ b/packages/libpixman/libpixman_cvs.bb
@@ -8,6 +8,8 @@ LICENSE = "X11"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman"
 S = "${WORKDIR}/libpixman"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit autotools pkgconfig 
 
 do_stage () {
diff --git a/packages/python/python-2.4.1-manifest.inc b/packages/python/python-2.4.1-manifest.inc
index ee41c14361..77aea0052b 100644
--- a/packages/python/python-2.4.1-manifest.inc
+++ b/packages/python/python-2.4.1-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Tue May 24 11:50:17 2005
+### AUTO-GENERATED by '/usr/users4/abvs/mickey/work/sdk/buildroot-oz/packages/python/generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Fri Jun  3 11:49:16 2005
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -8,7 +8,7 @@
 ########################################################################################################################
  
 
-PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml3"
@@ -35,6 +35,11 @@ PR_python-pickle="ml4"
 RDEPENDS_python-pickle="python-core python-codecs python-re"
 FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so "
 
+DESCRIPTION_python-datetime="Python Calendar and Time support"
+PR_python-datetime="ml3"
+RDEPENDS_python-datetime="python-core"
+FILES_python-datetime="${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so "
+
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
 PR_python-core="ml3"
 RDEPENDS_python-core=""
@@ -121,9 +126,9 @@ RDEPENDS_python-fcntl="python-core"
 FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml3"
-RDEPENDS_python-netclient="python-core python-io python-mime"
-FILES_python-netclient="${libdir}/python2.4/base64.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
+PR_python-netclient="ml4"
+RDEPENDS_python-netclient="python-core python-datetime python-io python-logging python-mime"
+FILES_python-netclient="${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml3"
@@ -160,6 +165,11 @@ PR_python-pydoc="ml3"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
 FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* "
 
+DESCRIPTION_python-logging="Python Logging Support"
+PR_python-logging="ml3"
+RDEPENDS_python-logging="python-core"
+FILES_python-logging="${libdir}/python2.4/logging "
+
 DESCRIPTION_python-xml="Python basic XML support."
 PR_python-xml="ml3"
 RDEPENDS_python-xml="python-core python-re"
diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb
index 742426976c..27cdaf99fe 100644
--- a/packages/python/python_2.4.1.bb
+++ b/packages/python/python_2.4.1.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PROVIDES = "python python-core"
 DEPENDS = "python-native zlib gdbm openssl"
-PR = "ml1"
+PR = "ml2"
 
 PYTHON_MAJMIN = "2.4"