Merge branch '2.5' into 2.6

Conflicts:
	php-mysql/Pkgfile
	procmail/Pkgfile
This commit is contained in:
Juergen Daubert 2009-06-22 18:44:03 +02:00
commit b6c6451f20
29 changed files with 58 additions and 274 deletions

View File

@ -1 +1 @@
6f8279f55d57f4fa610a0e22a0eab861 AdbeRdr9.1.0-1_i486linux_enu.tar.bz2
6d05897dbded59792a1a83952837d3cf AdbeRdr9.1.2-1_i486linux_enu.tar.bz2

View File

@ -2,12 +2,12 @@
# URL: http://www.adobe.com/
# Maintainer: Jose V Beneyto, sepen at crux dot nu
# Packager: Markus Ackermann, maol at symlink dot ch
# Depends on: gtk, libstdc++-compat
# Depends on: gtk libstdc++-compat
name=adobereader
version=9.1
version=9.1.2
release=1
source=(http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/$version/enu/AdbeRdr${version}.0-1_i486linux_enu.tar.bz2)
source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$version/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2)
PKGMK_NO_STRIP="yes"
build() {

View File

@ -15,9 +15,9 @@ drwxr-xr-x root/root usr/include/cairo/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libcairo.a
-rwxr-xr-x root/root usr/lib/libcairo.la
lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.10800.6
lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.10800.6
-rwxr-xr-x root/root usr/lib/libcairo.so.2.10800.6
lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.10800.8
lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.10800.8
-rwxr-xr-x root/root usr/lib/libcairo.so.2.10800.8
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/cairo-ft.pc
-rw-r--r-- root/root usr/lib/pkgconfig/cairo-glitz.pc

View File

@ -1 +1 @@
4e64139ef6f668df24450f3b81dd0771 cairo-1.8.6.tar.gz
d3e1a1035ae563812d4dd44a74fb0dd0 cairo-1.8.8.tar.gz

View File

@ -5,8 +5,8 @@
# Nice to have: xorg-xcb-util
name=cairo
version=1.8.6
release=2
version=1.8.8
release=1
source=(http://cairographics.org/releases/$name-$version.tar.gz)
build() {

View File

@ -4,8 +4,10 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/dpid
-rwxr-xr-x root/root usr/bin/dpidc
drwxr-xr-x root/root usr/etc/
-rw-r--r-- root/root usr/etc/dillorc
-rw-r--r-- root/root usr/etc/dpidrc
drwxr-xr-x root/root usr/etc/dillo/
-rw-r--r-- root/root usr/etc/dillo/dillorc
-rw-r--r-- root/root usr/etc/dillo/dpidrc
-rw-r--r-- root/root usr/etc/dillo/keysrc
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/dillo/
drwxr-xr-x root/root usr/lib/dillo/dpi/
@ -25,3 +27,6 @@ drwxr-xr-x root/root usr/lib/dillo/dpi/hello/
-rwxr-xr-x root/root usr/lib/dillo/dpi/hello/hello.filter.dpi
drwxr-xr-x root/root usr/lib/dillo/dpi/https/
-rwxr-xr-x root/root usr/lib/dillo/dpi/https/https.filter.dpi
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/dillo.1.gz

View File

@ -1 +1 @@
bb9999cabeb4db3d915687de465dbeb0 dillo-2.0.tar.bz2
c703851a5c44f739195febd09268edc1 dillo-2.1.tar.bz2

View File

@ -1,16 +1,18 @@
# Description: A graphical web browser in less than 600KB
# Description: A graphical web browser in less than 700KB
# URL: http://www.dillo.org
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
# Depends on: fltk2
name=dillo
version=2.0
version=2.1
release=1
source=(http://www.dillo.org/download/$name-$version.tar.bz2)
build () {
cd $name-$version
./configure --prefix=/usr --enable-ipv6
./configure --prefix=/usr \
--mandir=/usr/man \
--enable-ipv6
make
make DESTDIR=$PKG install
}

View File

@ -1 +1 @@
5b482b106e7417a9d7aa5b03a37911cc fakeroot_1.12.3.tar.gz
aaefede2405a40c87438e7e833d69b70 fakeroot_1.12.4.tar.gz

View File

@ -3,7 +3,7 @@
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
name=fakeroot
version=1.12.3
version=1.12.4
release=1
source=(http://ftp.de.debian.org/debian/pool/main/f/$name/${name}_$version.tar.gz)

View File

@ -12,8 +12,8 @@ drwxr-xr-x root/root usr/include/sensors/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libsensors.a
lrwxrwxrwx root/root usr/lib/libsensors.so -> libsensors.so.4
lrwxrwxrwx root/root usr/lib/libsensors.so.4 -> libsensors.so.4.1.0
-rwxr-xr-x root/root usr/lib/libsensors.so.4.1.0
lrwxrwxrwx root/root usr/lib/libsensors.so.4 -> libsensors.so.4.2.0
-rwxr-xr-x root/root usr/lib/libsensors.so.4.2.0
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/sensors.1.gz

View File

@ -1 +1 @@
e23130eaa46c66b861729835e08bdccf lm_sensors-3.1.0.tar.bz2
613d7cfa23b70c0abae3fabb0a72ff5f lm_sensors-3.1.1.tar.bz2

View File

@ -5,7 +5,7 @@
# Nice to have: i2c-tools
name=lm_sensors
version=3.1.0
version=3.1.1
release=1
source=(http://dl.lm-sensors.org/lm-sensors/releases/$name-$version.tar.bz2)

View File

@ -1 +1 @@
280d6cda7f72a4fc6de42fda21ac2db7 php-5.2.9.tar.bz2
15c7b5a87f57332d6fc683528e28247b php-5.2.10.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: libpcre zlib apache libxml2
name=mod_php
version=5.2.9
version=5.2.10
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2)

View File

@ -45,25 +45,25 @@ drwxr-xr-x root/root usr/include/pango-1.0/pango/
-rw-r--r-- root/root usr/include/pango-1.0/pango/pangoxft.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libpango-1.0.la
lrwxrwxrwx root/root usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2400.2
-rwxr-xr-x root/root usr/lib/libpango-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2400.3
lrwxrwxrwx root/root usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2400.3
-rwxr-xr-x root/root usr/lib/libpango-1.0.so.0.2400.3
-rwxr-xr-x root/root usr/lib/libpangocairo-1.0.la
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.2400.2
-rwxr-xr-x root/root usr/lib/libpangocairo-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.2400.3
lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.2400.3
-rwxr-xr-x root/root usr/lib/libpangocairo-1.0.so.0.2400.3
-rw-r--r-- root/root usr/lib/libpangoft2-1.0.la
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.2400.2
-rwxr-xr-x root/root usr/lib/libpangoft2-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.2400.3
lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.2400.3
-rwxr-xr-x root/root usr/lib/libpangoft2-1.0.so.0.2400.3
-rw-r--r-- root/root usr/lib/libpangox-1.0.la
lrwxrwxrwx root/root usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.2400.2
-rwxr-xr-x root/root usr/lib/libpangox-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.2400.3
lrwxrwxrwx root/root usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.2400.3
-rwxr-xr-x root/root usr/lib/libpangox-1.0.so.0.2400.3
-rw-r--r-- root/root usr/lib/libpangoxft-1.0.la
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.2400.2
-rwxr-xr-x root/root usr/lib/libpangoxft-1.0.so.0.2400.2
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.2400.3
lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.2400.3
-rwxr-xr-x root/root usr/lib/libpangoxft-1.0.so.0.2400.3
drwxr-xr-x root/root usr/lib/pango/
drwxr-xr-x root/root usr/lib/pango/1.6.0/
drwxr-xr-x root/root usr/lib/pango/1.6.0/modules/

View File

@ -1,2 +1,2 @@
7bc6c884d847cabc613e4c6d663771f5 pango-1.24.2.tar.bz2
63979efe16fe5abaa93c8ea48959e8f3 pango-1.24.3.tar.bz2
ad3b91d1e3a3181615034ad6d511c8b0 pango.modules

View File

@ -4,7 +4,7 @@
# Depends on: cairo, glib, xorg-libsm, xorg-libxext, xorg-libxft
name=pango
version=1.24.2
version=1.24.3
release=1
source=(http://download.gnome.org/sources/$name/1.24/$name-$version.tar.bz2 \
pango.modules)

View File

@ -1,2 +1,2 @@
280d6cda7f72a4fc6de42fda21ac2db7 php-5.2.9.tar.bz2
15c7b5a87f57332d6fc683528e28247b php-5.2.10.tar.bz2
6297748058441ee6c6b88e429ee54ba1 php-fcgi

View File

@ -4,7 +4,7 @@
# Depends on: libpcre zlib libxml2
name=php-fcgi
version=5.2.9
version=5.2.10
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2
php-fcgi)

View File

@ -1 +1 @@
280d6cda7f72a4fc6de42fda21ac2db7 php-5.2.9.tar.bz2
15c7b5a87f57332d6fc683528e28247b php-5.2.10.tar.bz2

View File

@ -4,8 +4,8 @@
# Depends on: mysql zlib
name=php-mysql
version=5.2.9
release=2
version=5.2.10
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2)
build () {

View File

@ -1,2 +1,2 @@
683de3db60200bc38aa6e154aa925fa6 extensions.ini
280d6cda7f72a4fc6de42fda21ac2db7 php-5.2.9.tar.bz2
15c7b5a87f57332d6fc683528e28247b php-5.2.10.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: ncurses readline zlib libpcre libxml2 bzip2 curl db gdbm zip
name=php
version=5.2.9
version=5.2.10
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2
extensions.ini)

View File

@ -5,7 +5,7 @@
name=procmail
version=3.22
release=3
source=(ftp://ftp.procmail.net/pub/procmail/$name-$version.tar.gz
source=(http://www.procmail.org/$name-$version.tar.gz
$name-getline.patch)
build() {

View File

@ -1,6 +1,3 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/unison
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/unison.1.gz

View File

@ -1,2 +1,2 @@
4ba0a3e4bf4b4ad0c063f86391371f78 unison-2.27.57.tar.gz
b042d21bca3179645486c46d76deffba unison-2.27.149.tar.gz
c3d6644df76adbf44c3c12eb4fc11587 unison.1

View File

@ -5,7 +5,7 @@
# Depends on: ocaml
name=unison
version=2.27.57
version=2.27.149
release=1
source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$name-$version.tar.gz \
$name.1)
@ -15,5 +15,4 @@ build() {
unset CFLAGS CXXFLAGS
make -j1 UISTYLE=text THREADS=true
install -D -m 755 unison $PKG/usr/bin/unison
install -D -m 644 $SRC/unison.1 $PKG/usr/man/man1/unison.1
}

View File

@ -1,219 +0,0 @@
.\" Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH UNISON 1 "September 23, 2001"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh disable hyphenation
.\" .hy enable hyphenation
.\" .ad l left justify
.\" .ad b justify to both left and right margins
.\" .nf disable filling
.\" .fi enable filling
.\" .br insert line break
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
unison \- a file-synchronization tool for Unix and Windows
.SH SYNOPSIS
.B unison
.RI [ options ]
.br
.B unison
root1 root2
.RI [ options ]
.br
.B unison
profilename
.RI [ options ]
.br
.B unison-gtk
.RI [ options ]
.SH DESCRIPTION
This manual page briefly documents Unison, and was written for the
Debian GNU/Linux distribution because the original program does not
have a manual page. For a full description, please refer to the
inbuilt documentation or the manuals in /usr/share/doc/unison/. The
unison-gtk binary has similar command-line options, but allows the user
to select and create profiles and configure options from within the
program.
.PP
Unison is a file-synchronization tool for Unix and Windows. It allows
two replicas of a collection of files and directories to be stored on
different hosts (or different disks on the same host), modified
separately, and then brought up to date by propagating the changes in
each replica to the other.
.PP
Unison offers several advantages over various synchronization methods
such as CVS, Coda, rsync, Intellisync, etc. Unison can run on and
synchronize between Windows and many UNIX platforms. Unison requires
no root privileges, system access or kernel changes to function. Unison
can synchronize changes to files and directories in both directions,
on the same machine, or across a network using ssh or a direct
socket connection.
.PP
Transfers are optimised using a version of the rsync protocol, making
it ideal for slower links. Unison has a clear and precise specification,
and is resilient to failure due to its careful handling of the replicas
and its private structures.
.SH OPTIONS
All Unison options are long, starting with one dash (`-') only.
A summary of options is included here. For a complete description,
see the inbuilt documentation or the manuals in /usr/share/doc/unison/.
.TP
.B \-addprefsto
specify a file to add new preferences to in interactive mode
.TP
.B \-addversionno
add version number to name of unison executable on server
.TP
.B \-auto
automatically accept default actions
.TP
.B \-backup xxx
add a regexp to the backup list
.TP
.B \-backups
keep backup copies of files (deprecated: use 'backup')
.TP
.B \-batch
batch mode: ask no questions at all
.TP
.B \-contactquietly
suppress the 'contacting server' message during startup
.TP
.B \-debug xxx
debug module xxx ('all' -> everything, 'verbose' -> more)
.TP
.B \-doc xxx
show documentation ('-doc topics' lists topics)
.TP
.B \-dumbtty
do not try to change terminal settings in text UI
.TP
.B \-editor xxx
command for displaying the output of the -merge program
.TP
.B \-fastcheck
do fast (and slightly unsafe) update detection on windows
.TP
.B \-follow xxx
add a regexp to the follow list
.TP
.B \-force xxx
force changes from this replica to the other
.TP
.B \-group
synchronize group
.TP
.B \-height n
height (in lines) of main window in graphical interface
.TP
.B \-ignore xxx
add a regexp to the ignore list
.TP
.B \-ignorecase
ignore upper/lowercase spelling of filenames
.TP
.B \-ignorenot xxx
add a regexp to the ignorenot list
.TP
.B \-killserver
kill server when done (even when using sockets)
.TP
.B \-log
record actions in file specified by logfile preference
.TP
.B \-logfile xxx
log file name
.TP
.B \-maxbackups n
number of backed up versions of a file to keep
.TP
.B \-merge xxx
command for merging conflicting files
.TP
.B \-merge2 xxx
command for merging files (when no common version exists)
.TP
.B \-numericids
don't map uid/gid values by user/group names
.TP
.B \-owner
synchronize owner
.TP
.B \-path xxx
path to synchronize
.TP
.B \-perms n
part of the permissions which is synchronized
.TP
.B \-prefer xxx
choose this replica's version in case of conflict
.TP
.B \-root xxx
root of a replica
.TP
.B \-rootalias xxx
register alias for canonical root names
.TP
.B \-rshargs xxx
other arguments (if any) for remote shell command
.TP
.B \-rshcmd xxx
path to the rsh executable
.TP
.B \-servercmd xxx
name of unison executable on remote server
.TP
.B \-silent
print nothing (except error messages)
.TP
.B \-socket xxx
act as a server on a socket
.TP
.B \-sortbysize
list changed files by size, not name
.TP
.B \-sortfirst xxx
add a regexp to the sortfirst list
.TP
.B \-sortlast xxx
add a regexp to the sortlast list
.TP
.B \-sortnewfirst
list new before changed files
.TP
.B \-sshcmd xxx
path to the ssh executable
.TP
.B \-statusdepth n
status display depth for local files
.TP
.B \-terse
suppress status messages
.TP
.B \-testserver
exit immediately after the connection to the server
.TP
.B \-times
synchronize modification times
.TP
.B \-ui xxx
select user interface ('text' or 'graphic')
.TP
.B \-version
print version and exit
.PP
Some preferences are just boolean flags. Others take numeric or string
arguments, indicated in the preferences list by n or xxx. Most of the
string preferences can be given several times; the arguments are
accumulated into a list internally.
.SH SEE ALSO
The program is documented fully in the in-built documentation and the
manual, available as HTML, PostScript and text in /usr/share/doc/unison/.
.SH AUTHOR
This manual page was written by Robert McQueen <robot101@debian.org>,
for the Debian GNU/Linux system (but may be used by others).