[arch-commits] Commit in gnome-menus/repos (6 files)
Jan Steffens
heftig at nymeria.archlinux.org
Wed Apr 10 02:55:32 UTC 2013
Date: Wednesday, April 10, 2013 @ 04:55:32
Author: heftig
Revision: 182397
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
gnome-menus/repos/staging-i686/PKGBUILD
(from rev 182396, gnome-menus/trunk/PKGBUILD)
gnome-menus/repos/staging-i686/calculator.patch
(from rev 182396, gnome-menus/trunk/calculator.patch)
gnome-menus/repos/staging-x86_64/PKGBUILD
(from rev 182396, gnome-menus/trunk/PKGBUILD)
gnome-menus/repos/staging-x86_64/calculator.patch
(from rev 182396, gnome-menus/trunk/calculator.patch)
Deleted:
gnome-menus/repos/staging-i686/PKGBUILD
gnome-menus/repos/staging-x86_64/PKGBUILD
---------------------------------+
/PKGBUILD | 62 ++++++++++++++++++++++++++++++++++++++
staging-i686/PKGBUILD | 28 -----------------
staging-i686/calculator.patch | 41 +++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 28 -----------------
staging-x86_64/calculator.patch | 41 +++++++++++++++++++++++++
5 files changed, 144 insertions(+), 56 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2013-04-10 02:54:45 UTC (rev 182396)
+++ staging-i686/PKGBUILD 2013-04-10 02:55:32 UTC (rev 182397)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jan at archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.8.0
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
-depends=('glib2')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure \
- --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package(){
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-menus/repos/staging-i686/PKGBUILD (from rev 182396, gnome-menus/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-04-10 02:55:32 UTC (rev 182397)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jan at archlinux.org>
+
+pkgname=gnome-menus
+pkgver=3.8.0
+pkgrel=2
+pkgdesc="GNOME menu specifications"
+arch=('i686' 'x86_64')
+depends=('glib2')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool')
+license=('GPL' 'LGPL')
+url="http://www.gnome.org"
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ calculator.patch)
+sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
+ 'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
+
+build() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../calculator.patch
+ ./configure \
+ --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static
+ make
+}
+
+package(){
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Copied: gnome-menus/repos/staging-i686/calculator.patch (from rev 182396, gnome-menus/trunk/calculator.patch)
===================================================================
--- staging-i686/calculator.patch (rev 0)
+++ staging-i686/calculator.patch 2013-04-10 02:55:32 UTC (rev 182397)
@@ -0,0 +1,41 @@
+From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Thu, 28 Mar 2013 21:54:34 +0000
+Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
+
+gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
+very last minute before the 3.8.0 release.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696816
+---
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index 84d13ed..503f9ca 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -38,7 +38,6 @@
+ <Not><Filename>file-roller.desktop</Filename></Not>
+ <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+ <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
+- <Not><Filename>gnome-calculator.desktop</Filename></Not>
+ <Not><Filename>gcalctool.desktop</Filename></Not>
+ <Not><Filename>gucharmap.desktop</Filename></Not>
+ <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+@@ -251,7 +250,7 @@
+ <Directory>X-GNOME-Utilities.directory</Directory>
+ <Include>
+ <Filename>file-roller.desktop</Filename>
+- <Filename>gnome-calculator.desktop</Filename>
++ <Filename>gcalctool.desktop</Filename>
+ <Filename>gnome-font-viewer.desktop</Filename>
+ <Filename>gucharmap.desktop</Filename>
+ <Filename>seahorse.desktop</Filename>
+@@ -287,7 +286,6 @@
+ <Not><Filename>gnome-eog.desktop</Filename></Not>
+ <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+ <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+- <Not><Filename>gcalctool.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Other -->
+--
+cgit v0.9.1
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2013-04-10 02:54:45 UTC (rev 182396)
+++ staging-x86_64/PKGBUILD 2013-04-10 02:55:32 UTC (rev 182397)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jan at archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.8.0
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
-depends=('glib2')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure \
- --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package(){
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-menus/repos/staging-x86_64/PKGBUILD (from rev 182396, gnome-menus/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-04-10 02:55:32 UTC (rev 182397)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jan at archlinux.org>
+
+pkgname=gnome-menus
+pkgver=3.8.0
+pkgrel=2
+pkgdesc="GNOME menu specifications"
+arch=('i686' 'x86_64')
+depends=('glib2')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool')
+license=('GPL' 'LGPL')
+url="http://www.gnome.org"
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ calculator.patch)
+sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
+ 'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
+
+build() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i ../calculator.patch
+ ./configure \
+ --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static
+ make
+}
+
+package(){
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Copied: gnome-menus/repos/staging-x86_64/calculator.patch (from rev 182396, gnome-menus/trunk/calculator.patch)
===================================================================
--- staging-x86_64/calculator.patch (rev 0)
+++ staging-x86_64/calculator.patch 2013-04-10 02:55:32 UTC (rev 182397)
@@ -0,0 +1,41 @@
+From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Thu, 28 Mar 2013 21:54:34 +0000
+Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
+
+gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
+very last minute before the 3.8.0 release.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696816
+---
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index 84d13ed..503f9ca 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -38,7 +38,6 @@
+ <Not><Filename>file-roller.desktop</Filename></Not>
+ <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+ <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
+- <Not><Filename>gnome-calculator.desktop</Filename></Not>
+ <Not><Filename>gcalctool.desktop</Filename></Not>
+ <Not><Filename>gucharmap.desktop</Filename></Not>
+ <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+@@ -251,7 +250,7 @@
+ <Directory>X-GNOME-Utilities.directory</Directory>
+ <Include>
+ <Filename>file-roller.desktop</Filename>
+- <Filename>gnome-calculator.desktop</Filename>
++ <Filename>gcalctool.desktop</Filename>
+ <Filename>gnome-font-viewer.desktop</Filename>
+ <Filename>gucharmap.desktop</Filename>
+ <Filename>seahorse.desktop</Filename>
+@@ -287,7 +286,6 @@
+ <Not><Filename>gnome-eog.desktop</Filename></Not>
+ <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+ <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+- <Not><Filename>gcalctool.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Other -->
+--
+cgit v0.9.1
More information about the arch-commits
mailing list