Merge branch '2.8' into 3.0
This commit is contained in:
commit
031db46cd2
@ -297,25 +297,25 @@ drwxr-xr-x root/root usr/lib/glib-2.0/
|
||||
drwxr-xr-x root/root usr/lib/glib-2.0/include/
|
||||
-rw-r--r-- root/root usr/lib/glib-2.0/include/glibconfig.h
|
||||
-rwxr-xr-x root/root usr/lib/libgio-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgio-2.0.so -> libgio-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.3400.2
|
||||
-rwxr-xr-x root/root usr/lib/libgio-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgio-2.0.so -> libgio-2.0.so.0.3400.3
|
||||
lrwxrwxrwx root/root usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libgio-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libglib-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.3400.2
|
||||
-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.3400.3
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.3400.2
|
||||
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.3400.3
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libgobject-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.3400.2
|
||||
-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.3400.3
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libgthread-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.3400.2
|
||||
-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.3400.2
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.3400.3
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.3400.3
|
||||
-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.3400.3
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gio-2.0.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gio-unix-2.0.pc
|
||||
@ -332,8 +332,8 @@ drwxr-xr-x root/root usr/share/aclocal/
|
||||
-rw-r--r-- root/root usr/share/aclocal/gsettings.m4
|
||||
drwxr-xr-x root/root usr/share/gdb/
|
||||
drwxr-xr-x root/root usr/share/gdb/auto-load/
|
||||
-rwxr-xr-x root/root usr/share/gdb/auto-load/libglib-2.0.so.0.3400.2-gdb.py
|
||||
-rwxr-xr-x root/root usr/share/gdb/auto-load/libgobject-2.0.so.0.3400.2-gdb.py
|
||||
-rwxr-xr-x root/root usr/share/gdb/auto-load/libglib-2.0.so.0.3400.3-gdb.py
|
||||
-rwxr-xr-x root/root usr/share/gdb/auto-load/libgobject-2.0.so.0.3400.3-gdb.py
|
||||
drwxr-xr-x root/root usr/share/glib-2.0/
|
||||
drwxr-xr-x root/root usr/share/glib-2.0/gdb/
|
||||
-rwxr-xr-x root/root usr/share/glib-2.0/gdb/glib.py
|
||||
|
@ -1 +1 @@
|
||||
a8a6be30781952e5ab2651c79da69a90 glib-2.34.2.tar.xz
|
||||
a4ca31e258273c3761e3de2edd607661 glib-2.34.3.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: libpcre libffi python
|
||||
|
||||
name=glib
|
||||
version=2.34.2
|
||||
version=2.34.3
|
||||
release=1
|
||||
source=(http://download.gnome.org/sources/$name/2.34/$name-$version.tar.xz)
|
||||
|
||||
|
@ -100,6 +100,7 @@ drwxr-xr-x root/root usr/share/cups/model/HP/
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-designjet_t770ps_24in-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-designjet_t790ps_24in-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-designjet_t790ps_44in-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-designjet_t800_t2000_premium-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
|
||||
@ -209,6 +210,8 @@ drwxr-xr-x root/root usr/share/cups/model/HP/
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_mfp_m521-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_mfp_m725-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_p2015_series-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_p2055_series-ps.ppd.gz
|
||||
-rw-r--r-- root/root usr/share/cups/model/HP/hp-laserjet_p3004-ps.ppd.gz
|
||||
|
@ -1 +1 @@
|
||||
f62ab4ceeb424a36b26f044d78a144bb hplip-3.12.10a.tar.gz
|
||||
6caadc4a9e49076c284b146e2dce2937 hplip-3.12.11.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: cups
|
||||
|
||||
name=hpcups
|
||||
version=3.12.10a
|
||||
version=3.12.11
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/project/hplip/hplip/$version/hplip-$version.tar.gz)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
bb8c816a9299be8995255ef70c63b800 php-5.4.8.tar.bz2
|
||||
076a9f84d861d3f664a2878d5773ba78 php-5.4.9.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: apache libxml2
|
||||
|
||||
name=mod_php
|
||||
version=5.4.8
|
||||
version=5.4.9
|
||||
release=1
|
||||
source=(http://www.php.net/distributions/php-$version.tar.bz2)
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
8a21b3b6766bde3b5ed2a6a7b725e4aa nspr-4.9.3.tar.gz
|
||||
cf58772702b3abbdcff14e22014eeeaf nspr-4.9.4.tar.gz
|
||||
2083f33e11dfe15feb7bf9bca0f6c44b nspr.pc.in
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se
|
||||
|
||||
name=nspr
|
||||
version=4.9.3
|
||||
version=4.9.4
|
||||
release=1
|
||||
source=(http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$version/src/$name-$version.tar.gz
|
||||
$name.pc.in)
|
||||
|
@ -1,2 +1,2 @@
|
||||
bb8c816a9299be8995255ef70c63b800 php-5.4.8.tar.bz2
|
||||
076a9f84d861d3f664a2878d5773ba78 php-5.4.9.tar.bz2
|
||||
6297748058441ee6c6b88e429ee54ba1 php-fcgi
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: libpcre libxml2
|
||||
|
||||
name=php-fcgi
|
||||
version=5.4.8
|
||||
version=5.4.9
|
||||
release=1
|
||||
source=(http://www.php.net/distributions/php-$version.tar.bz2
|
||||
php-fcgi)
|
||||
|
@ -1,2 +1,2 @@
|
||||
bb8c816a9299be8995255ef70c63b800 php-5.4.8.tar.bz2
|
||||
076a9f84d861d3f664a2878d5773ba78 php-5.4.9.tar.bz2
|
||||
93be638b655e225b198d2a2ae69ca2fb php-fpm
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: libpcre libxml2
|
||||
|
||||
name=php-fpm
|
||||
version=5.4.8
|
||||
version=5.4.9
|
||||
release=1
|
||||
source=(http://www.php.net/distributions/php-$version.tar.bz2
|
||||
php-fpm)
|
||||
|
@ -1 +1 @@
|
||||
bb8c816a9299be8995255ef70c63b800 php-5.4.8.tar.bz2
|
||||
076a9f84d861d3f664a2878d5773ba78 php-5.4.9.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: mysql
|
||||
|
||||
name=php-mysql
|
||||
version=5.4.8
|
||||
version=5.4.9
|
||||
release=1
|
||||
source=(http://www.php.net/distributions/php-$version.tar.bz2)
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
683de3db60200bc38aa6e154aa925fa6 extensions.ini
|
||||
bb8c816a9299be8995255ef70c63b800 php-5.4.8.tar.bz2
|
||||
076a9f84d861d3f664a2878d5773ba78 php-5.4.9.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: ncurses readline libpcre libxml2 curl db gdbm zip
|
||||
|
||||
name=php
|
||||
version=5.4.8
|
||||
version=5.4.9
|
||||
release=1
|
||||
source=(http://www.php.net/distributions/php-$version.tar.bz2
|
||||
extensions.ini)
|
||||
|
Loading…
x
Reference in New Issue
Block a user