Merge remote branch 'origin/2.2' into 2.2

This commit is contained in:
Danny Rawlins 2007-03-03 02:13:53 +11:00
commit 3fb8c542a0
11 changed files with 34 additions and 26 deletions

View File

@ -390,12 +390,6 @@ drwxr-xr-x root/root usr/share/amsn/skins/default/winicons/
-rwxr-xr-x root/root usr/share/amsn/trayicon.tcl
drwxr-xr-x root/root usr/share/amsn/utils/
drwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/CHANGES.txt
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/ChangeLog
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/LICENSE.txt
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/Makefile.in
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/README.txt
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/aclocal.m4
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/arrow.tcl
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/bitmap.tcl
-rwxr-xr-x root/root usr/share/amsn/utils/BWidget-1.7.0/button.tcl

View File

@ -7,7 +7,7 @@
name=amsn
version=0.96
release=1
release=3
source=(http://dl.sourceforge.net/$name/$name-$version.tar.bz2
$name-$version.diff)
@ -27,7 +27,8 @@ build() {
$PKG/usr/share/icons \
$PKG/usr/share/amsn/{icons,docs,lang} \
$PKG/usr/share/amsn/{AGREEMENT,CREDITS,FAQ,GNUGPL} \
$PKG/usr/share/amsn/{HELP,INSTALL,README,TODO}
$PKG/usr/share/amsn/{HELP,INSTALL,README,TODO} \
$PKG/usr/share/amsn/utils/BWidget-1.7.0/{ChangeLog,LICENSE.txt,Makefile.in,aclocal.m4,CHANGES.txt,README.txt}
chown -R root:root $PKG
}

View File

@ -48,9 +48,9 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/GL/
-r--r--r-- root/root usr/include/GL/glATI.h
-r--r--r-- root/root usr/include/GL/glxATI.h
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man8/
-r--r--r-- root/root usr/man/man8/atieventsd.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/atieventsd
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man8/
-r--r--r-- root/root usr/share/man/man8/atieventsd.8.gz

View File

@ -6,7 +6,7 @@
name=ati
version=8.33.6
release=1
release=2
source=(http://www2.ati.com/drivers/linux/$name-driver-installer-$version-x86.x86_64.run \
atieventsd.sh)
@ -22,9 +22,7 @@ build() {
$PKG/lib/modules/`uname -r`/kernel/drivers/char/drm
install -d $PKG/usr/{X11R6,include,share}
cp -r $SRC/tmp/arch/$march/usr $PKG
cp -r $SRC/tmp/common/usr/X11R6 $PKG/usr
cp -r $SRC/tmp/common/usr/include $PKG/usr
cp -r $SRC/tmp/common/usr/share/man $PKG/usr/share
cp -r $SRC/tmp/common/usr/{X11R6,include,share/man} $PKG/usr
cp -r $SRC/tmp/$xversion/usr/X11R6 $PKG/usr
install -d $PKG/etc/{ati,rc.d}
cp -r $SRC/tmp/common/etc/ati/* $PKG/etc/ati

View File

@ -130,5 +130,6 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/cherrypy/test/static/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/cherrypy/test/test_xmlrpc.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/cherrypy/test/webtest.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/cherrypy/test/webtest.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/cherrypy/wsgiserver.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/cherrypy/wsgiserver.pyc
drwxr-xr-x root/root usr/lib/python2.4/site-packages/cherrypy/wsgiserver/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/cherrypy/wsgiserver/__init__.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/cherrypy/wsgiserver/__init__.pyc

View File

@ -1 +1 @@
2065d19e79c9c1b30c9327509d2f3d0e CherryPy-3.0.0.tar.gz
13b80dbdd9b0491a71b30d4916950968 CherryPy-3.0.1.tar.gz

View File

@ -6,7 +6,7 @@
# Depends on: python
name=cherrypy
version=3.0.0
version=3.0.1
release=1
source=(http://download.cherrypy.org/cherrypy/$version/CherryPy-$version.tar.gz)

View File

@ -1,7 +1,8 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/cs
-rwxr-xr-x root/root usr/bin/cs_static.cgi
-rwxr-xr-x root/root usr/bin/cstest
-rwxr-xr-x root/root usr/bin/static.cgi
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/ClearSilver/
-rw-r--r-- root/root usr/include/ClearSilver/ClearSilver.h
@ -79,6 +80,8 @@ drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/cs_init.3.gz
-rw-r--r-- root/root usr/man/man3/cs_parse_file.3.gz
-rw-r--r-- root/root usr/man/man3/cs_parse_string.3.gz
-rw-r--r-- root/root usr/man/man3/cs_register_esc_strfunc.3.gz
-rw-r--r-- root/root usr/man/man3/cs_register_fileload.3.gz
-rw-r--r-- root/root usr/man/man3/cs_register_strfunc.3.gz
-rw-r--r-- root/root usr/man/man3/cs_render.3.gz
-rw-r--r-- root/root usr/man/man3/dictCleanup.3.gz
@ -121,6 +124,7 @@ drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/hdf_obj_value.3.gz
-rw-r--r-- root/root usr/man/man3/hdf_read_string.3.gz
-rw-r--r-- root/root usr/man/man3/hdf_read_string_ignore.3.gz
-rw-r--r-- root/root usr/man/man3/hdf_register_fileload.3.gz
-rw-r--r-- root/root usr/man/man3/hdf_remove_tree.3.gz
-rw-r--r-- root/root usr/man/man3/hdf_search_path.3.gz
-rw-r--r-- root/root usr/man/man3/hdf_set_attr.3.gz

View File

@ -1,2 +1,2 @@
6bd72c6a8579897e77992e7407655c0e clearsilver-0.10.3-patch
ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz
3fb39bf5335f6f977d92dea838409a11 clearsilver-0.10.4.patch
9523df7ef17e41a01dbae5032a3e450b clearsilver-0.10.4.tar.gz

View File

@ -6,14 +6,15 @@
# Depends on: python
name=clearsilver
version=0.10.3
release=2
version=0.10.4
release=1
source=(http://www.clearsilver.net/downloads/$name-$version.tar.gz \
$name-$version-patch)
$name-$version.patch)
build () {
cd $name-$version
patch -p1 -i $SRC/$name-$version-patch
patch -p1 < $SRC/$name-$version.patch
./configure \
--prefix=$PKG/usr \

View File

@ -0,0 +1,9 @@
diff -pruN clearsilver-0.10.4-orig/scripts/document.py clearsilver-0.10.1/scripts/document.py
--- clearsilver-0.10.4-orig/scripts/document.py 2005-08-02 01:30:42.000000000 +1000
+++ clearsilver-0.10.4/scripts/document.py 2005-08-02 01:31:08.000000000 +1000
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
"""
document.py -- Simple script to generate manpages from C header
files. Looks for the following formatted C comments in the C header files: