[Pkg-xfce-commits] r5181 - in desktop/trunk/xfce4-mixer/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-31 06:17:03 +0000 (Thu, 31 Mar 2011)
New Revision: 5181

Removed:
   desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90%.patch
Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/patches/series
   desktop/trunk/xfce4-mixer/debian/rules
Log:
merge 4.8 branch from experimental


Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2011-03-31 06:05:00 UTC (rev 5180)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2011-03-31 06:17:03 UTC (rev 5181)
@@ -1,19 +1,26 @@
-xfce4-mixer (4.6.1-3) UNRELEASED; urgency=low
+xfce4-mixer (4.8.0-1) experimental; urgency=low
 
   [ Stefan Ott ]
   * debian/watch edited to track Xfce archive reorganisation.
 
   [ Yves-Alexis Perez ]
+  * New upstream release.
   * Switch to 3.0 (quilt) format.
   * debian/rules:
     - drop all references to quilt
     - call dpkg-buildflags for CFLAGS and LDFLAGS.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
   * debian/control:
     - drop quilt build-dep
     - update standards version to 3.9.1
     - update debhelper build-dep to 7.0.50~ because of overrides. 
+    - add build-dep on hardening-includes.
+    - update build-deps for Xfce 4.8.
+  * debian/patches:
+    - 01_fix-volume-90% dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 11 Aug 2010 07:46:41 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 00:52:11 +0100
 
 xfce4-mixer (4.6.1-2) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2011-03-31 06:05:00 UTC (rev 5180)
+++ desktop/trunk/xfce4-mixer/debian/control	2011-03-31 06:17:03 UTC (rev 5181)
@@ -5,9 +5,9 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), pkg-config, libglib2.0-dev,
  libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, 
- libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), 
- xfce4-panel-dev (>= 4.6.0), libxml-parser-perl, 
- libxfconf-0-dev (>= 4.6.0), intltool
+ libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), 
+ xfce4-panel-dev (>= 4.8.0), libxml-parser-perl, 
+ libxfconf-0-dev (>= 4.8.0), intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/

Deleted: desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90bogus %ptch
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90%.patch	2011-03-31 06:05:00 UTC (rev 5180)
+++ desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90%.patch	2011-03-31 06:17:03 UTC (rev 5181)
@@ -1,27 +0,0 @@
-commit 3fc55dd176d11a4fd63e8cd59e0fff578d7362cc
-Author: jannis <jannis at a0aa69c2-05f4-0310-b83c-d5d913b14636>
-Date:   Thu May 28 14:41:40 2009 +0000
-
-    	* panel-plugin/xfce-volume-button.c: Set the page size to 0 which
-    	  allows the volume to be changed up to 100% instead of just 90% (bug
-    	  #5243).
-    
-    Conflicts:
-    
-    	ChangeLog
-    
-    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-mixer/trunk@29986 a0aa69c2-05f4-0310-b83c-d5d913b14636
-
-diff --git a/panel-plugin/xfce-volume-button.c b/panel-plugin/xfce-volume-button.c
-index 1b8b8c1..82a7129 100644
---- a/panel-plugin/xfce-volume-button.c
-+++ b/panel-plugin/xfce-volume-button.c
-@@ -202,7 +202,7 @@ xfce_volume_button_init (XfceVolumeButton *button)
-   button->pixbufs = g_new0 (GdkPixbuf*, G_N_ELEMENTS (icons)-1);
- 
-   /* Create adjustment for the button (from 0.0 to 1.0 in 5% steps) */
--  button->adjustment = gtk_adjustment_new (0.0, 0.0, 1.0, 0.05, 0.05, 0.1);
-+  button->adjustment = gtk_adjustment_new (0.0, 0.0, 1.0, 0.05, 0.05, 0.0);
- 
-   /* Create a new scaled image for the button icon */
-   button->image = xfce_scaled_image_new ();

Modified: desktop/trunk/xfce4-mixer/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/series	2011-03-31 06:05:00 UTC (rev 5180)
+++ desktop/trunk/xfce4-mixer/debian/patches/series	2011-03-31 06:17:03 UTC (rev 5181)
@@ -1 +0,0 @@
-01_fix-volume-90%.patch

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2011-03-31 06:05:00 UTC (rev 5180)
+++ desktop/trunk/xfce4-mixer/debian/rules	2011-03-31 06:17:03 UTC (rev 5181)
@@ -1,9 +1,14 @@
 #!/usr/bin/make -f
 
+include /usr/share/hardening-includes/hardening.make
+
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
+export CFLAGS LDFLAGS
+
 %:
 	dh $@