From 342e0b62273226ce59baa6cc7bb47a10a13102cd Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 24 Oct 2013 23:01:13 +0200 Subject: gpp conflicts with other packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 2 +- dist/archlinux/stable/PKGBUILD | 4 ++-- dist/archlinux/stable/general-preprocessor.install | 20 ++++++++++++++++++++ dist/archlinux/stable/gpp.install | 20 -------------------- 4 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 dist/archlinux/stable/general-preprocessor.install delete mode 100644 dist/archlinux/stable/gpp.install diff --git a/.gitignore b/.gitignore index 7b8ca43..e7bc08a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ bin/ __pycache__/ /dist/*/*/* !/dist/*/*/PKGBUILD -!/dist/*/*/gpp.install +!/dist/*/*/*.install .* !.git* \#*\# diff --git a/dist/archlinux/stable/PKGBUILD b/dist/archlinux/stable/PKGBUILD index f997f85..592cae5 100644 --- a/dist/archlinux/stable/PKGBUILD +++ b/dist/archlinux/stable/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -pkgname=gpp +pkgname=general-preprocessor pkgver=1 pkgrel=1 pkgdesc="Bash based preprocessor for anything" @@ -9,7 +9,7 @@ arch=(any) license=(GPL3) depends=(python bash) makedepends=(make coreutils python texinfo gzip) -install=gpp.install +install=general-preprocessor.install source=("${url}/archive/${pkgver}.tar.gz") sha256sums=(1f60c616624e4cbef9140f19b758c7132f509e50dc659ef133952f1e46ddab25) diff --git a/dist/archlinux/stable/general-preprocessor.install b/dist/archlinux/stable/general-preprocessor.install new file mode 100644 index 0000000..822bdd3 --- /dev/null +++ b/dist/archlinux/stable/general-preprocessor.install @@ -0,0 +1,20 @@ +_file="general-preprocessor" + +infodir="usr/share/info" +file="${_file}.info.gz" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/dist/archlinux/stable/gpp.install b/dist/archlinux/stable/gpp.install deleted file mode 100644 index 5204b7e..0000000 --- a/dist/archlinux/stable/gpp.install +++ /dev/null @@ -1,20 +0,0 @@ -_file="gpp" - -infodir="usr/share/info" -file="${_file}.info.gz" - - -post_install() { - [[ -x "usr/bin/install-info" ]] || return 0 - install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x "usr/bin/install-info" ]] || return 0 - install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null -} - -- cgit v1.2.3-70-g09d2