Merge branch '2.6' into 2.7

Conflicts:
	python/.footprint
	python/.md5sum
	python/Pkgfile
This commit is contained in:
Juergen Daubert 2010-08-30 19:59:18 +02:00
commit 74f73f759c
7 changed files with 22 additions and 11 deletions

View File

@ -44,9 +44,9 @@ drwxr-xr-x root/root usr/lib/gutenprint/5.2/
drwxr-xr-x root/root usr/lib/gutenprint/5.2/modules/
-rw-r--r-- root/root usr/lib/libgutenprint.a
-rwxr-xr-x root/root usr/lib/libgutenprint.la
lrwxrwxrwx root/root usr/lib/libgutenprint.so -> libgutenprint.so.2.0.6
lrwxrwxrwx root/root usr/lib/libgutenprint.so.2 -> libgutenprint.so.2.0.6
-rwxr-xr-x root/root usr/lib/libgutenprint.so.2.0.6
lrwxrwxrwx root/root usr/lib/libgutenprint.so -> libgutenprint.so.2.0.7
lrwxrwxrwx root/root usr/lib/libgutenprint.so.2 -> libgutenprint.so.2.0.7
-rwxr-xr-x root/root usr/lib/libgutenprint.so.2.0.7
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gutenprint.pc
drwxr-xr-x root/root usr/man/
@ -103,6 +103,7 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/inks/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_pigment.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/standard_gen0.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml
@ -117,6 +118,8 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/pro3880.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/r1800.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/r2400.xml
@ -154,11 +157,13 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/media/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/photo_pigment.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/picturemate_4.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/picturemate_6.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro3880_ultrachrome_k3v.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_gen1.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_gen2.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_pigment.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/r800.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/standard.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml
@ -172,6 +177,13 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/model/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_100.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_101.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_102.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_103.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_104.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_105.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_106.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_107.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_11.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_12.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_13.xml

View File

@ -1 +1 @@
10a0a9fac081d8116ec5ed47fbc1591c gutenprint-5.2.5.tar.bz2
1f0d0cbef6c089f4f095e21869fa70db gutenprint-5.2.6.tar.bz2

View File

@ -4,9 +4,9 @@
# Depends on: cups, ncurses, readline
name=gutenprint
version=5.2.5
version=5.2.6
release=1
source=(http://dl.sourceforge.net/sourceforge/gimp-print/$name-$version.tar.bz2)
source=(http://downloads.sourceforge.net/project/gimp-print/$name-5.2/$version/$name-$version.tar.bz2)
build () {
cd $name-$version
@ -24,4 +24,3 @@ build () {
rm -r $PKG/usr/share/gutenprint/{doc,samples}
rm -r $PKG/usr/share/locale
}
#--enable-cups-ppds \

View File

@ -1 +1 @@
dd5e006504851563e3ca27640d9e7abd sharutils-4.9.tar.bz2
f918859228238d69e1ce78ccbec8f9e0 sharutils-4.10.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on:
name=sharutils
version=4.9
version=4.10
release=1
source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2)

View File

@ -1,2 +1,2 @@
2bc971a1753fe57aca05fde7c005a16c configure.diff
10d211f6986c4b279cfa9530b2361457 xterm-261.tgz
d25eab48f995893f9d115fbfeea6b658 xterm-262.tgz

View File

@ -5,7 +5,7 @@
# Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc
name=xterm
version=261
version=262
release=1
source=(ftp://invisible-island.net/$name/$name-$version.tgz \
configure.diff)