[SCM] qjackctl packaging branch, master, updated. bfa158b8e66b366d3ef08f5d5534e7e7cbc08779

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Sun Oct 4 13:38:04 UTC 2009


The following commit has been merged in the master branch:
commit 01632a3d8548be3102472d864550aa2bda6273e0
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun Oct 4 13:51:06 2009 +0200

    Remove window manager patch.
    
    This is an old patch for #427707 and #427706. Looks like it isn't
    required as long as bKeepOnTop is set to false. This was once set to
    true, but the default is now false (see src/qjackctlSetup.cpp)
    
    According to
    <https://bugs.launchpad.net/ubuntu/+source/qjackctl/+bug/114720/comments/8>,
    we can ignore this.
    
    If it happens that this breaks something, re-adding the patch is simple.

diff --git a/debian/patches/01_wmanager.patch b/debian/patches/01_wmanager.patch
deleted file mode 100644
index 88b9199..0000000
--- a/debian/patches/01_wmanager.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur qjackctl-0.3.2/src/main.cpp qjackctl-0.3.2.new/src/main.cpp
---- qjackctl-0.3.2/src/main.cpp	2007-12-04 11:41:46.000000000 +0100
-+++ qjackctl-0.3.2.new/src/main.cpp	2008-02-06 16:36:31.000000000 +0100
-@@ -74,8 +74,8 @@
- 		| Qt::WindowTitleHint
- 		| Qt::WindowSystemMenuHint
- 		| Qt::WindowMinMaxButtonsHint;
--	if (settings.bKeepOnTop)
--		wflags |= Qt::Tool;
-+//	if (settings.bKeepOnTop)
-+//		wflags |= Qt::Tool;
- 	// Construct the main form, and show it to the world.
- 	qjackctlMainForm w(0, wflags);
- //	app.setMainWidget(&w);

-- 
qjackctl packaging



More information about the pkg-multimedia-commits mailing list