Merge remote branch 'origin/2.2' into 2.2

This commit is contained in:
Danny Rawlins 2006-12-11 19:46:00 +11:00
commit a8b018a808
6 changed files with 85 additions and 41 deletions

View File

@ -14,6 +14,8 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/hgext/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/bugzilla.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/extdiff.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/extdiff.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/fetch.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/fetch.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/gpg.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/gpg.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/hbisect.py
@ -26,17 +28,20 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/hgext/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/notify.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/patchbomb.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/patchbomb.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/transplant.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/transplant.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/win32text.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/hgext/win32text.pyc
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/__init__.py (EMPTY)
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/__init__.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/__version__.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/__version__.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/ancestor.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/ancestor.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/appendfile.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/appendfile.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/archival.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/archival.pyc
-rwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/base85.so
-rwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/bdiff.so
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/bundlerepo.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/bundlerepo.pyc
@ -46,6 +51,8 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/changegroup.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/changelog.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/changelog.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/cmdutil.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/cmdutil.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/commands.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/commands.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/context.py
@ -58,6 +65,8 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/fancyopts.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/filelog.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/filelog.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/help.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/help.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/hg.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/hg.pyc
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/hgweb/
@ -89,15 +98,21 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/hgweb/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/lock.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/lsprof.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/lsprof.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/mail.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/mail.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/manifest.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/manifest.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/mdiff.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/mdiff.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/merge.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/merge.pyc
-rwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/mpatch.so
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/node.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/node.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/packagescan.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/packagescan.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/patch.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/patch.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/remoterepo.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/remoterepo.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/repo.py
@ -112,61 +127,88 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/hgweb/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/statichttprepo.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/streamclone.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/streamclone.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/strutil.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/strutil.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templater.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templater.pyc
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/templates/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changelog-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changelog-rss.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changelogentry-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changelogentry-rss.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changelogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changeset-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changeset-raw.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/changeset.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/error-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/error.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/fileannotate-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/fileannotate-raw.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/fileannotate.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filediff-raw.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filediff.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filelog-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filelog-rss.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filelogentry-rss.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filelogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filerevision-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/filerevision.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/footer-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/footer.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/header-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/header-raw.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/header-rss.tmpl
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/changelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/changelogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/changeset.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/error.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/fileannotate.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/filediff.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/filelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/filerevision.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/footer.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/header.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/index.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/manifest.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/map
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/search.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/shortlog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/summary.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/gitweb/tags.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/header.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/index.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/manifest-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/manifest.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/map
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/map-cmdline.changelog
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/map-cmdline.compact
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/map-cmdline.default
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/map-gitweb
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/map-raw
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/map-rss
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/notfound.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/search-gitweb.tmpl
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/templates/old/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/changelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/changelogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/changeset.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/fileannotate.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/filediff.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/filelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/filelogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/filerevision.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/footer.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/header.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/manifest.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/map
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/search.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/shortlog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/shortlogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/old/tags.tmpl
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/templates/raw/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/raw/changeset.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/raw/fileannotate.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/raw/filediff.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/raw/header.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/raw/map
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/changelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/changelogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/filelog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/filelogentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/header.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/map
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/tagentry.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/rss/tags.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/search.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/shortlog-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/shortlog.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/shortlogentry.tmpl
drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/templates/static/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/static/hgicon.png
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/static/style-gitweb.css
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/static/style.css
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/summary-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/tagentry-rss.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/tags-gitweb.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/tags-rss.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/tags.tmpl
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/templates/template-vars.txt
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/transaction.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/transaction.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/ui.py
@ -175,5 +217,7 @@ drwxr-xr-x root/root usr/lib/python2.4/site-packages/mercurial/templates/static/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/util.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/util_win32.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/util_win32.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/verify.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/verify.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/version.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/mercurial/version.pyc

View File

@ -1 +1 @@
9ed3962bba640a686c37faa47739270c mercurial-0.9.1.tar.gz
31529a7d81997f2388ad20df0ba4889e mercurial-0.9.2.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: python
name=mercurial
version=0.9.1
version=0.9.2
release=1
source=(http://www.selenic.com/mercurial/release/mercurial-$version.tar.gz)

View File

@ -18,20 +18,20 @@ drwxr-xr-x root/root usr/include/nvidia/GL/
-r--r--r-- root/root usr/include/nvidia/GL/glxext.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libGL.la
-rwxr-xr-x root/root usr/lib/libGL.so.1.0.9629
-rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.9629
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.9629
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.9629
-rwxr-xr-x root/root usr/lib/libGL.so.1.0.9631
-rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.9631
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.9631
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.9631
drwxr-xr-x root/root usr/lib/tls/
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.9629
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.9631
drwxr-xr-x root/root usr/lib/xorg/
-r--r--r-- root/root usr/lib/xorg/libXvMCNVIDIA.a
-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.1.0.9629
-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.1.0.9631
drwxr-xr-x root/root usr/lib/xorg/modules/
drwxr-xr-x root/root usr/lib/xorg/modules/drivers/
-rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so
drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.1.0.9629
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.1.0.9631
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/nvidia-settings.1.gz

View File

@ -1,2 +1,2 @@
f3a4129e1d5e9b06828627da56ca149d NVIDIA-Linux-x86-1.0-9629-pkg0.run
b0d721c962c4df1a028ae18416d7e862 NVIDIA-Linux-x86-1.0-9631-pkg0.run
544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch

View File

@ -6,7 +6,7 @@
# Nice to have: gl-select-x11r7
name=nvidia-x11r7
version=1.0-9629
version=1.0-9631
release=1
source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
nvidia-makefile.patch)