Merge branch '2.2' into 2.3

This commit is contained in:
Tilman Sauerbeck 2007-03-19 08:26:42 +01:00
commit b61176c482
6 changed files with 26 additions and 11 deletions

View File

@ -2,6 +2,7 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/git
-rwxr-xr-x root/root usr/bin/git-add
-rwxr-xr-x root/root usr/bin/git-add--interactive
-rwxr-xr-x root/root usr/bin/git-am
-rwxr-xr-x root/root usr/bin/git-annotate
-rwxr-xr-x root/root usr/bin/git-apply
@ -18,10 +19,12 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/git-checkout-index
-rwxr-xr-x root/root usr/bin/git-cherry
-rwxr-xr-x root/root usr/bin/git-cherry-pick
-rwxr-xr-x root/root usr/bin/git-citool
-rwxr-xr-x root/root usr/bin/git-clean
-rwxr-xr-x root/root usr/bin/git-clone
-rwxr-xr-x root/root usr/bin/git-commit
-rwxr-xr-x root/root usr/bin/git-commit-tree
-rwxr-xr-x root/root usr/bin/git-config
-rwxr-xr-x root/root usr/bin/git-convert-objects
-rwxr-xr-x root/root usr/bin/git-count-objects
-rwxr-xr-x root/root usr/bin/git-cvsexportcommit
@ -34,19 +37,24 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/git-diff-index
-rwxr-xr-x root/root usr/bin/git-diff-stages
-rwxr-xr-x root/root usr/bin/git-diff-tree
-rwxr-xr-x root/root usr/bin/git-fast-import
-rwxr-xr-x root/root usr/bin/git-fetch
-rwxr-xr-x root/root usr/bin/git-fetch-pack
-rwxr-xr-x root/root usr/bin/git-fmt-merge-msg
-rwxr-xr-x root/root usr/bin/git-for-each-ref
-rwxr-xr-x root/root usr/bin/git-format-patch
-rwxr-xr-x root/root usr/bin/git-fsck
-rwxr-xr-x root/root usr/bin/git-fsck-objects
-rwxr-xr-x root/root usr/bin/git-gc
-rwxr-xr-x root/root usr/bin/git-get-tar-commit-id
-rwxr-xr-x root/root usr/bin/git-grep
-rwxr-xr-x root/root usr/bin/git-gui
-rwxr-xr-x root/root usr/bin/git-hash-object
-rwxr-xr-x root/root usr/bin/git-http-fetch
-rwxr-xr-x root/root usr/bin/git-http-push
-rwxr-xr-x root/root usr/bin/git-imap-send
-rwxr-xr-x root/root usr/bin/git-index-pack
-rwxr-xr-x root/root usr/bin/git-init
-rwxr-xr-x root/root usr/bin/git-init-db
-rwxr-xr-x root/root usr/bin/git-instaweb
-rwxr-xr-x root/root usr/bin/git-local-fetch
@ -59,13 +67,12 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/git-mailsplit
-rwxr-xr-x root/root usr/bin/git-merge
-rwxr-xr-x root/root usr/bin/git-merge-base
-rwxr-xr-x root/root usr/bin/git-merge-file
-rwxr-xr-x root/root usr/bin/git-merge-index
-rwxr-xr-x root/root usr/bin/git-merge-octopus
-rwxr-xr-x root/root usr/bin/git-merge-one-file
-rwxr-xr-x root/root usr/bin/git-merge-ours
-rwxr-xr-x root/root usr/bin/git-merge-recur
-rwxr-xr-x root/root usr/bin/git-merge-recursive
-rwxr-xr-x root/root usr/bin/git-merge-recursive-old
-rwxr-xr-x root/root usr/bin/git-merge-resolve
-rwxr-xr-x root/root usr/bin/git-merge-stupid
-rwxr-xr-x root/root usr/bin/git-merge-tree
@ -87,7 +94,9 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/git-read-tree
-rwxr-xr-x root/root usr/bin/git-rebase
-rwxr-xr-x root/root usr/bin/git-receive-pack
-rwxr-xr-x root/root usr/bin/git-reflog
-rwxr-xr-x root/root usr/bin/git-relink
-rwxr-xr-x root/root usr/bin/git-remote
-rwxr-xr-x root/root usr/bin/git-repack
-rwxr-xr-x root/root usr/bin/git-repo-config
-rwxr-xr-x root/root usr/bin/git-request-pull
@ -166,6 +175,7 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/git-clone.1.gz
-rw-r--r-- root/root usr/man/man1/git-commit-tree.1.gz
-rw-r--r-- root/root usr/man/man1/git-commit.1.gz
-rw-r--r-- root/root usr/man/man1/git-config.1.gz
-rw-r--r-- root/root usr/man/man1/git-convert-objects.1.gz
-rw-r--r-- root/root usr/man/man1/git-count-objects.1.gz
-rw-r--r-- root/root usr/man/man1/git-cvsexportcommit.1.gz
@ -178,12 +188,15 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/git-diff-stages.1.gz
-rw-r--r-- root/root usr/man/man1/git-diff-tree.1.gz
-rw-r--r-- root/root usr/man/man1/git-diff.1.gz
-rw-r--r-- root/root usr/man/man1/git-fast-import.1.gz
-rw-r--r-- root/root usr/man/man1/git-fetch-pack.1.gz
-rw-r--r-- root/root usr/man/man1/git-fetch.1.gz
-rw-r--r-- root/root usr/man/man1/git-fmt-merge-msg.1.gz
-rw-r--r-- root/root usr/man/man1/git-for-each-ref.1.gz
-rw-r--r-- root/root usr/man/man1/git-format-patch.1.gz
-rw-r--r-- root/root usr/man/man1/git-fsck-objects.1.gz
-rw-r--r-- root/root usr/man/man1/git-fsck.1.gz
-rw-r--r-- root/root usr/man/man1/git-gc.1.gz
-rw-r--r-- root/root usr/man/man1/git-get-tar-commit-id.1.gz
-rw-r--r-- root/root usr/man/man1/git-grep.1.gz
-rw-r--r-- root/root usr/man/man1/git-hash-object.1.gz
@ -192,6 +205,7 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/git-imap-send.1.gz
-rw-r--r-- root/root usr/man/man1/git-index-pack.1.gz
-rw-r--r-- root/root usr/man/man1/git-init-db.1.gz
-rw-r--r-- root/root usr/man/man1/git-init.1.gz
-rw-r--r-- root/root usr/man/man1/git-instaweb.1.gz
-rw-r--r-- root/root usr/man/man1/git-local-fetch.1.gz
-rw-r--r-- root/root usr/man/man1/git-log.1.gz
@ -202,6 +216,7 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/git-mailinfo.1.gz
-rw-r--r-- root/root usr/man/man1/git-mailsplit.1.gz
-rw-r--r-- root/root usr/man/man1/git-merge-base.1.gz
-rw-r--r-- root/root usr/man/man1/git-merge-file.1.gz
-rw-r--r-- root/root usr/man/man1/git-merge-index.1.gz
-rw-r--r-- root/root usr/man/man1/git-merge-one-file.1.gz
-rw-r--r-- root/root usr/man/man1/git-merge-tree.1.gz
@ -225,7 +240,9 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/git-read-tree.1.gz
-rw-r--r-- root/root usr/man/man1/git-rebase.1.gz
-rw-r--r-- root/root usr/man/man1/git-receive-pack.1.gz
-rw-r--r-- root/root usr/man/man1/git-reflog.1.gz
-rw-r--r-- root/root usr/man/man1/git-relink.1.gz
-rw-r--r-- root/root usr/man/man1/git-remote.1.gz
-rw-r--r-- root/root usr/man/man1/git-repack.1.gz
-rw-r--r-- root/root usr/man/man1/git-repo-config.1.gz
-rw-r--r-- root/root usr/man/man1/git-request-pull.1.gz
@ -275,8 +292,6 @@ drwxr-xr-x root/root usr/man/man7/
-rw-r--r-- root/root usr/man/man7/git.7.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/git-core/
drwxr-xr-x root/root usr/share/git-core/python/
-rwxr-xr-x root/root usr/share/git-core/python/gitMergeCommon.py
drwxr-xr-x root/root usr/share/git-core/templates/
drwxr-xr-x root/root usr/share/git-core/templates/branches/
-rw-r--r-- root/root usr/share/git-core/templates/description
@ -291,4 +306,3 @@ drwxr-xr-x root/root usr/share/git-core/templates/hooks/
-rw-r--r-- root/root usr/share/git-core/templates/hooks/update
drwxr-xr-x root/root usr/share/git-core/templates/info/
-rw-r--r-- root/root usr/share/git-core/templates/info/exclude
drwxr-xr-x root/root usr/share/git-core/templates/remotes/

