Merge remote branch 'origin/2.2' into 2.2

This commit is contained in:
Danny Rawlins 2007-02-15 16:01:08 +11:00
commit 4f385c0c92
9 changed files with 101 additions and 29 deletions

54
exiv2/.footprint Normal file
View File

@ -0,0 +1,54 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/exiv2
-rwxr-xr-x root/root usr/bin/exiv2-config
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/exiv2/
-rw-r--r-- root/root usr/include/exiv2/basicio.hpp
-rw-r--r-- root/root usr/include/exiv2/canonmn.hpp
-rw-r--r-- root/root usr/include/exiv2/cr2image.hpp
-rw-r--r-- root/root usr/include/exiv2/crwimage.hpp
-rw-r--r-- root/root usr/include/exiv2/datasets.hpp
-rw-r--r-- root/root usr/include/exiv2/error.hpp
-rw-r--r-- root/root usr/include/exiv2/exif.hpp
-rw-r--r-- root/root usr/include/exiv2/exiv2_version.h
-rw-r--r-- root/root usr/include/exiv2/exv_conf.h
-rw-r--r-- root/root usr/include/exiv2/exv_msvc.h
-rw-r--r-- root/root usr/include/exiv2/fujimn.hpp
-rw-r--r-- root/root usr/include/exiv2/futils.hpp
-rw-r--r-- root/root usr/include/exiv2/ifd.hpp
-rw-r--r-- root/root usr/include/exiv2/image.hpp
-rw-r--r-- root/root usr/include/exiv2/iptc.hpp
-rw-r--r-- root/root usr/include/exiv2/jpgimage.hpp
-rw-r--r-- root/root usr/include/exiv2/makernote.hpp
-rw-r--r-- root/root usr/include/exiv2/makernote2.hpp
-rw-r--r-- root/root usr/include/exiv2/metadatum.hpp
-rw-r--r-- root/root usr/include/exiv2/minoltamn.hpp
-rw-r--r-- root/root usr/include/exiv2/mn.hpp
-rw-r--r-- root/root usr/include/exiv2/mrwimage.hpp
-rw-r--r-- root/root usr/include/exiv2/nikonmn.hpp
-rw-r--r-- root/root usr/include/exiv2/olympusmn.hpp
-rw-r--r-- root/root usr/include/exiv2/panasonicmn.hpp
-rw-r--r-- root/root usr/include/exiv2/pngchunk.hpp
-rw-r--r-- root/root usr/include/exiv2/pngimage.hpp
-rw-r--r-- root/root usr/include/exiv2/rcsid.hpp
-rw-r--r-- root/root usr/include/exiv2/sigmamn.hpp
-rw-r--r-- root/root usr/include/exiv2/sonymn.hpp
-rw-r--r-- root/root usr/include/exiv2/tags.hpp
-rw-r--r-- root/root usr/include/exiv2/tiffcomposite.hpp
-rw-r--r-- root/root usr/include/exiv2/tifffwd.hpp
-rw-r--r-- root/root usr/include/exiv2/tiffimage.hpp
-rw-r--r-- root/root usr/include/exiv2/tiffparser.hpp
-rw-r--r-- root/root usr/include/exiv2/tiffvisitor.hpp
-rw-r--r-- root/root usr/include/exiv2/types.hpp
-rw-r--r-- root/root usr/include/exiv2/value.hpp
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libexiv2-0.12.so
-rw-r--r-- root/root usr/lib/libexiv2.a
-rw-r--r-- root/root usr/lib/libexiv2.la
lrwxrwxrwx root/root usr/lib/libexiv2.so -> libexiv2-0.12.so
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/exiv2.pc
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/exiv2.1.gz

1
exiv2/.md5sum Normal file
View File

@ -0,0 +1 @@
a97a4e489df7ec99458e3e33b506c3e6 exiv2-0.12.tar.gz

18
exiv2/Pkgfile Normal file
View File

