Merge branch '3.0' into 3.1
This commit is contained in:
commit
ad2dcf2c72
@ -18,17 +18,17 @@ drwxr-xr-x root/root usr/include/
|
||||
-rw-r--r-- root/root usr/include/clamav.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/libclamav.la
|
||||
lrwxrwxrwx root/root usr/lib/libclamav.so -> libclamav.so.6.1.22
|
||||
lrwxrwxrwx root/root usr/lib/libclamav.so.6 -> libclamav.so.6.1.22
|
||||
-rwxr-xr-x root/root usr/lib/libclamav.so.6.1.22
|
||||
lrwxrwxrwx root/root usr/lib/libclamav.so -> libclamav.so.6.1.23
|
||||
lrwxrwxrwx root/root usr/lib/libclamav.so.6 -> libclamav.so.6.1.23
|
||||
-rwxr-xr-x root/root usr/lib/libclamav.so.6.1.23
|
||||
-rwxr-xr-x root/root usr/lib/libclamunrar.la
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar.so -> libclamunrar.so.6.1.22
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar.so.6 -> libclamunrar.so.6.1.22
|
||||
-rwxr-xr-x root/root usr/lib/libclamunrar.so.6.1.22
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar.so -> libclamunrar.so.6.1.23
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar.so.6 -> libclamunrar.so.6.1.23
|
||||
-rwxr-xr-x root/root usr/lib/libclamunrar.so.6.1.23
|
||||
-rwxr-xr-x root/root usr/lib/libclamunrar_iface.la
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar_iface.so -> libclamunrar_iface.so.6.1.22
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar_iface.so.6 -> libclamunrar_iface.so.6.1.22
|
||||
-rwxr-xr-x root/root usr/lib/libclamunrar_iface.so.6.1.22
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar_iface.so -> libclamunrar_iface.so.6.1.23
|
||||
lrwxrwxrwx root/root usr/lib/libclamunrar_iface.so.6 -> libclamunrar_iface.so.6.1.23
|
||||
-rwxr-xr-x root/root usr/lib/libclamunrar_iface.so.6.1.23
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libclamav.pc
|
||||
drwxr-xr-x root/root usr/man/
|
||||
|
@ -1,4 +1,4 @@
|
||||
b649d35ee85d4d6075a98173dd255c17 clamav-0.98.3.tar.gz
|
||||
6d409eab6c311de05a0a591fccd2ec83 clamav-0.98.4.tar.gz
|
||||
aaac6d51260a03830f04d561ea8dda37 clamd
|
||||
9d2a838b95ce45afbee5a17d5e61b5cd clamd.conf
|
||||
c7d815c57b585a63815c1e1d626421fc freshclam
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: zlib, bzip2, libgmp, curl
|
||||
|
||||
name=clamav
|
||||
version=0.98.3
|
||||
version=0.98.4
|
||||
release=1
|
||||
source=(http://download.sourceforge.net/$name/$name-$version.tar.gz \
|
||||
clamd.conf freshclam.conf clamd freshclam)
|
||||
|
@ -5,9 +5,9 @@ drwxr-xr-x root/root usr/include/harfbuzz/
|
||||
-rw-r--r-- root/root usr/include/harfbuzz/hb-icu.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/libharfbuzz-icu.la
|
||||
lrwxrwxrwx root/root usr/lib/libharfbuzz-icu.so -> libharfbuzz-icu.so.0.927.0
|
||||
lrwxrwxrwx root/root usr/lib/libharfbuzz-icu.so.0 -> libharfbuzz-icu.so.0.927.0
|
||||
-rwxr-xr-x root/root usr/lib/libharfbuzz-icu.so.0.927.0
|
||||
lrwxrwxrwx root/root usr/lib/libharfbuzz-icu.so -> libharfbuzz-icu.so.0.929.0
|
||||
lrwxrwxrwx root/root usr/lib/libharfbuzz-icu.so.0 -> libharfbuzz-icu.so.0.929.0
|
||||
-rwxr-xr-x root/root usr/lib/libharfbuzz-icu.so.0.929.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/harfbuzz-icu.pc
|
||||
drwxr-xr-x root/root usr/share/
|
||||
|
@ -1 +1 @@
|
||||
60e122288c0ea4d66505d4704e376a1c harfbuzz-0.9.27.tar.bz2
|
||||
6251eb6d57e8c4e9e855188dbbdf8b6d harfbuzz-0.9.29.tar.bz2
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: harfbuzz icu
|
||||
|
||||
name=harfbuzz-icu
|
||||
version=0.9.27
|
||||
version=0.9.29
|
||||
release=1
|
||||
source=(http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$version.tar.bz2)
|
||||
|
||||
@ -31,6 +31,7 @@ build() {
|
||||
$PKG/usr/include/harfbuzz/hb-font.h \
|
||||
$PKG/usr/include/harfbuzz/hb-ft.h \
|
||||
$PKG/usr/include/harfbuzz/hb-glib.h \
|
||||
$PKG/usr/include/harfbuzz/hb-ot-font.h \
|
||||
$PKG/usr/include/harfbuzz/hb-ot-layout.h \
|
||||
$PKG/usr/include/harfbuzz/hb-ot-shape.h \
|
||||
$PKG/usr/include/harfbuzz/hb-ot-tag.h \
|
||||
|
@ -1,5 +1,5 @@
|
||||
00df80a84ec9528fcfb09498075525bc ntp-4.2.6p5.tar.gz
|
||||
0c5675c46a226de4504f5b855326b6b7 ntp-64bit.diff
|
||||
99133142249735be5c8f48f1b6ca6821 ntp.conf
|
||||
eed11bcd8b443bc9b2c96dc5a33cbdc0 ntpd
|
||||
81250961599ecb64d9c0ca96d96b1d73 ntpd
|
||||
3714dba66445d1b41d6c699447c7a65e ntpdate
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
name=ntp
|
||||
version=4.2.6p5
|
||||
release=4
|
||||
release=5
|
||||
source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$name-$version.tar.gz
|
||||
ntpd
|
||||
ntpdate
|
||||
|
4
ntp/ntpd
4
ntp/ntpd
@ -5,8 +5,8 @@
|
||||
|
||||
case $1 in
|
||||
start)
|
||||
/usr/bin/ntpd -u ntp:ntp -gqx
|
||||
/usr/bin/ntpd -u ntp:ntp
|
||||
(/usr/bin/ntpd -u ntp:ntp -gqx
|
||||
/usr/bin/ntpd -u ntp:ntp) &
|
||||
;;
|
||||
stop)
|
||||
/sbin/hwclock -w
|
||||
|
@ -1199,6 +1199,7 @@ drwxr-xr-x root/root usr/share/scribus/icons/32/
|
||||
-rw-r--r-- root/root usr/share/scribus/icons/Kern.xpm
|
||||
-rw-r--r-- root/root usr/share/scribus/icons/Kreise.xpm
|
||||
-rw-r--r-- root/root usr/share/scribus/icons/Kreuz.xpm
|
||||
-rw-r--r-- root/root usr/share/scribus/icons/LinkTextFrame.png
|
||||
-rw-r--r-- root/root usr/share/scribus/icons/Lock.xpm
|
||||
-rw-r--r-- root/root usr/share/scribus/icons/Lupe.xpm
|
||||
-rw-r--r-- root/root usr/share/scribus/icons/LupeZ.xpm
|
||||
@ -1451,6 +1452,7 @@ drwxr-xr-x root/root usr/share/scribus/samples/
|
||||
-rw-r--r-- root/root usr/share/scribus/samples/trait_de_coupe.py
|
||||
-rw-r--r-- root/root usr/share/scribus/samples/wordcount.py
|
||||
drwxr-xr-x root/root usr/share/scribus/scripts/
|
||||
-rw-r--r-- root/root usr/share/scribus/scripts/Align_image_in_frame.py
|
||||
-rw-r--r-- root/root usr/share/scribus/scripts/Autoquote.py
|
||||
-rw-r--r-- root/root usr/share/scribus/scripts/CalendarWizard.py
|
||||
-rw-r--r-- root/root usr/share/scribus/scripts/ColorChart.py
|
||||
@ -1493,6 +1495,7 @@ drwxr-xr-x root/root usr/share/scribus/swatches/
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/Bundesregierung_HKS.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/COPYING_RESENE.txt
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/Classic_Kit.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/ColorBrewer.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/Colortrend Wood Stains_bs00_3.eps
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/Colortrend Wood Stains_bs01_3.eps
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/Colortrend Wood Stains_kd01_4.eps
|
||||
@ -1562,6 +1565,8 @@ drwxr-xr-x root/root usr/share/scribus/swatches/
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/LaTeX_Beamer.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/LibreOffice.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/Munsell_Soil_Colors.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/NAA-Colors_license-.rtf
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/NAA_Colors_10-2006.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/NBS-ISCC_Colors.xml
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/OSMO Einmallasur_bs00_3.eps
|
||||
-rw-r--r-- root/root usr/share/scribus/swatches/OSMO Einmallasur_bs01_3.eps
|
||||
|
@ -1 +1 @@
|
||||
4083332f4eee78082b814767b7d7c597 scribus-1.4.3.tar.xz
|
||||
a5714ee53074d4b8b77b59612f5e27a8 scribus-1.4.4.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: qt4, libart_lgpl, cmake, cairo, cups
|
||||
|
||||
name=scribus
|
||||
version=1.4.3
|
||||
version=1.4.4
|
||||
release=1
|
||||
source=(http://download.sourceforge.net/$name/$name-$version.tar.xz)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user