View File

@ -1,2 +1,2 @@
970aceba959e7fe92f065d7509e6db51 git-1.4.4.4.tar.bz2
6d1cf748480cb6f50d4990660cca3921 git-manpages-1.4.4.4.tar.bz2
adbb4646d075c928cbe02b8e38c60112 git-1.5.0.5.tar.bz2
672dd91ea67774e76683112390841759 git-manpages-1.5.0.5.tar.bz2

View File

@ -5,7 +5,7 @@
# Nice to have: tk
name=git
version=1.4.4.4
version=1.5.0.5
release=1
source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)

View File

@ -514,6 +514,7 @@ drwxr-xr-x root/root usr/lib/wine/
-rwxr-xr-x root/root usr/lib/wine/dnsapi.dll.so
-rwxr-xr-x root/root usr/lib/wine/dplay.dll.so
-rwxr-xr-x root/root usr/lib/wine/dplayx.dll.so
-rwxr-xr-x root/root usr/lib/wine/dpnaddr.dll.so
-rwxr-xr-x root/root usr/lib/wine/dpnet.dll.so
-rwxr-xr-x root/root usr/lib/wine/dpnhpast.dll.so
-rwxr-xr-x root/root usr/lib/wine/dsound.dll.so

View File

@ -1 +1 @@
f9ae61fee02e0b3e72f9aad093a7096c wine-0.9.32.tar.bz2
b2d04c70d17fb36b1a0d98d8e374285d wine-0.9.33.tar.bz2

View File

@ -5,9 +5,9 @@
# Depends on: fontforge
name=wine
version=0.9.32
version=0.9.33
release=1
source=(http://dl.sourceforge.net/sourceforge/$name/wine-$version.tar.bz2)
source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.tar.bz2)
build() {
cd $name-$version