[garcon] Update to 0.1.9

Christoph Wickert cwickert at fedoraproject.org
Sat Oct 22 19:15:46 UTC 2011


commit 5259300a8ee001d2163a3ace743ec0c9e2adc739
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Oct 22 21:14:38 2011 +0200

    Update to 0.1.9

 .gitignore                                         |    1 +
 ...-menus.patch => garcon-0.1.9-redhat-menus.patch |  102 ++++++++++----------
 garcon.spec                                        |    7 +-
 sources                                            |    2 +-
 4 files changed, 58 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a3c41b..c3d14e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ garcon-0.1.1.tar.bz2
 /garcon-0.1.6.tar.bz2
 /garcon-0.1.7.tar.bz2
 /garcon-0.1.8.tar.bz2
+/garcon-0.1.9.tar.bz2
diff --git a/garcon-0.1.8-redhat-menus.patch b/garcon-0.1.9-redhat-menus.patch
similarity index 70%
rename from garcon-0.1.8-redhat-menus.patch
rename to garcon-0.1.9-redhat-menus.patch
index 51f4fb6..1f3e60e 100644
--- a/garcon-0.1.8-redhat-menus.patch
+++ b/garcon-0.1.9-redhat-menus.patch
@@ -1,6 +1,6 @@
-diff -Nur garcon-0.1.8.orig/data/xfce/Makefile.am garcon-0.1.8/data/xfce/Makefile.am
---- garcon-0.1.8.orig/data/xfce/Makefile.am	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/Makefile.am	2011-06-19 20:06:21.330941194 +0200
+diff -Nur garcon-0.1.9.orig/data/xfce/Makefile.am garcon-0.1.9/data/xfce/Makefile.am
+--- garcon-0.1.9.orig/data/xfce/Makefile.am	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/Makefile.am	2011-10-22 20:59:51.692343459 +0200
 @@ -23,18 +23,8 @@
  
  directorydir = $(datadir)/desktop-directories
@@ -21,10 +21,10 @@ diff -Nur garcon-0.1.8.orig/data/xfce/Makefile.am garcon-0.1.8/data/xfce/Makefil
  
  directory_DATA = $(directory_in_files:.directory.in=.directory)
  @INTLTOOL_DIRECTORY_RULE@
-diff -Nur garcon-0.1.8.orig/data/xfce/Makefile.in garcon-0.1.8/data/xfce/Makefile.in
---- garcon-0.1.8.orig/data/xfce/Makefile.in	2011-06-19 15:35:14.000000000 +0200
-+++ garcon-0.1.8/data/xfce/Makefile.in	2011-06-19 20:06:55.899119004 +0200
-@@ -277,18 +277,8 @@
+diff -Nur garcon-0.1.9.orig/data/xfce/Makefile.in garcon-0.1.9/data/xfce/Makefile.in
+--- garcon-0.1.9.orig/data/xfce/Makefile.in	2011-09-12 20:24:26.000000000 +0200
++++ garcon-0.1.9/data/xfce/Makefile.in	2011-10-22 20:59:51.693343452 +0200
+@@ -281,18 +281,8 @@
  
  directorydir = $(datadir)/desktop-directories
  directory_in_files = \
@@ -44,9 +44,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/Makefile.in garcon-0.1.8/data/xfce/Makefil
  
  directory_DATA = $(directory_in_files:.directory.in=.directory)
  EXTRA_DIST = \
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-accessories.directory.in garcon-0.1.8/data/xfce/xfce-accessories.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-accessories.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-accessories.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-accessories.directory.in garcon-0.1.9/data/xfce/xfce-accessories.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-accessories.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-accessories.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -54,10 +54,10 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-accessories.directory.in garcon-0.1.8
 -Icon=applications-accessories
 -_Name=Accessories
 -_Comment=Common desktop tools and applications
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/xfce/xfce-applications.menu
---- garcon-0.1.8.orig/data/xfce/xfce-applications.menu	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-applications.menu	2011-06-19 20:09:20.403941918 +0200
-@@ -20,20 +20,25 @@
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-applications.menu garcon-0.1.9/data/xfce/xfce-applications.menu
+--- garcon-0.1.9.orig/data/xfce/xfce-applications.menu	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-applications.menu	2011-10-22 20:59:51.700343406 +0200
+@@ -21,20 +21,25 @@
          <Filename>exo-mail-reader.desktop</Filename>
          <Filename>exo-web-browser.desktop</Filename>
          <Separator/>
