Date: Tuesday, February 6, 2007 @ 17:36:14 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.6 -> 1.7) TODO.dan (1.3 -> 1.4) etc/makepkg.conf.in (1.11 -> 1.12) lib/libalpm/po/POTFILES.in (1.2 -> 1.3) scripts/makepkg (1.44 -> 1.45) src/pacman/package.c (1.26 -> 1.27) src/pacman/query.c (1.22 -> 1.23) * Makepkg updates, and small bugfix on man page compression. * Change libtool default to makepkg2 behavior. * Other small changes. ----------------------------+ NEWS | 1 + TODO.dan | 1 - etc/makepkg.conf.in | 2 +- lib/libalpm/po/POTFILES.in | 2 +- scripts/makepkg | 10 +++++++++- src/pacman/package.c | 3 +-- src/pacman/query.c | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.6 pacman-lib/NEWS:1.7 --- pacman-lib/NEWS:1.6 Fri Feb 2 22:46:06 2007 +++ pacman-lib/NEWS Tue Feb 6 17:36:13 2007 @@ -21,6 +21,7 @@ - added pactest testing suite - abs - supports cvsup/csup, expanded configuration - makepkg fixes: + - new configuration file options format - support alternate integrity checks - extract files using filetype, not extension - added noextract array Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.3 pacman-lib/TODO.dan:1.4 --- pacman-lib/TODO.dan:1.3 Sun Feb 4 13:28:21 2007 +++ pacman-lib/TODO.dan Tue Feb 6 17:36:13 2007 @@ -46,7 +46,6 @@ -- http://everything2.com/?node_id=556079 Quick hits: -* log_progress and cb_trans_progress - same function? not quite but close * unsigned int vs. unsigned * 'ldd' & 'ldd -u' - many linkages * possibly split utilities/extras from pacman package Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.11 pacman-lib/etc/makepkg.conf.in:1.12 --- pacman-lib/etc/makepkg.conf.in:1.11 Sun Feb 4 13:31:39 2007 +++ pacman-lib/etc/makepkg.conf.in Tue Feb 6 17:36:13 2007 @@ -56,7 +56,7 @@ #-- libtool: Leave libtool (.la) files in binaries #-- emptydirs: Leave empty directories in binaries # -OPTIONS=(strip !docs !libtool emptydirs) +OPTIONS=(strip !docs libtool emptydirs) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5 sha1) Index: pacman-lib/lib/libalpm/po/POTFILES.in diff -u pacman-lib/lib/libalpm/po/POTFILES.in:1.2 pacman-lib/lib/libalpm/po/POTFILES.in:1.3 --- pacman-lib/lib/libalpm/po/POTFILES.in:1.2 Sun Oct 15 15:31:07 2006 +++ pacman-lib/lib/libalpm/po/POTFILES.in Tue Feb 6 17:36:13 2007 @@ -1,5 +1,6 @@ add.c alpm.c +alpm_list.c backup.c be_files.c cache.c @@ -9,7 +10,6 @@ error.c group.c handle.c -list.c log.c md5.c md5driver.c Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.44 pacman-lib/scripts/makepkg:1.45 --- pacman-lib/scripts/makepkg:1.44 Tue Feb 6 16:20:20 2007 +++ pacman-lib/scripts/makepkg Tue Feb 6 17:36:14 2007 @@ -862,7 +862,8 @@ fi # move /usr/share/man files to /usr/man -if [ -d pkg/usr/share/man ]; then +if [ -d $startdir/pkg/usr/share/man ]; then + cd $startdir mkdir -p pkg/usr/man cp -a pkg/usr/share/man/* pkg/usr/man/ rm -rf pkg/usr/share/man @@ -964,6 +965,13 @@ echo "backup = $it" >>.PKGINFO done +# TODO maybe remove this at some point +# warn if license array is not present or empty +if [ "$license" = "" ]; then + warning "Please add a license line to your $BUILDSCRIPT!" + plain "example for GPL'ed software: license=('GPL')." +fi + # check for an install script if [ "$install" != "" ]; then msg "Copying install script..." Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.26 pacman-lib/src/pacman/package.c:1.27 --- pacman-lib/src/pacman/package.c:1.26 Wed Jan 31 21:16:13 2007 +++ pacman-lib/src/pacman/package.c Tue Feb 6 17:36:14 2007 @@ -98,9 +98,8 @@ if(level > 1) { /* call new backup function */ dump_pkg_backups(pkg); + printf("\n"); } - - printf("\n"); } /* Display the content of a sync package Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.22 pacman-lib/src/pacman/query.c:1.23 --- pacman-lib/src/pacman/query.c:1.22 Sun Feb 4 03:26:53 2007 +++ pacman-lib/src/pacman/query.c Tue Feb 6 17:36:14 2007 @@ -125,7 +125,7 @@ } if(config->op_q_upgrade) { - MSG(NL, _("Checking for package upgrades")); + MSG(NL, _("Checking for package upgrades...")); alpm_list_t *syncpkgs; if((syncpkgs = alpm_get_upgrades()) != NULL) {