Date: Friday, February 9, 2007 @ 16:54:58 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: .cvsignore (1.3 -> 1.4) doc/.cvsignore (1.1 -> 1.2) lib/libalpm/alpm.c (1.114 -> 1.115) lib/libalpm/package.c (1.64 -> 1.65) lib/libalpm/po/.cvsignore (1.2 -> 1.3) lib/libalpm/versioncmp.h (1.7 -> 1.8) src/pacman/po/.cvsignore (1.2 -> 1.3) src/util/.cvsignore (1.1 -> 1.2) * Fix compile errors/warnings. * Update .cvsignore files a bit. ---------------------------+ .cvsignore | 3 +++ doc/.cvsignore | 3 +-- lib/libalpm/alpm.c | 1 - lib/libalpm/package.c | 3 ++- lib/libalpm/po/.cvsignore | 2 -- lib/libalpm/versioncmp.h | 2 +- src/pacman/po/.cvsignore | 2 -- src/util/.cvsignore | 1 - 8 files changed, 7 insertions(+), 10 deletions(-) Index: pacman-lib/.cvsignore diff -u pacman-lib/.cvsignore:1.3 pacman-lib/.cvsignore:1.4 --- pacman-lib/.cvsignore:1.3 Wed Jan 24 03:51:50 2007 +++ pacman-lib/.cvsignore Fri Feb 9 16:54:57 2007 @@ -16,3 +16,6 @@ ltmain.sh missing stamp-h1 + +tags +cscope.out Index: pacman-lib/doc/.cvsignore diff -u pacman-lib/doc/.cvsignore:1.1 pacman-lib/doc/.cvsignore:1.2 --- pacman-lib/doc/.cvsignore:1.1 Mon Mar 27 12:17:35 2006 +++ pacman-lib/doc/.cvsignore Fri Feb 9 16:54:57 2007 @@ -1,4 +1,3 @@ Makefile Makefile.in -*.3 -*.8 +man3 Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.114 pacman-lib/lib/libalpm/alpm.c:1.115 --- pacman-lib/lib/libalpm/alpm.c:1.114 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/alpm.c Fri Feb 9 16:54:57 2007 @@ -1146,7 +1146,6 @@ /* now do normal upgrades */ for(i = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); i; i = i->next) { - int cmp; int replace=0; pmpkg_t *local = i->data; pmpkg_t *spkg = NULL; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.64 pacman-lib/lib/libalpm/package.c:1.65 --- pacman-lib/lib/libalpm/package.c:1.64 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 9 16:54:57 2007 @@ -31,13 +31,14 @@ #include <locale.h> #include <errno.h> /* pacman */ +#include "package.h" #include "log.h" #include "util.h" #include "error.h" #include "alpm_list.h" -#include "package.h" #include "db.h" #include "handle.h" +#include "versioncmp.h" #include "alpm.h" pmpkg_t *_alpm_pkg_new(const char *name, const char *version) Index: pacman-lib/lib/libalpm/po/.cvsignore diff -u pacman-lib/lib/libalpm/po/.cvsignore:1.2 pacman-lib/lib/libalpm/po/.cvsignore:1.3 --- pacman-lib/lib/libalpm/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/lib/libalpm/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/lib/libalpm/versioncmp.h diff -u pacman-lib/lib/libalpm/versioncmp.h:1.7 pacman-lib/lib/libalpm/versioncmp.h:1.8 --- pacman-lib/lib/libalpm/versioncmp.h:1.7 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/versioncmp.h Fri Feb 9 16:54:57 2007 @@ -27,7 +27,7 @@ #include "package.h" int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); -int _alpm_versioncmp(const char *a, const char *b) +int _alpm_versioncmp(const char *a, const char *b); #endif Index: pacman-lib/src/pacman/po/.cvsignore diff -u pacman-lib/src/pacman/po/.cvsignore:1.2 pacman-lib/src/pacman/po/.cvsignore:1.3 --- pacman-lib/src/pacman/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/src/pacman/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/src/util/.cvsignore diff -u pacman-lib/src/util/.cvsignore:1.1 pacman-lib/src/util/.cvsignore:1.2 --- pacman-lib/src/util/.cvsignore:1.1 Mon Mar 27 12:17:36 2006 +++ pacman-lib/src/util/.cvsignore Fri Feb 9 16:54:58 2007 @@ -2,5 +2,4 @@ .libs Makefile Makefile.in -convertdb vercmp