[Pkg-xfce-commits] r2945 - in desktop/trunk/xfce4-settings/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2009-03-11 22:47:46 +0000 (Wed, 11 Mar 2009)
New Revision: 2945

Added:
   desktop/trunk/xfce4-settings/debian/patches/
   desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch
Modified:
   desktop/trunk/xfce4-settings/debian/changelog
   desktop/trunk/xfce4-settings/debian/control
   desktop/trunk/xfce4-settings/debian/rules
Log:
* debian/control:
  - add build-dep on libcanberra-dev.
  - add build-dep on quilt.
* debian/rules:
  - enable sound settings.
  - enable pluggable dialogs. 
  - include quilt rule, add patch/unpatch targets.
* debian/patches/
  - 01_fix-display-settings added, fix display settings application.

Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog	2009-03-10 06:52:38 UTC (rev 2944)
+++ desktop/trunk/xfce4-settings/debian/changelog	2009-03-11 22:47:46 UTC (rev 2945)
@@ -1,3 +1,17 @@
+xfce4-settings (4.6.0-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add build-dep on libcanberra-dev.
+    - add build-dep on quilt.
+  * debian/rules:
+    - enable sound settings.
+    - enable pluggable dialogs. 
+    - include quilt rule, add patch/unpatch targets.
+  * debian/patches/
+    - 01_fix-display-settings added, fix display settings application.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 11 Mar 2009 23:38:34 +0100
+
 xfce4-settings (4.6.0-1) experimental; urgency=low
 
   [ Xfce 4.6 Alpha “Pinkie”]

Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control	2009-03-10 06:52:38 UTC (rev 2944)
+++ desktop/trunk/xfce4-settings/debian/control	2009-03-11 22:47:46 UTC (rev 2945)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.13), libxfce4util-dev (>= 4.6.0),
  libxfcegui4-dev, libexo-0.3-dev (>= 0.3.100), libglade2-dev,
  libxfconf-0-dev, libwnck-dev, libxklavier12-dev, libnotify-dev, 
- intltool (>= 0.31)
+ intltool (>= 0.31), libcanberra-dev, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf

Added: desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch	                        (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch	2009-03-11 22:47:46 UTC (rev 2945)
@@ -0,0 +1,34 @@
+commit 2c0e40bfbb3ead26353861e3566c653085e977a3
+Author: nick <nick at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date:   Wed Mar 11 18:00:30 2009 +0000
+
+    Remove unsigned clamp macro that broke applying the display settings (bug #4966).
+    
+    
+    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29650 a0aa69c2-05f4-0310-b83c-d5d913b14636
+
+diff --git a/dialogs/display-settings/xfce-randr-legacy.c b/dialogs/display-settings/xfce-randr-legacy.c
+index 53b272e..95bc823 100644
+--- a/dialogs/display-settings/xfce-randr-legacy.c
++++ b/dialogs/display-settings/xfce-randr-legacy.c
+@@ -27,11 +27,6 @@
+ 
+ #include "xfce-randr-legacy.h"
+ 
+-/** CLAMP gives a warning with comparing unsigned values */
+-#define UCLAMP(x, low, high) \
+-  (((x) > (high)) ? (high) : \
+-   (((low) > 0) ? (((low) < (x)) ? (low) : (x)) : 0))
+-
+ 
+ 
+ XfceRandrLegacy *
+@@ -184,7 +179,7 @@ xfce_randr_legacy_save (XfceRandrLegacy *legacy,
+     {
+         /* find the resolution and save it as a string */
+         sizes = XRRConfigSizes (legacy->config[n], &nsizes);
+-        size = UCLAMP (legacy->resolution[n], 0, nsizes - 1);
++        size = MIN (legacy->resolution[n], MAX (0, nsizes - 1));
+         resolution = g_strdup_printf ("%dx%d", sizes[size].width, sizes[size].height);
+         g_snprintf (property, sizeof (property), "/%s/Screen_%d/Resolution", scheme, n);
+         xfconf_channel_set_string (channel, property, resolution);

Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules	2009-03-10 06:52:38 UTC (rev 2944)
+++ desktop/trunk/xfce4-settings/debian/rules	2009-03-11 22:47:46 UTC (rev 2945)
@@ -1,10 +1,16 @@
 #!/usr/bin/make -f
-build: build-stamp
+include /usr/share/quilt/quilt.make
 
+build: build-stamp patch
+
+clean: unpatch
+	dh clean
+
 build-stamp:
 	dh build --before configure
 	dh_auto_configure -- --enable-libnotify --enable-xcursor \
-		--enable-libxklavier --enable-xsettings-daemon --disable-sound-settings
+		--enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\
+    --enable-pluggable-dialogs
 	dh build --after configure
 	touch build-stamp