diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-26 17:42:13 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-06-26 17:42:13 -0300 |
| commit | 5ced1078ee328b1134b3acc58d2391c4c34c6860 (patch) | |
| tree | e75143f8c5e75d782745d8edf69b63af34c33da6 /libre | |
| parent | 4f72d84c329d227609bcc426ca3651136bfa7ae8 (diff) | |
| parent | 672592ca58f1cda52932bf6734312f326e66971f (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/libretools/PKGBUILD | 11 | ||||
| -rw-r--r-- | libre/libretools/libretools.install | 5 | ||||
| -rw-r--r-- | libre/thunderbird-libre/rePKGBUILD | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 7f859fa3f..a7024228a 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -23,7 +23,7 @@ build() { ## Git checkout if [ -d $srcdir/${_gitname} ] ; then msg "Git checkout: Updating existing tree" - cd ${_gitname} && git pull origin + cd ${_gitname} && git pull ${_gitroot} msg "Git checkout: Tree has been updated" else msg "Git checkout: Retrieving sources" @@ -34,12 +34,14 @@ build() { } package() { - install -d ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/sbin - install -d ${pkgdir}/etc + install -d ${pkgdir}/etc install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ + install -d ${pkgdir}/etc/libretools.d + install -m644 ${_gitname}/cleansystem ${pkgdir}/etc/libretools.d + + 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 @@ -59,6 +61,7 @@ package() { 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/ }
\ No newline at end of file diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 8eea37689..f8f447e2f 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,4 +1,3 @@ - # arg 1: the new package version post_install() { cat <<EOF @@ -13,7 +12,9 @@ post_upgrade() { cat <<EOF Check your /etc/libretools.conf -Make sure LIBREDESTDIR finish with "repo" instead of "free" +Your REPOS array if using fullpkg should be: +'core' 'extra' 'community' 'libre' + EOF } diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD index 215f893a1..e71f6ad78 100644 --- a/libre/thunderbird-libre/rePKGBUILD +++ b/libre/thunderbird-libre/rePKGBUILD @@ -25,6 +25,7 @@ build() { } package() { + find ${srcdir} -type l -maxdepth 1 -delete cd ${srcdir} cp -a ./* ${pkgdir} } |