@@ -88,7 +88,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          </Include>
  
          <Layout>
-@@ -42,25 +47,31 @@
+@@ -43,25 +48,31 @@
              <Merge type="all"/>
          </Layout>
  
@@ -133,7 +133,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          </Include>
          <Exclude>
              <Or>
-@@ -74,23 +85,34 @@
+@@ -75,23 +86,34 @@
  
      <Menu>
          <Name>Development</Name>
@@ -171,7 +171,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          <Include>
              <Category>Game</Category>
          </Include>
-@@ -98,7 +120,7 @@
+@@ -99,7 +121,7 @@
  
      <Menu>
          <Name>Graphics</Name>
@@ -180,7 +180,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          <Include>
              <Category>Graphics</Category>
          </Include>
-@@ -106,7 +128,7 @@
+@@ -107,7 +129,7 @@
  
      <Menu>
          <Name>Multimedia</Name>
@@ -189,7 +189,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          <Include>
              <Category>Audio</Category>
              <Category>Video</Category>
-@@ -116,7 +138,7 @@
+@@ -117,7 +139,7 @@
  
      <Menu>
          <Name>Network</Name>
@@ -198,7 +198,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          <Include>
              <Category>Network</Category>
          </Include>
-@@ -130,7 +152,7 @@
+@@ -131,7 +153,7 @@
  
      <Menu>
          <Name>Office</Name>
@@ -207,7 +207,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          <Include>
              <Category>Office</Category>
          </Include>
-@@ -138,12 +160,18 @@
+@@ -139,12 +161,18 @@
  
      <Menu>
          <Name>System</Name>
@@ -231,7 +231,7 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          </Include>
          <Exclude>
              <Or>
-@@ -157,7 +185,13 @@
+@@ -158,7 +186,13 @@
          <Directory>xfce-other.directory</Directory>
          <OnlyUnallocated/>
          <Include>
@@ -246,9 +246,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-applications.menu garcon-0.1.8/data/x
          </Include>
      </Menu>
  
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-development.directory.in garcon-0.1.8/data/xfce/xfce-development.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-development.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-development.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-development.directory.in garcon-0.1.9/data/xfce/xfce-development.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-development.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-development.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -256,9 +256,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-development.directory.in garcon-0.1.8
 -Icon=applications-development
 -_Name=Development
 -_Comment=Software development tools
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-education.directory.in garcon-0.1.8/data/xfce/xfce-education.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-education.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-education.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-education.directory.in garcon-0.1.9/data/xfce/xfce-education.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-education.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-education.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -266,9 +266,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-education.directory.in garcon-0.1.8/d
 -Icon=applications-education
 -_Name=Education
 -_Comment=Educational software
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-games.directory.in garcon-0.1.8/data/xfce/xfce-games.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-games.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-games.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-games.directory.in garcon-0.1.9/data/xfce/xfce-games.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-games.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-games.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -276,9 +276,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-games.directory.in garcon-0.1.8/data/
 -Icon=applications-games
 -_Name=Games
 -_Comment=Games, puzzles, and other fun software
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-graphics.directory.in garcon-0.1.8/data/xfce/xfce-graphics.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-graphics.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-graphics.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-graphics.directory.in garcon-0.1.9/data/xfce/xfce-graphics.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-graphics.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-graphics.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -286,9 +286,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-graphics.directory.in garcon-0.1.8/da
 -Icon=applications-graphics
 -_Name=Graphics
 -_Comment=Graphics creation and manipulation applications
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-multimedia.directory.in garcon-0.1.8/data/xfce/xfce-multimedia.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-multimedia.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-multimedia.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-multimedia.directory.in garcon-0.1.9/data/xfce/xfce-multimedia.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-multimedia.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-multimedia.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -296,19 +296,19 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-multimedia.directory.in garcon-0.1.8/
 -Icon=applications-multimedia
 -_Name=Multimedia
 -_Comment=Audio and video players and editors
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-network.directory.in garcon-0.1.8/data/xfce/xfce-network.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-network.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-network.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-network.directory.in garcon-0.1.9/data/xfce/xfce-network.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-network.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-network.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
 -Type=Directory
 -Icon=applications-internet