@ -0,0 +1,18 @@
# Description: Exif and Iptc metadata manipulation library and tools.
# URL: http://home.arcor.de/ahuggel/exiv2/index.html
# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve
# Depends on:
name=exiv2
version=0.12
release=1
source=(http://www.exiv2.org/exiv2-$version.tar.gz)
build() {
cd $name-$version
./configure --prefix=/usr
make
make prefix=$PKG/usr install
mv $PKG/usr/share/man $PKG/usr
rmdir $PKG/usr/share
}

View File

@ -74,16 +74,6 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/help/en_GB/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_GB/options.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_GB/read_mail.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_GB/search.hlp
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/help/en_US/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/FAQ.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/addresses.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/basic.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/compose.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/folders.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/main_folder.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/options.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/read_mail.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/en_US/search.hlp
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/help/es_ES/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/es_ES/FAQ.hlp
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/help/es_ES/addresses.hlp
@ -339,6 +329,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES/squirrelmail.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES/vacation_local.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES/vacation_local.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES/yelp.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/LC_MESSAGES/yelp.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/cs_CZ/setup.php
@ -429,6 +421,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/es_ES/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/es_ES/LC_MESSAGES/squirrelmail.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/es_ES/LC_MESSAGES/unsafe_image_rules.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/es_ES/LC_MESSAGES/unsafe_image_rules.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/es_ES/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/es_ES/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/es_ES/setup.php
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/et_EE/
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/et_EE/LC_MESSAGES/
@ -485,6 +479,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES/squirrelmail.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES/vacation_local.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES/vacation_local.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES/yelp.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/LC_MESSAGES/yelp.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/fr_FR/setup.php
@ -513,6 +509,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES/cookie_warning.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES/folder_sizes.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES/folder_sizes.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES/select_language.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES/select_language.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/LC_MESSAGES/squirrelmail.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/id_ID/setup.php
@ -633,6 +631,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/naguser.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/newuser_wiz.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/newuser_wiz.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/proon.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/proon.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/qmailadmin_login.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/qmailadmin_login.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/reply_buttons.mo
@ -663,6 +663,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/vacation_local.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/verify_reply_to.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/verify_reply_to.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/web_search.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/web_search.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/lt_LT/LC_MESSAGES/yelp.mo
@ -690,6 +692,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/nl_NL/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nl_NL/LC_MESSAGES/squirrelmail.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nl_NL/LC_MESSAGES/vacation_local.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nl_NL/LC_MESSAGES/vacation_local.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nl_NL/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nl_NL/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nl_NL/setup.php
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/
@ -771,6 +775,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/vacation_local.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/verify_reply_to.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/verify_reply_to.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/web_search.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/web_search.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/nn_NO/LC_MESSAGES/yelp.mo
@ -791,6 +797,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/pt_BR/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/pt_BR/LC_MESSAGES/squirrelmail.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/pt_BR/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/pt_BR/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/pt_BR/setup.php
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/pt_PT/
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/pt_PT/LC_MESSAGES/
@ -953,6 +961,8 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/templates.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/vacation_local.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/vacation_local.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/vkeyboard.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/vkeyboard.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/web_search.mo
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/web_search.po
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/locale/uk_UA/LC_MESSAGES/yelp.mo

View File

@ -1 +1 @@
83774a3cd782bd2bd91f7f92f54c3e37 all_locales-1.4.8-20060811.tar.bz2
eaa0e8835b8d7d451500aad907c22e24 all_locales-1.4.9-20070106.tar.bz2

View File

@ -4,8 +4,8 @@
# Depends on: squirrelmail
name=squirrelmail-translations
version=1.4.8-20060811
release=1
version=1.4.9-20070106
release=2
source=(http://dl.sourceforge.net/sourceforge/squirrelmail/all_locales-$version.tar.bz2)
build() {
@ -27,4 +27,5 @@ build() {
cp -r $dir $PKG/$SQM_HTDOCS_ROOT/squirrelmail
done
fi
rm -rf $PKG/$SQM_HTDOCS_ROOT/squirrelmail/help/en_US
}

View File

@ -31,17 +31,6 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/config/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/config/config_default.php
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/config/config_local.php
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/config/index.php
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/contrib/
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/contrib/RPM/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/RPM/config.php.redhat
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/RPM/squirrelmail.conf
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/RPM/squirrelmail.cron
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/RPM/squirrelmail.spec
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/conf.pl.8
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/decrypt_headers.php
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/squirrelmail.mailto.NT2KXP.reg
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/contrib/squirrelmail.mailto.reg
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/data/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/data/.htaccess
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/data/default_pref
@ -231,7 +220,6 @@ drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/plugins/mail_fetch/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/plugins/mail_fetch/index.php
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/plugins/mail_fetch/options.php
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/plugins/mail_fetch/setup.php
-rwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/plugins/make_archive.pl
drwxr-xr-x root/root srv/www/apache/htdocs/squirrelmail/plugins/message_details/
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/plugins/message_details/index.php
-rw-r--r-- root/root srv/www/apache/htdocs/squirrelmail/plugins/message_details/message_details_bottom.php

View File

@ -1 +1 @@
ba3306e4790bbdb10eaccb00195f5107 squirrelmail-1.4.8.tar.bz2
3adf66bfe2e816ba8375cf811d8ef3f6 squirrelmail-1.4.9a.tar.bz2

View File

@ -4,8 +4,8 @@
# Depends on: apache mod_php
name=squirrelmail
version=1.4.8
release=2
version=1.4.9a
release=1
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
build() {
@ -14,7 +14,7 @@ build() {
fi
cd $name-$version
mkdir -p $PKG/$SQM_HTDOCS_ROOT/squirrelmail
cp -r {class,config,contrib,data,functions,help,images,include,locale,plugins,po,src,themes} $PKG/$SQM_HTDOCS_ROOT/squirrelmail
cp -r {class,config,data,functions,help,images,include,locale,plugins,po,src,themes} $PKG/$SQM_HTDOCS_ROOT/squirrelmail
cp index.php $PKG/$SQM_HTDOCS_ROOT/squirrelmail/
rm $PKG/$SQM_HTDOCS_ROOT/squirrelmail/locale/README.locales
rm $PKG/$SQM_HTDOCS_ROOT/squirrelmail/themes/README.themes