[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.2-266-g51175f3
Dan McGee
dan at archlinux.org
Sat Jan 22 11:06:39 EST 2011
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 "The official pacman repository".
The branch, master has been updated
via 51175f31c4aac9df6ceeffc7855a0f842c580fdb (commit)
via e277e838d798c1463ae5df98dcf637df70e048ec (commit)
via b947db040c2c586636fc290f0fadbe89e9802450 (commit)
via 859bdb5b1d1b9ccb781c95026836283a005a96ce (commit)
via 01403f423a9bace8b43d45a0dfcea5d4f1002cc8 (commit)
via b8ab96a270caa5d589c44c62d5664db156d94af7 (commit)
via bf46e04614b3740eea4a5e0d44767f57e1cffa4d (commit)
via 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (commit)
via e068b58507ad58e2037aeb323a74d27377a0feac (commit)
via 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a (commit)
from 3863e48788e2424c4f1469e72dabda6fba595c4c (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 51175f31c4aac9df6ceeffc7855a0f842c580fdb
Merge: e277e83 859bdb5
Author: Dan McGee <dan at archlinux.org>
Date: Sat Jan 22 10:03:51 2011 -0600
Merge branch 'epoch-work'
commit e277e838d798c1463ae5df98dcf637df70e048ec
Author: Xavier Chantry <chantry.xavier at gmail.com>
Date: Sat Jan 22 15:15:16 2011 +0100
Makefile: Use git describe --dirty for GIT VERSION
dirty indicates if the repo has uncommited changes or not when building,
so dont hardcode this info.
Signed-off-by: Xavier Chantry <chantry.xavier at gmail.com>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit b947db040c2c586636fc290f0fadbe89e9802450
Author: Allan McRae <allan at archlinux.org>
Date: Sun Jan 23 00:13:24 2011 +1000
repo-add: only attempt to create deltas when asked
repo-add should only attempt to create the delta file when using the -d
option.
Also adjust a couple of tests to use the "double bracket" syntax.
Signed-off-by: Allan McRae <allan at archlinux.org>
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 859bdb5b1d1b9ccb781c95026836283a005a96ce
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jan 20 18:29:41 2011 -0600
doc: update current list of authors
Allan, I had no idea you were not listed here. I think you count as an
active developer at the moment. Also, move Aaron to the past contributors
section.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 01403f423a9bace8b43d45a0dfcea5d4f1002cc8
Author: Dan McGee <dan at archlinux.org>
Date: Fri Jan 7 20:59:51 2011 -0600
doc: add a vercmp manpage
This includes info on version comparison that is very similar to the stuff
in the pacman manpage, but also a few vercmp examples, the return values,
and other fun stuff.
Also update the version comparison stuff in the pacman manpage.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit b8ab96a270caa5d589c44c62d5664db156d94af7
Author: Dan McGee <dan at archlinux.org>
Date: Thu Jan 20 18:16:06 2011 -0600
makepkg: encode epoch in version specifier if > 0
This makes things consistent with everywhere else we are incorporating the
new optional epoch field. Add a helper function that forms the version
string for you and use it in makepkg where I found 'pkgver.*-.*pkgrel'.
This exposes a few shortcomings in a previous "Override pkgver" patch
(2020e629) in the install package and check if built functions.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit bf46e04614b3740eea4a5e0d44767f57e1cffa4d
Author: Dan McGee <dan at archlinux.org>
Date: Mon Jan 10 13:40:31 2011 -0600
Remove epoch as an independent field
Instead, go the same route we have always taken with version-release in
libalpm and treat it all as one piece of information. Makepkg is the only
script that knows about epoch as a distinct value; from there on out we will
parse out the components as necessary.
This makes the code a lot simpler as far as epoch handling goes. The
downside here is that we are tossing some compatibility to the wind;
packages using force will have to be rebuilt with an incremented epoch to
keep their special status.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b
Author: Dan McGee <dan at archlinux.org>
Date: Mon Jan 10 10:44:25 2011 -0600
Allow version comparison to contain epoch specifier
Adapting from RPM, follow the [epoch:]version[-release] syntax. We can also
borrow some of their parsing code for our purposes (thanks!). Add some new
tests to our vercmp shell script tester for epoch comparisons, and then make
the code work with these newfangled epoch specifiers.
Signed-off-by: Dan McGee <dan at archlinux.org>
commit e068b58507ad58e2037aeb323a74d27377a0feac
Author: Dan McGee <dan at archlinux.org>
Date: Mon Jan 3 18:35:27 2011 -0600
pactest: add more testing for epoch
Signed-off-by: Dan McGee <dan at archlinux.org>
commit 50f446886b8b09b9bcdb30494d7a0c4d93a8a37a
Author: Dan McGee <dan at archlinux.org>
Date: Mon Jan 3 17:28:20 2011 -0600
pactest: Rename epoch pactests
Signed-off-by: Dan McGee <dan at archlinux.org>
-----------------------------------------------------------------------
Summary of changes:
contrib/bacman.in | 6 -
doc/.gitignore | 1 +
doc/Makefile.am | 6 +-
doc/PKGBUILD.5.txt | 2 +-
doc/footer.txt | 3 +-
doc/index.txt | 1 +
doc/pacman.8.txt | 6 +-
doc/vercmp.8.txt | 71 +++++++++++
lib/libalpm/alpm.h | 1 -
lib/libalpm/be_local.c | 16 ---
lib/libalpm/be_package.c | 7 -
lib/libalpm/be_sync.c | 9 --
lib/libalpm/package.c | 20 ---
lib/libalpm/package.h | 2 -
lib/libalpm/version.c | 157 ++++++++++++++++++-------
scripts/Makefile.am | 2 +-
scripts/makepkg.sh.in | 67 +++++++----
scripts/repo-add.sh.in | 28 ++---
src/pacman/Makefile.am | 2 +-
src/util/vercmp.c | 4 +-
test/pacman/pmdb.py | 14 ---
test/pacman/pmpkg.py | 6 -
test/pacman/pmrule.py | 3 -
test/pacman/tests/{sync140.py => epoch001.py} | 5 +-
test/pacman/tests/{sync141.py => epoch002.py} | 3 +-
test/pacman/tests/{sync142.py => epoch003.py} | 8 +-
test/pacman/tests/{sync143.py => epoch004.py} | 8 +-
test/pacman/tests/epoch010.py | 12 ++
test/pacman/tests/epoch011.py | 12 ++
test/pacman/tests/epoch012.py | 13 ++
test/pacman/tests/sync136.py | 5 +-
test/pacman/tests/sync137.py | 3 +-
test/util/vercmptest.sh | 19 +++
33 files changed, 332 insertions(+), 190 deletions(-)
create mode 100644 doc/vercmp.8.txt
rename test/pacman/tests/{sync140.py => epoch001.py} (72%)
rename test/pacman/tests/{sync141.py => epoch002.py} (86%)
rename test/pacman/tests/{sync142.py => epoch003.py} (60%)
rename test/pacman/tests/{sync143.py => epoch004.py} (71%)
create mode 100644 test/pacman/tests/epoch010.py
create mode 100644 test/pacman/tests/epoch011.py
create mode 100644 test/pacman/tests/epoch012.py
hooks/post-receive
--
The official pacman repository
More information about the pacman-dev
mailing list