From 08876fd691d56b0c7871fdbfd4f816a5243c3716 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 24 Jan 2011 11:34:34 -0600
Subject: testing/libgnomekbd: promote to main

---
 main/libgnomekbd/APKBUILD                     | 52 +++++++++++++++++++++++++++
 main/libgnomekbd/libgnomekbd.post-install     |  7 ++++
 main/libgnomekbd/libgnomekbd.post-upgrade     |  7 ++++
 main/libgnomekbd/libgnomekbd.pre-deinstall    |  7 ++++
 testing/libgnomekbd/APKBUILD                  | 52 ---------------------------
 testing/libgnomekbd/libgnomekbd.post-install  |  7 ----
 testing/libgnomekbd/libgnomekbd.post-upgrade  |  7 ----
 testing/libgnomekbd/libgnomekbd.pre-deinstall |  7 ----
 8 files changed, 73 insertions(+), 73 deletions(-)
 create mode 100644 main/libgnomekbd/APKBUILD
 create mode 100644 main/libgnomekbd/libgnomekbd.post-install
 create mode 100644 main/libgnomekbd/libgnomekbd.post-upgrade
 create mode 100644 main/libgnomekbd/libgnomekbd.pre-deinstall
 delete mode 100644 testing/libgnomekbd/APKBUILD
 delete mode 100644 testing/libgnomekbd/libgnomekbd.post-install
 delete mode 100644 testing/libgnomekbd/libgnomekbd.post-upgrade
 delete mode 100644 testing/libgnomekbd/libgnomekbd.pre-deinstall

diff --git a/main/libgnomekbd/APKBUILD b/main/libgnomekbd/APKBUILD
new file mode 100644
index 0000000000..3a737d5514
--- /dev/null
+++ b/main/libgnomekbd/APKBUILD
@@ -0,0 +1,52 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer:
+pkgname=libgnomekbd
+pkgver=2.32.0
+pkgrel=0
+pkgdesc="GNOME keyboard library"
+url="http://www.gnome.org/"
+arch="all"
+license="LGPL"
+depends=
+depends_dev="gtk+-dev
+	     gconf-dev
+	     libxklavier-dev
+	     libxml2-dev
+
+             libxcursor-dev
+             libxcomposite-dev
+             libxi-dev
+             libxau-dev
+             libxdmcp-dev
+             libxext-dev
+             libxcb-dev"
+makedepends="$depends_dev intltool"
+install=""
+subpackages="$pkgname-dev"
+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"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="de32a6e3e3464b566eecdc4332bf34bd  libgnomekbd-2.32.0.tar.bz2"
diff --git a/main/libgnomekbd/libgnomekbd.post-install b/main/libgnomekbd/libgnomekbd.post-install
new file mode 100644
index 0000000000..34508a6a76
--- /dev/null
+++ b/main/libgnomekbd/libgnomekbd.post-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in desktop_gnome_peripherals_keyboard_xkb.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/libgnomekbd/libgnomekbd.post-upgrade b/main/libgnomekbd/libgnomekbd.post-upgrade
new file mode 100644
index 0000000000..34508a6a76
--- /dev/null
+++ b/main/libgnomekbd/libgnomekbd.post-upgrade
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in desktop_gnome_peripherals_keyboard_xkb.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/libgnomekbd/libgnomekbd.pre-deinstall b/main/libgnomekbd/libgnomekbd.pre-deinstall
new file mode 100644
index 0000000000..4cfd37ac2e
--- /dev/null
+++ b/main/libgnomekbd/libgnomekbd.pre-deinstall
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for i in desktop_gnome_peripherals_keyboard_xkb.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/libgnomekbd/APKBUILD b/testing/libgnomekbd/APKBUILD
deleted file mode 100644
index 3a737d5514..0000000000
--- a/testing/libgnomekbd/APKBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer:
-pkgname=libgnomekbd
-pkgver=2.32.0
-pkgrel=0
-pkgdesc="GNOME keyboard library"
-url="http://www.gnome.org/"
-arch="all"
-license="LGPL"
-depends=
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libxklavier-dev
-	     libxml2-dev
-
-             libxcursor-dev
-             libxcomposite-dev
-             libxi-dev
-             libxau-dev
-             libxdmcp-dev
-             libxext-dev
-             libxcb-dev"
-makedepends="$depends_dev intltool"
-install=""
-subpackages="$pkgname-dev"
-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"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="de32a6e3e3464b566eecdc4332bf34bd  libgnomekbd-2.32.0.tar.bz2"
diff --git a/testing/libgnomekbd/libgnomekbd.post-install b/testing/libgnomekbd/libgnomekbd.post-install
deleted file mode 100644
index 34508a6a76..0000000000
--- a/testing/libgnomekbd/libgnomekbd.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in desktop_gnome_peripherals_keyboard_xkb.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/libgnomekbd/libgnomekbd.post-upgrade b/testing/libgnomekbd/libgnomekbd.post-upgrade
deleted file mode 100644
index 34508a6a76..0000000000
--- a/testing/libgnomekbd/libgnomekbd.post-upgrade
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in desktop_gnome_peripherals_keyboard_xkb.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/libgnomekbd/libgnomekbd.pre-deinstall b/testing/libgnomekbd/libgnomekbd.pre-deinstall
deleted file mode 100644
index 4cfd37ac2e..0000000000
--- a/testing/libgnomekbd/libgnomekbd.pre-deinstall
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in desktop_gnome_peripherals_keyboard_xkb.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