Merge remote branch 'origin/2.2' into 2.2

feedparser/.footprint

@@ -0,0 +1,6 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/python2.4/
+drwxr-xr-x	root/root	usr/lib/python2.4/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/feedparser.py
+-rw-r--r--	root/root	usr/lib/python2.4/site-packages/feedparser.pyc

feedparser/.md5sum

@@ -0,0 +1 @@
+7ab1140c1e29d4cd52ab20fa7b1f8640  feedparser-4.1.zip

feedparser/Pkgfile

@@ -0,0 +1,16 @@
+# Description: Parse RSS and Atom feeds in Python.
+# URL:         http://www.feedparser.org/
+# Maintainer:  James Mills, prologic at shortcircuit dot net dot au
+# Packager:    Younes Hafri, ycrux at club-internet dot fr
+#
+# Depends on: python
+
+name=feedparser
+version=4.1
+release=1
+source=(http://dl.sourceforge.net/sourceforge/$name/feedparser-$version.zip)
+
+build () {
+	python setup.py install --root=$PKG
+	chown -R root:root $PKG
+}

trac/.md5sum

@@ -1 +1 @@
-354cca575cffc732f2fb8015b5c60b50  trac-0.10.3.tar.gz
+b625af0ca7cab8b7f79d92778efd6d7d  trac-0.10.3.1.tar.gz

trac/Pkgfile

@@ -6,7 +6,7 @@
 # Depends on:  subversion-python, pysqlite, clearsilver
 
 name=trac
-version=0.10.3
+version=0.10.3.1
 release=2
 source=(http://ftp.edgewall.com/pub/trac/$name-$version.tar.gz)