diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-30 18:03:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-30 18:03:41 -0300 |
| commit | 21270afab1850abfa0e2c97250a3fe2daf47adc0 (patch) | |
| tree | 4dc37f70e26e2be04c2d83a41c849a5499b8da96 /libre | |
| parent | 2eb46b7e94aca9e6cd1e4ec53ff5d11a8b831c22 (diff) | |
| parent | 4718f406cb2caa0278ac4bf11a29775f5a1eb0ed (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/aif-libre/PKGBUILD
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/aif-libre/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/libretools/PKGBUILD | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD index 3d87faa7f..fbf03418a 100644 --- a/libre/aif-libre/PKGBUILD +++ b/libre/aif-libre/PKGBUILD @@ -2,14 +2,15 @@ # Maintainer: Dieter Plaetinck <dieter@plaetinck.be> pkgname=aif-libre -pkgver=2011.08.17 +pkgver=2011.08.25 pkgrel=1 pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)" arch=('any') url="https://projects.parabolagnulinux.org/aif.git" license=('GPL3') depends=('util-linux-ng' 'bash' 'pacman' 'coreutils' 'grub' 'grep' 'mkinitcpio' 'awk' 'sed' 'libui-sh') -optdepends=('cryptsetup: for encryption support' +optdepends=('markdown: to generate the html installation guide' + 'cryptsetup: for encryption support' 'lvm2: for LVM support' 'dhcpd: for dhcp networking support' 'e2fsprogs: Ext support' @@ -18,12 +19,13 @@ optdepends=('cryptsetup: for encryption support' 'xfsprogs: XFS support' 'ntp: setting date with NTP' 'dialog: for ncurses support' + 'curl: for the aif-report-issues.sh script' ) replaces=('aif') conflicts=('aif') provides=('aif') source=($url/snapshot/aif-${pkgver}.tar.bz2) -md5sums=('a234ffdf6fa5c116df97610e7306a98d') +md5sums=('bdf7edbb88276ea99b45ee041a099e01') build() { diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index fd3ea4063..4eafae894 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -59,7 +59,6 @@ package_libretools() { install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/mipsrelease ${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 @@ -73,11 +72,12 @@ package_libretools() { package_libretools-pr() { install -d ${pkgdir}/etc/libretools.d - install -m644 ${_gitname}/prtools.conf ${pkgdir}/etc/libretools.d + install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d install -d ${pkgdir}/usr/bin - install -m755 ${_gitname}/prfullpkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/prmipsrelease ${pkgdir}/usr/bin + install -m755 ${_gitname}/prtools/prfullpkg ${pkgdir}/usr/bin + install -m755 ${_gitname}/prtools/prmipsrelease ${pkgdir}/usr/bin + install -m755 ${_gitname}/prtools/prtoru ${pkgdir}/usr/bin } package_libretools-mips64el() { |