[arch-commits] Commit in nautilus (4 files)

[Jan de Groot]

    Date: Monday, October 12, 2009 @ 03:31:04
  Author: jgc
Revision: 55138

Merge gnome-unstable

Modified:
  nautilus/trunk/PKGBUILD
  nautilus/trunk/nautilus-condrestart.patch
  nautilus/trunk/nautilus.install
Deleted:
  nautilus/gnome-unstable/

----------------------------+
 PKGBUILD                   |   15 ++++++++-------
 nautilus-condrestart.patch |   12 ++++++------
 nautilus.install           |    2 ++
 3 files changed, 16 insertions(+), 13 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-10-12 07:30:18 UTC (rev 55137)
+++ trunk/PKGBUILD	2009-10-12 07:31:04 UTC (rev 55138)
@@ -2,27 +2,28 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nautilus
-pkgver=2.26.3
+pkgver=2.28.0
 pkgrel=1
 pkgdesc="The GNOME shell and file manager"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libbeagle>=0.3.9' 'libtracker>=0.6.6' 'libexif>=0.6.16' 'exempi>=2.1.0' 'gnome-icon-theme>=2.26.0' 'desktop-file-utils' 'gvfs>=1.2.3' 'libunique>=1.0.8' 'gnome-desktop>=2.26.0')
+depends=('libbeagle>=0.3.9' 'libtracker>=0.6.95' 'libexif>=0.6.16' 'exempi>=2.1.0' 'gnome-icon-theme>=2.27.90' 'desktop-file-utils' 'gvfs>=1.4.0' 'libunique>=1.1.2' 'gnome-desktop>=2.28.0')
 makedepends=('pkgconfig' 'intltool')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2
-	nautilus-condrestart.patch)
-md5sums=('e05f1b61c27f506451f7d46509631e7b' '44742925ea8d83196ba50e398545c257')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
+        nautilus-condrestart.patch)
+sha256sums=('3761b27da474b71194ff900e7941c005be608a00fe0ba1f216390ce1ba9cba72'
+            'f825292ef26274d3044272ca9f25095391cc49d30fb0056e7ed7346a1b4d106c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/nautilus-condrestart.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --disable-update-mimedb || return 1
+      --localstatedir=/var --disable-static \
+      --disable-update-mimedb || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
   

Modified: trunk/nautilus-condrestart.patch
===================================================================
--- trunk/nautilus-condrestart.patch	2009-10-12 07:30:18 UTC (rev 55137)
+++ trunk/nautilus-condrestart.patch	2009-10-12 07:31:04 UTC (rev 55138)
@@ -1,14 +1,14 @@
-diff -up nautilus-2.25.93/nautilus.desktop.in.condrestart nautilus-2.25.93/nautilus.desktop.in
---- nautilus-2.25.93/nautilus.desktop.in.condrestart	2009-03-12 10:49:41.449753624 -0400
-+++ nautilus-2.25.93/nautilus.desktop.in	2009-03-12 10:49:51.814754208 -0400
+diff -up nautilus-2.25.93/data/nautilus.desktop.in.condrestart nautilus-2.25.93/nautilus.desktop.in
+--- nautilus-2.25.93/data/nautilus.desktop.in.condrestart	2009-03-12 10:49:41.449753624 -0400
++++ nautilus-2.25.93/data/nautilus.desktop.in	2009-03-12 10:49:51.814754208 -0400
 @@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
  X-GNOME-Autostart-Notify=true
  X-GNOME-AutoRestart=true
  X-GNOME-Provides=filemanager
 +AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
-diff -up nautilus-2.25.93/nautilus.desktop.in.in.condrestart nautilus-2.25.93/nautilus.desktop.in.in
---- nautilus-2.25.93/nautilus.desktop.in.in.condrestart	2009-03-12 10:47:41.681753834 -0400
-+++ nautilus-2.25.93/nautilus.desktop.in.in	2009-03-12 10:49:29.663754303 -0400
+diff -up nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart nautilus-2.25.93/nautilus.desktop.in.in
+--- nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart	2009-03-12 10:47:41.681753834 -0400
++++ nautilus-2.25.93/data/nautilus.desktop.in.in	2009-03-12 10:49:29.663754303 -0400
 @@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
  X-GNOME-Autostart-Notify=true
  X-GNOME-AutoRestart=true

Modified: trunk/nautilus.install
===================================================================
--- trunk/nautilus.install	2009-10-12 07:30:18 UTC (rev 55137)
+++ trunk/nautilus.install	2009-10-12 07:31:04 UTC (rev 55138)
@@ -4,6 +4,7 @@
   usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
 }
 
 pre_upgrade() {
@@ -21,4 +22,5 @@
 post_remove() {
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
 }