Hi,
You may find the attached debdiff useful.
1) I added mpd to the Suggests because conky offers support for it
2) The patch fixed the issuse no -> none in conky.conf (I saw you
already found that out)
    Furthermore the patch should fix the sigsegv we discovered. (Fix is
working but we are waiting for a response by upstream)

However thanks for you help. And we really should thank Cesare for
providing the fix and some other hints.


Cheers,
Stefan
diff -u conky-1.5.1/debian/control conky-1.5.1/debian/control
--- conky-1.5.1/debian/control
+++ conky-1.5.1/debian/control
@@ -15,6 +15,7 @@
 Package: conky
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: mpd
 Description: highly configurable system monitor for X based on torsmo
  Conky is a system monitor for X originally based on the torsmo code.
  Since its original conception, Conky has changed a fair bit from its
diff -u conky-1.5.1/debian/patches/series conky-1.5.1/debian/patches/series
--- conky-1.5.1/debian/patches/series
+++ conky-1.5.1/debian/patches/series
@@ -1,3 +1,4 @@
+ubuntu_fix_conf_and_sigsegv
 upstream_fix_usage
 upstream_null_text
 avoid_linking_with_libm
only in patch2:
unchanged:
--- conky-1.5.1.orig/debian/patches/ubuntu_fix_conf_and_sigsegv
+++ conky-1.5.1/debian/patches/ubuntu_fix_conf_and_sigsegv
@@ -0,0 +1,35 @@
+Index: conky-1.5.1/data/conky.conf
+===================================================================
+--- conky-1.5.1.orig/data/conky.conf   2008-04-07 16:33:25.000000000 +0200
++++ conky-1.5.1/data/conky.conf        2008-04-07 16:34:15.000000000 +0200
+@@ -48,7 +48,7 @@
+ stippled_borders 0
+ update_interval 3.0
+ uppercase no
+-use_spacer no
++use_spacer none
+ 
+ TEXT
+ $nodename - $sysname $kernel on $machine
+Index: conky-1.5.1/src/conky.c
+===================================================================
+--- conky-1.5.1.orig/src/conky.c       2008-04-07 16:33:17.000000000 +0200
++++ conky-1.5.1/src/conky.c    2008-04-07 16:34:00.000000000 +0200
+@@ -7505,8 +7505,6 @@
+ 
+ #ifdef X11
+       free_fonts();
+-      load_fonts();
+-      set_font();
+ #endif /* X11 */
+ 
+ #ifdef TCP_PORT_MONITOR
+@@ -7524,6 +7522,8 @@
+               }
+ 
+ #ifdef X11
++              load_fonts();
++              set_font();
+               // clear the window first
+               XClearWindow(display, RootWindow(display, screen));
+ 

Reply via email to