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

Yves-Alexis Perez corsac at alioth.debian.org
Thu May 28 08:18:28 UTC 2009 

Author: corsac
Date: 2009-05-28 20:18:28 +0000 (Thu, 28 May 2009)
New Revision: 3270

Added:
   desktop/trunk/xfce4-mixer/debian/patches/
   desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90%.patch
   desktop/trunk/xfce4-mixer/debian/patches/series
Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/rules
Log:
* debian/rules:
  - switch to dh7 minimal rule, with quilt addon.
* debian/control:
  - add build-dep on recent enough quilt.
* debian/patches:
  - 01_fix-volume-90% added, fix scrolling on panel icon not turning
    volume above 90%.                                         closes: #529257

Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2009-05-28 19:36:49 UTC (rev 3269)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2009-05-28 20:18:28 UTC (rev 3270)
@@ -1,3 +1,15 @@
+xfce4-mixer (4.6.1-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - switch to dh7 minimal rule, with quilt addon.
+  * debian/control:
+    - add build-dep on recent enough quilt.
+  * debian/patches:
+    - 01_fix-volume-90% added, fix scrolling on panel icon not turning
+      volume above 90%.                                         closes: #529257
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 28 May 2009 21:51:03 +0200
+
 xfce4-mixer (4.6.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2009-05-28 19:36:49 UTC (rev 3269)
+++ desktop/trunk/xfce4-mixer/debian/control	2009-05-28 20:18:28 UTC (rev 3270)
@@ -7,7 +7,7 @@
  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
+ libxfconf-0-dev (>= 4.6.0), intltool, quilt (>= 0.46-7)
 Standards-Version: 3.8.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
@@ -26,4 +26,3 @@
  desktop as a plugin for the Xfce4 main panel.
  .
  It uses GStreamer as a backend.
-

Added: desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90bogus %ptch
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90%.patch	                        (rev 0)
+++ desktop/trunk/xfce4-mixer/debian/patches/01_fix-volume-90%.patch	2009-05-28 20:18:28 UTC (rev 3270)
@@ -0,0 +1,27 @@
+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 ();

Added: desktop/trunk/xfce4-mixer/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-mixer/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-mixer/debian/patches/series	2009-05-28 20:18:28 UTC (rev 3270)
@@ -0,0 +1 @@
+01_fix-volume-90%.patch

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2009-05-28 19:36:49 UTC (rev 3269)
+++ desktop/trunk/xfce4-mixer/debian/rules	2009-05-28 20:18:28 UTC (rev 3270)
@@ -1,86 +1,7 @@
 #!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	
-	dh_testdir
-
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --libexecdir=\$${prefix}/lib
-
-	touch config.status
-	
-build: build-stamp
-build-stamp: config.status
-	
-	dh_testdir
-	
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp config.status
-	
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_clean
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer
-
-	# install menu pixmap
-	install -d $(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
-	install -c -m 644 $(CURDIR)/debian/xfce4-mixer.xpm \
-		$(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
-
-
-	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.la
-	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.a
-	rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.la
-	rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.a
-
-binary-indep: build install
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs README debian/NEWS.Debian
-	dh_installman debian/xfce4-mixer.1
-	dh_lintian
-	
-	dh_strip
-	dh_compress
-	
-	dh_fixperms
-	dh_installdeb
-	
-	dh_shlibdeps -l$(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
-	dh_gencontrol -s
-	
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh --with quilt $@

More information about the Pkg-xfce-commits mailing list