diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-30 12:20:28 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-30 12:20:28 -0300 |
| commit | cbd27aa2c3c49e4d93979e847d8b177a1a4fe324 (patch) | |
| tree | 2518fdda7fa59c59e691c6de52f830d58545aed4 /libre | |
| parent | c6ead99bc92bd2b6da3e78e9cba5a8a86764de10 (diff) | |
| parent | 946f0c9fe48dfb648a8a0be065e92f237ce210fd (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/flashrom/PKGBUILD
extra/chmlib/PKGBUILD
extra/crypto++/PKGBUILD
extra/dvgrab/PKGBUILD
extra/ebook-tools/PKGBUILD
extra/fping/PKGBUILD
extra/garcon/PKGBUILD
extra/gpart/PKGBUILD
extra/gtk2-perl/PKGBUILD
extra/hd2u/PKGBUILD
extra/hexedit/PKGBUILD
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/lsb-release-libre/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/lsb-release-libre/lsb-release.install | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD index 5eb411a97..0f2457924 100644 --- a/libre/lsb-release-libre/PKGBUILD +++ b/libre/lsb-release-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=lsb-release pkgname=lsb-release-libre pkgver=1.4 -pkgrel=10 +pkgrel=11 pkgdesc="LSB version query program with Parabola name" arch=('any') url="http://www.linuxbase.org/" @@ -27,7 +27,7 @@ build() { package() { cd "$srcdir/$_pkgname-$pkgver" install -dm755 "$pkgdir/etc" - echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-Libre\"" > "$pkgdir/etc/lsb-release" + echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" > "$pkgdir/etc/lsb-release" install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz" install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release" diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release-libre/lsb-release.install index 6ce4fee54..62d404892 100644 --- a/libre/lsb-release-libre/lsb-release.install +++ b/libre/lsb-release-libre/lsb-release.install @@ -1,12 +1,14 @@ post_install() { - echo "Parabola GNU/Linux-Libre release" >> /etc/arch-release + rm -f /etc/arch-release + echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release } post_upgrade() { - sed -e '/Parabola GNU\/Linux-Libre release/d' -i /etc/arch-release - echo "Parabola GNU/Linux-Libre release" >> /etc/arch-release + rm -f /etc/arch-release + sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release + echo "Parabola GNU/Linux-libre release" >> /etc/parabola-release } pre_remove() { - sed -e '/Parabola GNU\/Linux-Libre release/d' -i /etc/arch-release + sed -e '/Parabola GNU\/Linux-[Ll]ibre release/d' -i /etc/parabola-release } |