rev 6206 - in trunk/packages/kdeutils/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-05-15 20:51:48 +0000 (Tue, 15 May 2007)
New Revision: 6206

Added:
   trunk/packages/kdeutils/debian/patches/17_use_free_unrar_if_available.diff
Modified:
   trunk/packages/kdeutils/debian/changelog
   trunk/packages/kdeutils/debian/patches/15_klaptopdaemon_filenames_check.diff
   trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
kdeutils 3.5.7


Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2007-05-15 20:34:57 UTC (rev 6205)
+++ trunk/packages/kdeutils/debian/changelog	2007-05-15 20:51:48 UTC (rev 6206)
@@ -1,3 +1,13 @@
+kdeutils (4:3.5.7-1) unstable; urgency=low
+
+  * New upstream release
+    + Adapt patch 15 about klaptop daemon filenames
+  * Snmp-maintainers - we love you. Change build-deps from libsnmp10-dev to
+    libsnmp-dev.
+  * Add patch to use unrar-free if available. (Closes: #423170)
+
+ -- Sune Vuorela <debian at pusling.com>  Tue, 15 May 2007 21:31:36 +0200
+
 kdeutils (4:3.5.6-3) unstable; urgency=low
 
   * Add patch 16_klaptopdaemon_lock_and_hibernate to avoid unauthorised access

Modified: trunk/packages/kdeutils/debian/patches/15_klaptopdaemon_filenames_check.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/15_klaptopdaemon_filenames_check.diff	2007-05-15 20:34:57 UTC (rev 6205)
+++ trunk/packages/kdeutils/debian/patches/15_klaptopdaemon_filenames_check.diff	2007-05-15 20:51:48 UTC (rev 6206)
@@ -1,6 +1,6 @@
 --- a/klaptopdaemon/laptop_daemon.cpp	2006-01-19 11:49:18.000000000 -0500
 +++ b/klaptopdaemon/laptop_daemon.cpp	2006-11-10 16:13:00.000000000 -0500
-@@ -955,7 +955,7 @@
+@@ -952,7 +952,7 @@
  	// the lid button turns stuff on when it's down and back off again when it's raised
  	// 	(kind of like the fridge door light)
  	//
@@ -9,7 +9,7 @@
  		lid_state = !lid_state;
  		if (lid_state) {
  			if (s.button_lid_bright_enabled) {
-@@ -1018,7 +1018,7 @@
+@@ -1015,7 +1015,7 @@
  	//
  	// the power button on the other hand is an off/on switch for non-suspend type ops
  	//
@@ -177,9 +177,9 @@
  		default:
  			break;
  		}
--		if (name) {
-+		if (name && !name->isEmpty()) {
- 			QFile f(*name);
+-		if (!name.isEmpty()) {
++		if (!name.isEmpty()) {
+ 			QFile f(name);
 -			if (f.open(IO_ReadOnly)) {
 +			if (f.exists() && f.open(IO_ReadOnly)) {
  				while (!f.atEnd()) {

Added: trunk/packages/kdeutils/debian/patches/17_use_free_unrar_if_available.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/17_use_free_unrar_if_available.diff	                        (rev 0)
+++ trunk/packages/kdeutils/debian/patches/17_use_free_unrar_if_available.diff	2007-05-15 20:51:48 UTC (rev 6206)
@@ -0,0 +1,35 @@
+Index: kdeutils/ark/rar.cpp
+===================================================================
+--- kdeutils/ark/rar.cpp
++++ kdeutils/ark/rar.cpp
+@@ -55,6 +55,8 @@
+ {
+   // Check if rar is available
+   bool have_rar = !KGlobal::dirs()->findExe( "rar" ).isNull();
++  bool have_unrar = !KGlobal::dirs()->findExe( "unrar" ).isNull();
++  bool have_unrar_free = !KGlobal::dirs()->findExe( "unrar-free" ).isNull();
+ 
+   if ( have_rar )
+   {
+@@ -63,13 +65,20 @@
+     verifyCompressUtilityIsAvailable( m_archiver_program );
+     verifyUncompressUtilityIsAvailable( m_unarchiver_program );
+   }
+-  else
++  else if (have_unrar)
+   {
+     // If rar is not available, try to use unrar to open the archive read-only
+     m_unarchiver_program = "unrar";
+     verifyUncompressUtilityIsAvailable( m_unarchiver_program );
+     setReadOnly( true );
+   }
++  else
++  {
++    // If rar is not available, try to use unrar to open the archive read-only
++    m_unarchiver_program = "unrar-free";
++    verifyUncompressUtilityIsAvailable( m_unarchiver_program );
++    setReadOnly( true );
++  }
+ 
+ 
+ 

Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================