From 8ed9622e7a4b509097dc32b525d8fe323dff46ee Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 24 Jan 2011 11:35:23 -0600
Subject: testing/gnome-system-monitor: promote to main

---
 main/gnome-system-monitor/APKBUILD                 | 66 ++++++++++++++++++++++
 .../gnome-system-monitor.post-install              |  7 +++
 .../gnome-system-monitor.post-upgrade              |  7 +++
 .../gnome-system-monitor.pre-deinstall             |  7 +++
 testing/gnome-system-monitor/APKBUILD              | 66 ----------------------
 .../gnome-system-monitor.post-install              |  7 ---
 .../gnome-system-monitor.post-upgrade              |  7 ---
 .../gnome-system-monitor.pre-deinstall             |  7 ---
 8 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 main/gnome-system-monitor/APKBUILD
 create mode 100644 main/gnome-system-monitor/gnome-system-monitor.post-install
 create mode 100644 main/gnome-system-monitor/gnome-system-monitor.post-upgrade
 create mode 100644 main/gnome-system-monitor/gnome-system-monitor.pre-deinstall
 delete mode 100644 testing/gnome-system-monitor/APKBUILD
 delete mode 100644 testing/gnome-system-monitor/gnome-system-monitor.post-install
 delete mode 100644 testing/gnome-system-monitor/gnome-system-monitor.post-upgrade
 delete mode 100644 testing/gnome-system-monitor/gnome-system-monitor.pre-deinstall

diff --git a/main/gnome-system-monitor/APKBUILD b/main/gnome-system-monitor/APKBUILD
new file mode 100644
index 000000000..cc12f2b5f
--- /dev/null
+++ b/main/gnome-system-monitor/APKBUILD
@@ -0,0 +1,66 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=gnome-system-monitor
+pkgver=2.28.2
+pkgrel=0
+pkgdesc="GNOME system monitor"
+url="http://www.gnome.org"
+arch="all"
+license="GPL"
+depends=
+depends_dev="gtk+-dev
+	     gconf-dev
+	     libx11-dev
+	     gnome-doc-utils
+	     libgnome-dev
+	     gnome-desktop-dev
+	     libwnck-dev
+	     librsvg-dev
+	     libunique-dev
+
+	     libxcursor-dev
+	     libxcomposite-dev
+	     libxi-dev
+	     libxau-dev
+	     libxdmcp-dev
+	     libxext-dev
+	     libxcb-dev
+
+	     libgtop-dev
+	     libgnomekbd-dev
+	     libxklavier-dev
+
+	     gtkmm-dev
+	     glibmm-dev"
+makedepends="$depends_dev intltool gobject-introspection desktop-file-utils gnome-icon-theme"
+install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
+subpackages=
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+
+_builddir="${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-scrollkeeper || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="3f0bca9b0ebc7a365466851cd580d167  gnome-system-monitor-2.28.2.tar.bz2"
diff --git a/main/gnome-system-monitor/gnome-system-monitor.post-install b/main/gnome-system-monitor/gnome-system-monitor.post-install
new file mode 100644
index 000000000..8c003fa13
--- /dev/null
+++ b/main/gnome-system-monitor/gnome-system-monitor.post-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in gnome-system-monitor.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/main/gnome-system-monitor/gnome-system-monitor.post-upgrade b/main/gnome-system-monitor/gnome-system-monitor.post-upgrade
new file mode 100644
index 000000000..8c003fa13
--- /dev/null
+++ b/main/gnome-system-monitor/gnome-system-monitor.post-upgrade
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in gnome-system-monitor.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/main/gnome-system-monitor/gnome-system-monitor.pre-deinstall b/main/gnome-system-monitor/gnome-system-monitor.pre-deinstall
new file mode 100644
index 000000000..92d7db79c
--- /dev/null
+++ b/main/gnome-system-monitor/gnome-system-monitor.pre-deinstall
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in gnome-system-monitor.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
diff --git a/testing/gnome-system-monitor/APKBUILD b/testing/gnome-system-monitor/APKBUILD
deleted file mode 100644
index cc12f2b5f..000000000
--- a/testing/gnome-system-monitor/APKBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=gnome-system-monitor
-pkgver=2.28.2
-pkgrel=0
-pkgdesc="GNOME system monitor"
-url="http://www.gnome.org"
-arch="all"
-license="GPL"
-depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     gnome-desktop-dev
-	     libwnck-dev
-	     librsvg-dev
-	     libunique-dev
-
-	     libxcursor-dev
-	     libxcomposite-dev
-	     libxi-dev
-	     libxau-dev
-	     libxdmcp-dev
-	     libxext-dev
-	     libxcb-dev
-
-	     libgtop-dev
-	     libgnomekbd-dev
-	     libxklavier-dev
-
-	     gtkmm-dev
-	     glibmm-dev"
-makedepends="$depends_dev intltool gobject-introspection desktop-file-utils gnome-icon-theme"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages=
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="3f0bca9b0ebc7a365466851cd580d167  gnome-system-monitor-2.28.2.tar.bz2"
diff --git a/testing/gnome-system-monitor/gnome-system-monitor.post-install b/testing/gnome-system-monitor/gnome-system-monitor.post-install
deleted file mode 100644
index 8c003fa13..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-system-monitor.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-system-monitor/gnome-system-monitor.post-upgrade b/testing/gnome-system-monitor/gnome-system-monitor.post-upgrade
deleted file mode 100644
index 8c003fa13..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.post-upgrade
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-system-monitor.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-system-monitor/gnome-system-monitor.pre-deinstall b/testing/gnome-system-monitor/gnome-system-monitor.pre-deinstall
deleted file mode 100644
index 92d7db79c..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.pre-deinstall
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in gnome-system-monitor.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
-- 
cgit v1.2.3