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

[Giovanni Scafora]

    Date: Saturday, December 19, 2009 @ 17:57:14
  Author: giovanni
Revision: 61609

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

........
  r61550 | andrea | 2009-12-19 05:49:19 -0800 (sab, 19 dic 2009) | 2 lines
  
  upgpkg: openbox 3.4.9-1
      upstream release
........
  r61552 | andrea | 2009-12-19 05:50:46 -0800 (sab, 19 dic 2009) | 1 line
  
  cleanup
........

Modified:
  openbox/repos/extra-x86_64/	(properties)
  openbox/repos/extra-x86_64/PKGBUILD
Deleted:
  openbox/repos/extra-x86_64/fix-workspaces-number-in-gdm.patch

------------------------------------+
 PKGBUILD                           |   14 ++++---------
 fix-workspaces-number-in-gdm.patch |   36 -----------------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)


Property changes on: openbox/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openbox/trunk:1-61233
   + /openbox/trunk:1-61608

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-19 22:45:03 UTC (rev 61608)
+++ extra-x86_64/PKGBUILD	2009-12-19 22:57:14 UTC (rev 61609)
@@ -4,8 +4,8 @@
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=openbox
-pkgver=3.4.8
-pkgrel=2
+pkgver=3.4.9
+pkgrel=1
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,19 +18,15 @@
 options=('!libtool' 'force')
 backup=('usr/etc/xdg/openbox/menu.xml' 'usr/etc/xdg/openbox/rc.xml')
 source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
-	'which-2.20.patch'
-	'fix-workspaces-number-in-gdm.patch')
-md5sums=('3523fe9760947a15fb8ed3611090ccd2'
-         'b72cac492e0ed83fd5ced9c1263cfa24'
-         'ce1f5cd7dbcba9601e2f6dfa666064dc')
+	'which-2.20.patch')
+md5sums=('2f30670f7067e3e17567019d2eef21a0'
+         'b72cac492e0ed83fd5ced9c1263cfa24')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   #FS#11455
   patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
-  #FS#16676
-  patch -Np1 -i ${srcdir}/fix-workspaces-number-in-gdm.patch || return 1
 
   ./configure --prefix=/usr \
     --with-x \

Deleted: extra-x86_64/fix-workspaces-number-in-gdm.patch
===================================================================
--- extra-x86_64/fix-workspaces-number-in-gdm.patch	2009-12-19 22:45:03 UTC (rev 61608)
+++ extra-x86_64/fix-workspaces-number-in-gdm.patch	2009-12-19 22:57:14 UTC (rev 61609)
@@ -1,36 +0,0 @@
---- openbox-3.4.8/data/xsession/openbox-gnome-session.in~	2009-12-13 18:46:58.480826774 +0100
-+++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-13 18:49:15.776973708 +0100
-@@ -7,6 +7,9 @@
-   exit
- fi
- 
-+# Clean up after GDM
-+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
-+
- VER=$(gnome-session --version 2>/dev/null | \
-       sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
- 
---- openbox-3.4.8/data/xsession/openbox-kde-session.in~	2009-12-13 18:47:07.676987674 +0100
-+++ openbox-3.4.8/data/xsession/openbox-kde-session.in	2009-12-13 18:48:48.140310531 +0100
-@@ -7,6 +7,9 @@
-   exit
- fi
- 
-+# Clean up after GDM
-+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
-+
- # Run KDE with Openbox as its window manager
- export KDEWM="@bindir@/openbox"
- exec startkde "$@"
---- openbox-3.4.8/data/xsession/openbox-session.in~	2009-12-13 18:47:13.173649966 +0100
-+++ openbox-3.4.8/data/xsession/openbox-session.in	2009-12-13 18:48:17.696977111 +0100
-@@ -7,6 +7,9 @@
-   exit
- fi
- 
-+# Clean up after GDM
-+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
-+
- AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
- GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
-