From 4de804d15758d50716b3b9457209fc598819e0b0 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 6 Feb 2007 22:36:13 +0000
Subject: * 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(-)

diff --git a/NEWS b/NEWS
index c3194f2d..69451a1d 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ VERSION         DESCRIPTION
               - 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
diff --git a/TODO.dan b/TODO.dan
index e3186e69..402c0dbc 100644
--- a/TODO.dan
+++ b/TODO.dan
@@ -46,7 +46,6 @@ This is my personal TODO list. No guarantees if it is out of date and things
   -- 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
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index b348bee6..b5425b26 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -56,7 +56,7 @@ BUILDENV=(fakeroot !distcc color !ccache)
 #-- 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)
diff --git a/lib/libalpm/po/POTFILES.in b/lib/libalpm/po/POTFILES.in
index 093b3baa..b1a8aab2 100644
--- a/lib/libalpm/po/POTFILES.in
+++ b/lib/libalpm/po/POTFILES.in
@@ -1,5 +1,6 @@
 add.c
 alpm.c
+alpm_list.c
 backup.c
 be_files.c
 cache.c
@@ -9,7 +10,6 @@ deps.c
 error.c
 group.c
 handle.c
-list.c
 log.c
 md5.c
 md5driver.c
diff --git a/scripts/makepkg b/scripts/makepkg
index dc186d2a..d61335df 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -862,7 +862,8 @@ if [ "$(check_option docs)" = "n" ]; then
 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 @@ for it in "${backup[@]}"; do
 	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..."
diff --git a/src/pacman/package.c b/src/pacman/package.c
index 15c227cf..0b7bd0f4 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -98,9 +98,8 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	if(level > 1) {
 		/* call new backup function */
 		dump_pkg_backups(pkg);
+		printf("\n");
 	}
-
-	printf("\n");
 }
 
 /* Display the content of a sync package
diff --git a/src/pacman/query.c b/src/pacman/query.c
index 36b4af80..72846a52 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -125,7 +125,7 @@ int pacman_query(alpm_list_t *targets)
 	}
 
 	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) {
-- 
cgit v1.2.3-70-g09d2