aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-01-22 22:18:27 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-01-22 22:18:27 -0600
commit63f8d34fa97bfb356d449cb4955cd31908d3bfef (patch)
treed746f6d6d8a08db9218fc3340b27968065971f6f
parent9841563556a4d9dee59eaf998d69518661cfa464 (diff)
downloadaports-63f8d34fa97bfb356d449cb4955cd31908d3bfef.tar.bz2
aports-63f8d34fa97bfb356d449cb4955cd31908d3bfef.tar.xz
testing/gnome-terminal: bring inline with gnome packaging policy
-rw-r--r--testing/gnome-terminal/APKBUILD4
-rw-r--r--testing/gnome-terminal/gnome-terminal.post-deinstall4
-rw-r--r--testing/gnome-terminal/gnome-terminal.post-install7
-rw-r--r--testing/gnome-terminal/gnome-terminal.post-upgrade7
-rw-r--r--testing/gnome-terminal/gnome-terminal.pre-deinstall7
5 files changed, 19 insertions, 10 deletions
diff --git a/testing/gnome-terminal/APKBUILD b/testing/gnome-terminal/APKBUILD
index 27a80cb153..ca5ba597fc 100644
--- a/testing/gnome-terminal/APKBUILD
+++ b/testing/gnome-terminal/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=gnome-terminal
pkgver=2.33.4
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME terminal emulator"
url="http://projects.gnome.org/gnome-terminal"
arch="all"
license="GPL"
depends="libgnome"
makedepends="gtk+-dev vte-dev gconf-dev libx11-dev gnome-doc-utils libsm-dev ncurses-dev"
-install="$pkgname.post-install $pkgname.post-deinstall $pkgname.post-upgrade"
+install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
subpackages=
source="ftp://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
diff --git a/testing/gnome-terminal/gnome-terminal.post-deinstall b/testing/gnome-terminal/gnome-terminal.post-deinstall
deleted file mode 100644
index 5ce4725623..0000000000
--- a/testing/gnome-terminal/gnome-terminal.post-deinstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
- /usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/gnome-terminal.schemas
diff --git a/testing/gnome-terminal/gnome-terminal.post-install b/testing/gnome-terminal/gnome-terminal.post-install
index 6891e90fa0..7da0a45406 100644
--- a/testing/gnome-terminal/gnome-terminal.post-install
+++ b/testing/gnome-terminal/gnome-terminal.post-install
@@ -1,4 +1,7 @@
#!/bin/sh
-GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
- /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/gnome-terminal.schemas
+for i in gnome-terminal.schemas; do
+ echo "Installing GConf2 schema $i."
+ GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
+ /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
+done
diff --git a/testing/gnome-terminal/gnome-terminal.post-upgrade b/testing/gnome-terminal/gnome-terminal.post-upgrade
index 6891e90fa0..7da0a45406 100644
--- a/testing/gnome-terminal/gnome-terminal.post-upgrade
+++ b/testing/gnome-terminal/gnome-terminal.post-upgrade
@@ -1,4 +1,7 @@
#!/bin/sh
-GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
- /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/gnome-terminal.schemas
+for i in gnome-terminal.schemas; do
+ echo "Installing GConf2 schema $i."
+ GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
+ /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
+done
diff --git a/testing/gnome-terminal/gnome-terminal.pre-deinstall b/testing/gnome-terminal/gnome-terminal.pre-deinstall
new file mode 100644
index 0000000000..b888a3f330
--- /dev/null
+++ b/testing/gnome-terminal/gnome-terminal.pre-deinstall
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in gnome-terminal.schemas; do
+ echo "Uninstalling GConf2 schema $i."
+ GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
+ /usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
+done