Merge branch 'maint'

Conflicts:
	lib/libalpm/alpm.h
	lib/libalpm/trans.c

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 7 insertions, 9 deletions

diff --git a/contrib/bacman.in b/contrib/bacman.in
index bd545180..ebcc386d 100755
--- a/contrib/bacman.in
+++ b/contrib/bacman.in
@@ -174,7 +174,7 @@ fi
 echo "# $(LC_ALL=C date)"            >> .PKGINFO
 echo "#"                    >> .PKGINFO
 
-cat "$pkg_dir"/{desc,files,depends} |
+cat "$pkg_dir"/{desc,files} |
 while read i; do
     if [[ -z "$i" ]]; then
         continue;
@@ -220,14 +220,6 @@ while read i; do
         %REPLACES%)
             echo "replaces = $i"    >> .PKGINFO
         ;;
-
-        # files
-        %BACKUP%)
-            # strip the md5sum after the tab
-            echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
-        ;;
-
-        # depends
         %DEPENDS%)
             echo "depend = $i"   >> .PKGINFO
         ;;
@@ -240,6 +232,12 @@ while read i; do
         %PROVIDES%)
             echo "provides = $i"  >> .PKGINFO
         ;;
+
+        # files
+        %BACKUP%)
+            # strip the md5sum after the tab
+            echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
+        ;;
     esac
 done