[arch-commits] Commit in openbox/repos (4 files)

[Andrea Scarpino]

    Date: Monday, February 8, 2010 @ 18:22:52
  Author: andrea
Revision: 67617

Merged revisions 65286,67616 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openbox/trunk

........
  r65286 | andrea | 2010-01-26 17:58:16 +0100 (Tue, 26 Jan 2010) | 1 line
  
  fixed
........
  r67616 | andrea | 2010-02-09 00:22:10 +0100 (Tue, 09 Feb 2010) | 2 lines
  
  upgpkg: openbox 3.4.11-1
      upstream release
........

Modified:
  openbox/repos/extra-i686/	(properties)
  openbox/repos/extra-i686/PKGBUILD
  openbox/repos/extra-i686/which-2.20.patch
Deleted:
  openbox/repos/extra-i686/fix-bug-in-openbox-gnome-session.patch

----------------------------------------+
 PKGBUILD                               |   21 ++++++---------------
 fix-bug-in-openbox-gnome-session.patch |   15 ---------------
 which-2.20.patch                       |    6 +++---
 3 files changed, 9 insertions(+), 33 deletions(-)


Property changes on: openbox/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openbox/trunk:1-65283
   + /openbox/trunk:1-67616

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-08 23:22:10 UTC (rev 67616)
+++ extra-i686/PKGBUILD	2010-02-08 23:22:52 UTC (rev 67617)
@@ -4,8 +4,8 @@
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=openbox
-pkgver=3.4.10
-pkgrel=3
+pkgver=3.4.11
+pkgrel=1
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,15 +14,13 @@
 optdepends=('pyxdg: for the xdg-autostart script')
 url="http://openbox.org"
 groups=('lxde')
-install=openbox.install
+install=${pkgname}.install
 options=('!libtool' 'force')
 backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
 source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
-	'which-2.20.patch'
-	'fix-bug-in-openbox-gnome-session.patch')
-md5sums=('daccf153c7808950313eb00bc250f9bc'
-         'b72cac492e0ed83fd5ced9c1263cfa24'
-	 '311970598bda08c670500acc6a1b5cd2')
+	'which-2.20.patch')
+md5sums=('bbbb93c1a4fc8048f2a8ceb4179882a5'
+         '470ab8424315a96eb2b8955f1c482317')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,9 +28,6 @@
   # FS#11455
   patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
 
-  # Already fixed in git
-  patch -Np1 -i ${srcdir}/fix-bug-in-openbox-gnome-session.patch || return 1
-
   ./configure --prefix=/usr \
     --with-x \
     --enable-startup-notification \
@@ -43,7 +38,3 @@
   sed -i "s:startkde:/usr/bin/\0:" ${pkgdir}/usr/share/xsessions/openbox-kde.desktop
   sed -i "s:=gnome-session:=/usr/bin/gnome-session:" ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop
 }
-
-md5sums=('daccf153c7808950313eb00bc250f9bc'
-         'b72cac492e0ed83fd5ced9c1263cfa24'
-         '9ad61fcc37d3d2258c3fe549e7c54cdb')

Deleted: extra-i686/fix-bug-in-openbox-gnome-session.patch
===================================================================
--- extra-i686/fix-bug-in-openbox-gnome-session.patch	2010-02-08 23:22:10 UTC (rev 67616)
+++ extra-i686/fix-bug-in-openbox-gnome-session.patch	2010-02-08 23:22:52 UTC (rev 67617)
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=blobdiff_plain;f=data%2Fxsession%2Fopenbox-gnome-session.in;h=1f17edbcd086bf5d164d506e5e3deab98262d621;hp=6765ae82b21bb066e25b3d8bb9d95cc620641830;hb=62e36ad0410ce888e7097e7bce5cbbf67b5b6290;hpb=e8200ae603f33b70824c125ba6b37bfaec7d89ea
-
-diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
-index 6765ae8..1f17edb 100644
---- a/data/xsession/openbox-gnome-session.in
-+++ b/data/xsession/openbox-gnome-session.in
-@@ -37,7 +37,7 @@ else
-   if test -z "$SESSION"; then
-       # if its empty then just run openbox
-       SESSION="[openbox]"
--  elif test -z $(echo "$SESSION" | grep -q openbox); then
-+  elif ! echo "$SESSION" | grep -q openbox; then
-       # if openbox isn't in the session then append it
-       SESSION="${SESSION%]},openbox]"
-   fi

Modified: extra-i686/which-2.20.patch
===================================================================
--- extra-i686/which-2.20.patch	2010-02-08 23:22:10 UTC (rev 67616)
+++ extra-i686/which-2.20.patch	2010-02-08 23:22:52 UTC (rev 67617)
@@ -1,5 +1,5 @@
---- openbox-3.4.7.2/data/autostart.sh.in~	2009-10-03 15:24:20.856675350 +0200
-+++ openbox-3.4.7.2/data/autostart.sh.in	2009-10-03 15:28:34.543315964 +0200
+--- openbox-3.4.11/data/autostart.sh.in~	2010-02-09 00:17:07.008206540 +0100
++++ openbox-3.4.11/data/autostart.sh.in	2010-02-09 00:19:00.295725690 +0100
 @@ -3,13 +3,13 @@
  
  # Set a background color
@@ -46,7 +46,7 @@
  
  # Run XDG autostart things.  By default don't run anything desktop-specific
  # See xdg-autostart --help more info
- DESKTOP_ENV=""
+ DESKTOP_ENV="OPENBOX"
 -if which @secretbindir@/xdg-autostart >/dev/null; then
 +if which @secretbindir@/xdg-autostart >/dev/null 2>&1; then
    @secretbindir@/xdg-autostart $DESKTOP_ENV