--_Name=Network
--_Comment=Network applications and utilities
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-office.directory.in garcon-0.1.8/data/xfce/xfce-office.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-office.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-office.directory.in	1970-01-01 01:00:00.000000000 +0100
+-_Name=Internet
+-_Comment=Applications for Internet access
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-office.directory.in garcon-0.1.9/data/xfce/xfce-office.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-office.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-office.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -316,9 +316,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-office.directory.in garcon-0.1.8/data
 -Icon=applications-office
 -_Name=Office
 -_Comment=Office and productivity applications
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-screensavers.directory.in garcon-0.1.8/data/xfce/xfce-screensavers.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-screensavers.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-screensavers.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-screensavers.directory.in garcon-0.1.9/data/xfce/xfce-screensavers.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-screensavers.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-screensavers.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
@@ -326,9 +326,9 @@ diff -Nur garcon-0.1.8.orig/data/xfce/xfce-screensavers.directory.in garcon-0.1.
 -Icon=preferences-desktop-screensaver
 -_Name=Screensavers
 -_Comment=Screensaver applets
-diff -Nur garcon-0.1.8.orig/data/xfce/xfce-system.directory.in garcon-0.1.8/data/xfce/xfce-system.directory.in
---- garcon-0.1.8.orig/data/xfce/xfce-system.directory.in	2011-06-19 15:35:09.000000000 +0200
-+++ garcon-0.1.8/data/xfce/xfce-system.directory.in	1970-01-01 01:00:00.000000000 +0100
+diff -Nur garcon-0.1.9.orig/data/xfce/xfce-system.directory.in garcon-0.1.9/data/xfce/xfce-system.directory.in
+--- garcon-0.1.9.orig/data/xfce/xfce-system.directory.in	2011-09-12 20:24:20.000000000 +0200
++++ garcon-0.1.9/data/xfce/xfce-system.directory.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -[Desktop Entry]
 -Version=1.0
diff --git a/garcon.spec b/garcon.spec
index e2244c0..2c8e3c1 100644
--- a/garcon.spec
+++ b/garcon.spec
@@ -3,7 +3,7 @@
 %global minorversion 0.1
 
 Name:           garcon
-Version:        0.1.8
+Version:        0.1.9
 Release:        1%{?dist}
 Summary:        Implementation of the freedesktop.org menu specification
 
@@ -13,7 +13,7 @@ Group:          System Environment/Libraries
 License:        LGPLv2+ and GFDL
 URL:            http://xfce.org/
 Source0:        http://archive.xfce.org/src/libs/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
-Patch0:         garcon-0.1.8-redhat-menus.patch
+Patch0:         garcon-0.1.9-redhat-menus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.14
@@ -92,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc %{_datadir}/gtk-doc/
 
 %changelog
+* Sat Oct 22 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.9-1
+- Update to 0.1.9
+
 * Sun Jun 19 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.8-1
 - Update to 0.1.8
 
diff --git a/sources b/sources
index be664a2..984e826 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18fbf523ed2865dfaccdfb40b4b20b05  garcon-0.1.8.tar.bz2
+a3ca1e54ad731c98f688900f6398fc20  garcon-0.1.9.tar.bz2


More information about the scm-commits mailing list