[arch-commits] Commit in obconf/repos (10 files)
Florian Pritz
bluewind at nymeria.archlinux.org
Mon Aug 12 10:25:42 UTC 2013
Date: Monday, August 12, 2013 @ 12:25:42
Author: bluewind
Revision: 95455
archrelease: copy trunk to community-i686, community-x86_64
Added:
obconf/repos/community-i686/PKGBUILD
(from rev 95454, obconf/trunk/PKGBUILD)
obconf/repos/community-i686/obconf.install
(from rev 95454, obconf/trunk/obconf.install)
obconf/repos/community-x86_64/PKGBUILD
(from rev 95454, obconf/trunk/PKGBUILD)
obconf/repos/community-x86_64/obconf.install
(from rev 95454, obconf/trunk/obconf.install)
Deleted:
obconf/repos/community-i686/PKGBUILD
obconf/repos/community-i686/config-file.patch
obconf/repos/community-i686/obconf.install
obconf/repos/community-x86_64/PKGBUILD
obconf/repos/community-x86_64/config-file.patch
obconf/repos/community-x86_64/obconf.install
------------------------------------+
/PKGBUILD | 60 +++++++++++++++++++++++++++++++++++
/obconf.install | 24 ++++++++++++++
community-i686/PKGBUILD | 33 -------------------
community-i686/config-file.patch | 28 ----------------
community-i686/obconf.install | 12 -------
community-x86_64/PKGBUILD | 33 -------------------
community-x86_64/config-file.patch | 28 ----------------
community-x86_64/obconf.install | 12 -------
8 files changed, 84 insertions(+), 146 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-08-12 10:25:36 UTC (rev 95454)
+++ community-i686/PKGBUILD 2013-08-12 10:25:42 UTC (rev 95455)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=obconf
-pkgver=2.0.3.git20100309
-pkgrel=3
-pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
-arch=('i686' 'x86_64')
-url="http://openbox.org/wiki/ObConf:About"
-license=('GPL')
-depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
-install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'config-file.patch')
-md5sums=('d45a1eab18aa25c18280821118368b97'
- '51f5f110f8bc4a89dfb460c3dd4a3be8')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/config-file.patch
-
- ./bootstrap
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: obconf/repos/community-i686/PKGBUILD (from rev 95454, obconf/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-08-12 10:25:42 UTC (rev 95455)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=obconf
+pkgver=2.0.4
+pkgrel=1
+pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
+arch=('i686' 'x86_64')
+url="http://openbox.org/wiki/ObConf:About"
+license=('GPL')
+depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
+install=${pkgname}.install
+source=("http://openbox.org/dist/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('9271c5d2dc366d61f73665a5e8bceabc')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ #./bootstrap
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/config-file.patch
===================================================================
--- community-i686/config-file.patch 2013-08-12 10:25:36 UTC (rev 95454)
+++ community-i686/config-file.patch 2013-08-12 10:25:42 UTC (rev 95455)
@@ -1,28 +0,0 @@
-From: Dana Jansens <danakj at orodu.net>
-Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400)
-Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ...
-X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889
-
-Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given).
----
-
-diff --git a/src/main.c b/src/main.c
-index 9035e8d..a576253 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -233,11 +233,10 @@ int main(int argc, char **argv)
- }
-
- xmlIndentTreeOutput = 1;
-- if (!obt_xml_load_config_file(parse_i,
-- "openbox",
-- (obc_config_file ?
-- obc_config_file : "rc.xml"),
-- "openbox_config"))
-+ if (!((obc_config_file &&
-+ obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) ||
-+ obt_xml_load_config_file(parse_i, "openbox", "rc.xml",
-+ "openbox_config")))
- {
- obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE);
- exit_with_error = TRUE;
Deleted: community-i686/obconf.install
===================================================================
--- community-i686/obconf.install 2013-08-12 10:25:36 UTC (rev 95454)
+++ community-i686/obconf.install 2013-08-12 10:25:42 UTC (rev 95455)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database /usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: obconf/repos/community-i686/obconf.install (from rev 95454, obconf/trunk/obconf.install)
===================================================================
--- community-i686/obconf.install (rev 0)
+++ community-i686/obconf.install 2013-08-12 10:25:42 UTC (rev 95455)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database /usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-08-12 10:25:36 UTC (rev 95454)
+++ community-x86_64/PKGBUILD 2013-08-12 10:25:42 UTC (rev 95455)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=obconf
-pkgver=2.0.3.git20100309
-pkgrel=3
-pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
-arch=('i686' 'x86_64')
-url="http://openbox.org/wiki/ObConf:About"
-license=('GPL')
-depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
-install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'config-file.patch')
-md5sums=('d45a1eab18aa25c18280821118368b97'
- '51f5f110f8bc4a89dfb460c3dd4a3be8')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/config-file.patch
-
- ./bootstrap
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: obconf/repos/community-x86_64/PKGBUILD (from rev 95454, obconf/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-08-12 10:25:42 UTC (rev 95455)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=obconf
+pkgver=2.0.4
+pkgrel=1
+pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
+arch=('i686' 'x86_64')
+url="http://openbox.org/wiki/ObConf:About"
+license=('GPL')
+depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
+install=${pkgname}.install
+source=("http://openbox.org/dist/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('9271c5d2dc366d61f73665a5e8bceabc')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ #./bootstrap
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/config-file.patch
===================================================================
--- community-x86_64/config-file.patch 2013-08-12 10:25:36 UTC (rev 95454)
+++ community-x86_64/config-file.patch 2013-08-12 10:25:42 UTC (rev 95455)
@@ -1,28 +0,0 @@
-From: Dana Jansens <danakj at orodu.net>
-Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400)
-Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ...
-X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889
-
-Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given).
----
-
-diff --git a/src/main.c b/src/main.c
-index 9035e8d..a576253 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -233,11 +233,10 @@ int main(int argc, char **argv)
- }
-
- xmlIndentTreeOutput = 1;
-- if (!obt_xml_load_config_file(parse_i,
-- "openbox",
-- (obc_config_file ?
-- obc_config_file : "rc.xml"),
-- "openbox_config"))
-+ if (!((obc_config_file &&
-+ obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) ||
-+ obt_xml_load_config_file(parse_i, "openbox", "rc.xml",
-+ "openbox_config")))
- {
- obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE);
- exit_with_error = TRUE;
Deleted: community-x86_64/obconf.install
===================================================================
--- community-x86_64/obconf.install 2013-08-12 10:25:36 UTC (rev 95454)
+++ community-x86_64/obconf.install 2013-08-12 10:25:42 UTC (rev 95455)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database /usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: obconf/repos/community-x86_64/obconf.install (from rev 95454, obconf/trunk/obconf.install)
===================================================================
--- community-x86_64/obconf.install (rev 0)
+++ community-x86_64/obconf.install 2013-08-12 10:25:42 UTC (rev 95455)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database /usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list