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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-01-02 15:58:29 +0000 (Sun, 02 Jan 2011)
New Revision: 4766

Added:
   desktop/branches/experimental/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch
Modified:
   desktop/branches/experimental/xfce4-utils/debian/changelog
   desktop/branches/experimental/xfce4-utils/debian/patches/series
Log:
02_xfhelp-rename-module added, since xfce-utils is called xfce4-utils on
Debian, rename it in the script.

Modified: desktop/branches/experimental/xfce4-utils/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/changelog	2011-01-02 15:48:55 UTC (rev 4765)
+++ desktop/branches/experimental/xfce4-utils/debian/changelog	2011-01-02 15:58:29 UTC (rev 4766)
@@ -15,6 +15,8 @@
     - 01_xflock4-test-running-screensaver refreshed.
     - 02_use-Xsessions.options-for-ssh-agent-handling dropped, Xfce has an
       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.
   * debian/rules:
     - pick {C,LD}FLAGS from dpkg-buildflags.
     - add hardening flags to {C,LD}FLAGS
@@ -26,7 +28,7 @@
     $libexecdir, unneeded.
   * debian/control: add myself to Uploaders.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 16:35:24 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 16:41:14 +0100
 
 xfce4-utils (4.6.2-1) unstable; urgency=low
 

Added: desktop/branches/experimental/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/02_xfhelp-rename-module.patch	2011-01-02 15:58:29 UTC (rev 4766)
@@ -0,0 +1,22 @@
+diff --git a/scripts/xfhelp4.in b/scripts/xfhelp4.in
+index 57fe9a0..ebb124e 100644
+--- a/scripts/xfhelp4.in
++++ b/scripts/xfhelp4.in
+@@ -25,7 +25,7 @@ HELP_DIR="@_datadir_@/doc"
+ if [ ! x"$1" = x"" ]; then
+     MODULE="${1%.html}"
+ else
+-    MODULE="xfce-utils"
++    MODULE="xfce4-utils"
+ fi
+ 
+ # Check for translated documentation
+@@ -49,7 +49,7 @@ elif [ -r "$HELP_DIR/$MODULE/html/C/index.html" ]
+ then
+   URL="$HELP_DIR/$MODULE/html/C/index.html"
+ else
+-  URL="$HELP_DIR/xfce-utils/html/C/index.html"
++  URL="$HELP_DIR/xfce4-utils/html/C/index.html"
+ fi
+ 
+ xfbrowser4 $URL

Modified: desktop/branches/experimental/xfce4-utils/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/patches/series	2011-01-02 15:48:55 UTC (rev 4765)
+++ desktop/branches/experimental/xfce4-utils/debian/patches/series	2011-01-02 15:58:29 UTC (rev 4766)
@@ -1,3 +1,4 @@
 01_xflock4-test-running-screensaver.patch
+02_xfhelp-rename-module.patch
 03_xfterm4-bug.patch
 04_debianize-scripts.patch