This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638 (commit) via 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 (commit) via 077de40a4cefb4cc38c4a9a0b2a477e1102ead93 (commit) via ad306a7a299badacdd8c31bab3511ab9804af8df (commit) via cacb0b4eb94c5c21ab067f4e21f6758d564f8d9a (commit) via 81e02ac0b284171e3388eac8eb420a725f2baab1 (commit) via 3c6ab3d121387d53e3cb02273c38968922d4a272 (commit) from 2165fbb2de31272c652055adff8a0665957f58e9 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638 Merge: 2165fbb 38a76ff Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Oct 21 20:43:45 2010 +0200
Merge commit 'origin/master' into next
Conflicts: config/rootfiles/core/41/filelists/files src/paks/linux-pae/uninstall.sh
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/bzip2 | 48 +++++++++++++++++++-------------------- lfs/bzip2 | 6 ++-- src/install+setup/setup/main.c | 6 ++-- 3 files changed, 29 insertions(+), 31 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 index 550b9f1..b91b89d 100644 --- a/config/rootfiles/common/bzip2 +++ b/config/rootfiles/common/bzip2 @@ -2,28 +2,26 @@ bin/bunzip2 bin/bzcat bin/bzip2 lib/libbz2.so.1.0 -lib/libbz2.so.1.0.4 -usr/lib/libbz2.so -usr/local/bin/bunzip2 -usr/local/bin/bzcat -#usr/local/bin/bzcmp -#usr/local/bin/bzdiff -#usr/local/bin/bzegrep -#usr/local/bin/bzfgrep -#usr/local/bin/bzgrep -usr/local/bin/bzip2 -#usr/local/bin/bzip2recover -#usr/local/bin/bzless -#usr/local/bin/bzmore -usr/local/include/bzlib.h -usr/local/lib/libbz2.a -#usr/local/man -#usr/local/man/man1 -#usr/local/man/man1/bzcmp.1 -#usr/local/man/man1/bzdiff.1 -#usr/local/man/man1/bzegrep.1 -#usr/local/man/man1/bzfgrep.1 -#usr/local/man/man1/bzgrep.1 -#usr/local/man/man1/bzip2.1 -#usr/local/man/man1/bzless.1 -#usr/local/man/man1/bzmore.1 +lib/libbz2.so.1.0.6 +usr/bin/bunzip2 +usr/bin/bzcat +usr/bin/bzcmp +usr/bin/bzdiff +usr/bin/bzegrep +usr/bin/bzfgrep +usr/bin/bzgrep +usr/bin/bzip2 +usr/bin/bzip2recover +usr/bin/bzless +usr/bin/bzmore +usr/include/bzlib.h +#usr/lib/libbz2.a +#usr/lib/libbz2.so +#usr/man/man1/bzcmp.1 +#usr/man/man1/bzdiff.1 +#usr/man/man1/bzegrep.1 +#usr/man/man1/bzfgrep.1 +#usr/man/man1/bzgrep.1 +#usr/man/man1/bzip2.1 +#usr/man/man1/bzless.1 +#usr/man/man1/bzmore.1 diff --git a/lfs/bzip2 b/lfs/bzip2 index 4712f31..44fa757 100644 --- a/lfs/bzip2 +++ b/lfs/bzip2 @@ -24,7 +24,7 @@
include Config
-VER = 1.0.5 +VER = 1.0.6
THISAPP = bzip2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3c15a0c8d1d3ee1c46a1634d00617b1a +$(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b
install : $(TARGET)
@@ -82,7 +82,7 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make -f Makefile-libbz2_so cd $(DIR_APP) && make clean cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && make install PREFIX=/usr cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2 cd $(DIR_APP) && cp -av libbz2.so* /lib ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c index f0d3604..33cae34 100644 --- a/src/install+setup/setup/main.c +++ b/src/install+setup/setup/main.c @@ -23,7 +23,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } }; extern char *en_tr[]; extern char *de_tr[]; extern char *fr_tr[]; - +extern char *es_tr[];
int main(int argc, char *argv[]) { @@ -31,8 +31,8 @@ int main(int argc, char *argv[]) char *shortlangnames[] = { "en", NULL }; char **langtrs[] = { en_tr, NULL }; #else - char *shortlangnames[] = { "de", "en", "fr", NULL }; - char **langtrs[] = { de_tr, en_tr, fr_tr, NULL }; + char *shortlangnames[] = { "de", "en", "fr", "es", NULL }; + char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL }; #endif int choice; char *sections[11]; /* need to fill this out AFTER knowning lang */
hooks/post-receive -- IPFire 2.x development tree