Merge branch 'master' of ssh://gparabola/srv/git/abslibre

2 files changed, 42 insertions, 27 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index ecbba4e47..dec731c97 100644..100755
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=libretools
 pkgname=(libretools libretools-pr libretools-mips64el)
-pkgver=20111231
+pkgver=$(date -u +%Y%m%d)
 pkgrel=2
 pkgdesc="Scripts for easing Parabola's tasks"
 arch=('any')
@@ -12,7 +12,6 @@ license=('GPL3+')
 depends=(openssh rsync git wget)
 optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)')
 makedepends=(git)
-backup=(etc/libretools.conf)
 install=libretools.install
 source=()
 md5sums=()
@@ -36,42 +35,52 @@ build() {
 }
 
 package_libretools() {
-
-  install -d ${pkgdir}/etc
-  install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
+  backup=(etc/libretools.conf)
 
   install -d ${pkgdir}/etc/libretools.d
-  install -m644 ${_gitname}/cleansystem ${pkgdir}/etc/libretools.d
+  install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/
 
   install -d ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/aur ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/lb ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/
-  install -m755 ${_gitname}/toru ${pkgdir}/usr/bin
-  install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin
-
   install -d ${pkgdir}/usr/sbin
-  install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/
+  install -m755 ${_gitname}/abslibre-commit        ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/add-mips64el           ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/aur                    ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/buildenv               ${pkgdir}/usr/sbin
+  install -m755 ${_gitname}/chcleanup              ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/createworkdir          ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/diff-unfree            ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/fullpkg                ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/fullpkg-build          ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/fullpkg-find           ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/is_built               ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/is_unfree              ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/lb                     ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/libreaddiff            ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/librebasebuilder       ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/librechroot            ${pkgdir}/usr/sbin
+  install -m755 ${_gitname}/librecommit            ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/librediff              ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/libremakepkg           ${pkgdir}/usr/sbin
+  install -m755 ${_gitname}/libremessages          ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/libremkchroot          ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/librerelease           ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/librerepkg             ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/librestage             ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/toru                   ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/toru-path              ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/toru-utils             ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/toru-where             ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/updateabslibre         ${pkgdir}/usr/bin
+  install -m755 ${_gitname}/update-cleansystem     ${pkgdir}/usr/sbin
   
   install -d ${pkgdir}/usr/share/pacman
   install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman
 }
 
 package_libretools-pr() {
+  backup=('etc/libretools.d/prtools.conf')
+
   install -d ${pkgdir}/etc/libretools.d
   install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d
 
@@ -82,6 +91,8 @@ package_libretools-pr() {
 }
 
 package_libretools-mips64el() {
+  backup=('etc/libretools.d/mips64el.conf')
+
   install -d ${pkgdir}/etc/libretools.d
   install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
 
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index 6f8c09d5c..69a0f2467 100644..100755
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # arg 1:  the new package version
 post_install() {
   cat <<EOF
@@ -8,6 +10,7 @@ If you plan using fullpkg you should read http://wiki.parabolagnulinux.org/fullp
 and install libretools-$arch if avaliable
 
 EOF
+  update-cleansystem
 }
 
 ## arg 1:  the new package version
@@ -19,6 +22,7 @@ Check your /etc/libretools.conf
 If using fullpkg, you should install libretools-$arch if avaliable
 
 EOF
+  update-cleansystem
 }
 
 # vim:set ts=2 sw=2 et: