[Pkg-xfce-commits] r4803 - in desktop/branches/experimental/xfce4-utils/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-01-17 11:48:07 +0000 (Mon, 17 Jan 2011)
New Revision: 4803

Removed:
   desktop/branches/experimental/xfce4-utils/debian/patches/05_add-main-category-desktop.patch
Modified:
   desktop/branches/experimental/xfce4-utils/debian/changelog
   desktop/branches/experimental/xfce4-utils/debian/control
   desktop/branches/experimental/xfce4-utils/debian/patches/series
Log:
new upstream release, drop unneeded patch


Modified: desktop/branches/experimental/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/changelog	2011-01-17 11:46:57 UTC (rev 4802)
+++ desktop/branches/experimental/xfce4-utils/debian/changelog	2011-01-17 11:48:07 UTC (rev 4803)
@@ -1,4 +1,4 @@
-xfce4-utils (4.7.4-1) UNRELEASED; urgency=low
+xfce4-utils (4.8.0-1) UNRELEASED; urgency=low
 
   [ Yves-Alexis Perez ]
   * New upstream development release.
@@ -17,8 +17,6 @@
       internal parameter so it can now be disabled there.
     - 02_xfhelp-rename-module added, since xfce-utils is called xfce4-utils on
       Debian, rename it in the script.
-    - 05_add-main-category-desktop added, add a main category key to desktop
-      files.
   * debian/rules:
     - pick {C,LD}FLAGS from dpkg-buildflags.
     - add hardening flags to {C,LD}FLAGS
@@ -30,7 +28,7 @@
     $libexecdir, unneeded.
   * debian/control: add myself to Uploaders.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 17:01:31 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 17 Jan 2011 11:29:58 +0100
 
 xfce4-utils (4.6.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-utils/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/control	2011-01-17 11:46:57 UTC (rev 4802)
+++ desktop/branches/experimental/xfce4-utils/debian/control	2011-01-17 11:48:07 UTC (rev 4803)
@@ -4,8 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.7.0),
- libxfce4ui-1-dev (>= 4.7.0), chrpath, intltool, 
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.8.0),
+ libxfce4ui-1-dev (>= 4.8.0), chrpath, intltool, 
  libgtk2.0-dev (>= 2.10.0), hardening-includes, libdbus-glib-1-dev (>= 0.33),
  xfce4-dev-tools, libtool
 Standards-Version: 3.9.1

Deleted: desktop/branches/experimental/xfce4-utils/debian/patches/05_add-main-category-desktop.patch
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/05_add-main-category-desktop.patch	2011-01-17 11:46:57 UTC (rev 4802)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/05_add-main-category-desktop.patch	2011-01-17 11:48:07 UTC (rev 4803)
@@ -1,51 +0,0 @@
-Description: add a main category to desktop file
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=7050
-diff --git a/scripts/xfconf-migration-4.6.desktop.in b/scripts/xfconf-migration-4.6.desktop.in
-index 56f658f..2211ab8 100644
---- a/scripts/xfconf-migration-4.6.desktop.in
-+++ b/scripts/xfconf-migration-4.6.desktop.in
-@@ -5,3 +5,4 @@ Exec=@libdir@/xfce4/xfconf-migration/xfconf-migration-4.6.pl
- Terminal=false
- Type=Application
- StartupNotify=false
-+Categories=Utility
-diff --git a/scripts/xfhelp4.desktop.in b/scripts/xfhelp4.desktop.in
-index ce55092..784caac 100644
---- a/scripts/xfhelp4.desktop.in
-+++ b/scripts/xfhelp4.desktop.in
-@@ -5,7 +5,7 @@ Exec=xfhelp4
- Icon=help-contents
- StartupNotify=false
- Terminal=false
--Categories=X-XFCE;X-Xfce-Toplevel;
-+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
- OnlyShowIn=XFCE;
- _Name=Help
- _Comment=Help using Xfce
-diff --git a/xfce4-about/xfce4-about.desktop.in b/xfce4-about/xfce4-about.desktop.in
-index ee11012..9b17b07 100644
---- a/xfce4-about/xfce4-about.desktop.in
-+++ b/xfce4-about/xfce4-about.desktop.in
-@@ -5,7 +5,7 @@ Exec=xfce4-about
- Icon=help-about
- StartupNotify=false
- Terminal=false
--Categories=X-XFCE;X-Xfce-Toplevel;
-+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
- OnlyShowIn=XFCE;
- _Name=About Xfce
- _Comment=Information about the Xfce Desktop Environment
-diff --git a/xfrun/xfrun4.desktop.in b/xfrun/xfrun4.desktop.in
-index e38dde2..b12b6a2 100644
---- a/xfrun/xfrun4.desktop.in
-+++ b/xfrun/xfrun4.desktop.in
-@@ -5,7 +5,7 @@ Exec=xfrun4
- Icon=system-run
- StartupNotify=false
- Terminal=false
--Categories=X-XFCE;X-Xfce-Toplevel;
-+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
- OnlyShowIn=XFCE;
- _Name=Run Program...
- _Comment=Run a program

Modified: desktop/branches/experimental/xfce4-utils/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/series	2011-01-17 11:46:57 UTC (rev 4802)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/series	2011-01-17 11:48:07 UTC (rev 4803)
@@ -2,4 +2,3 @@
 02_xfhelp-rename-module.patch
 03_xfterm4-bug.patch
 04_debianize-scripts.patch
-05_add-main-category-desktop.patch