Merge branch 't/dia'

The single commit of this branch is more than one year old. I totally
forgot about it, but here it is:

	311ec5 Switch logo from skencil to dia.

The web page has been updated to contain the new image.

diff --combined Makefile
index bbe616ac520024ca5c70c81998004b3c91fde38d,073974e76ed1f1f7901a9ebdc781ebab180b29ec..821ccaf033972621f6c9e536aef5f468136b58ea
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
 -dss_objects := cmdline.o dss.o string.o fd.o exec.o signal.o daemon.o df.o time.o snap.o ipc.o
 +dss_objects := cmdline.o dss.o str.o file.o exec.o sig.o daemon.o df.o tv.o snap.o ipc.o
  all: dss
  man: dss.1
  
@@@ -30,10 -30,8 +30,8 @@@ cmdline.o: cmdline.c cmdline.
  %.o: %.c Makefile
        $(CC) -c $(CFLAGS) $(DEBUG_CFLAGS) $<
  
- %.ppm: %.sk
-       sk2ppm $< > $@
- %.png: %.ppm
-       convert $< $@
+ %.png: %.dia
+       dia -e $@ -t png $<
  
  cmdline.c cmdline.h: dss.ggo
        gengetopt --conf-parser < $<
@@@ -45,7 -43,7 +43,7 @@@ dss.1: dss dss.1.in
        man2html $< > $@
  
  clean:
-       rm -f *.o dss dss.1 dss.1.html Makefile.deps *.ppm *.png *~ cmdline.c cmdline.h index.html
+       rm -f *.o dss dss.1 dss.1.html Makefile.deps *.png *~ cmdline.c cmdline.h index.html
  
  index.html: dss.1.html index.html.in INSTALL README NEWS
        sed -e '/@README@/,$$d' index.html.in > $@