1 /jds/bin/diff -uprN dia-0.96.1.old/doc/en/usage-layers.xml dia-0.96.1/doc/en/usage-layers.xml 2 --- dia-0.96.1.old/doc/en/usage-layers.xml 2008-10-31 14:08:50.432797000 +0000 3 +++ dia-0.96.1/doc/en/usage-layers.xml 2008-10-31 14:11:32.402676000 +0000 4 @@ -26,7 +26,7 @@ 5 </para> 6 </tip> 7 <para> 8 - Each new diagram comes with the default layer labelled Background. Of course you can change its name and settings to customize it to your needs as you can do with any other layer. 9 + Each new diagram comes with the default layer labelled Background. Of course you can change its name and settings to customize it to your needs as you can do with any other layer. 10 </para> 11 <para> 12 You can use layers to create overlay slide show by drawing each incremental slide in a 13 /jds/bin/diff -uprN dia-0.96.1.old/xmldocs.make dia-0.96.1/xmldocs.make 14 --- dia-0.96.1.old/xmldocs.make 2008-10-31 20:46:54.279787000 +0000 15 +++ dia-0.96.1/xmldocs.make 2008-10-31 20:47:27.014803000 +0000 16 @@ -37,9 +37,9 @@ 17 # This variable (docdir) specifies where the documents should be installed. 18 # This default value should work for most packages. 19 if HAVE_GNOME 20 -docdir = $(datadir)/gnome/help/$(docname)/$(lang) 21 +helpdir = $(datadir)/gnome/help/$(docname)/$(lang) 22 else 23 -docdir = $(datadir)/help/$(docname)/$(lang) 24 +helpdir = $(datadir)/help/$(docname)/$(lang) 25 endif 26 27 # ********** You should not have to edit below this line ********** 28 @@ -67,15 +67,15 @@ app-dist-hook: 29 fi 30 31 install-data-local: omf 32 - $(mkinstalldirs) $(DESTDIR)$(docdir) 33 + $(mkinstalldirs) $(DESTDIR)$(helpdir) 34 for file in $(xml_files); do \ 35 - cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ 36 + cp $(srcdir)/$$file $(DESTDIR)$(helpdir); \ 37 done 38 if test "$(figdir)"; then \ 39 - $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ 40 + $(mkinstalldirs) $(DESTDIR)$(helpdir)/$(figdir); \ 41 for file in $(srcdir)/$(figdir)/*.png; do \ 42 basefile=`echo $$file | sed -e 's,^.*/,,'`; \ 43 - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ 44 + $(INSTALL_DATA) $$file $(DESTDIR)$(helpdir)/$(figdir)/$$basefile; \ 45 done \ 46 fi 47 48 @@ -87,13 +87,13 @@ uninstall-local-doc: 49 -if test "$(figdir)"; then \ 50 for file in $(srcdir)/$(figdir)/*.png; do \ 51 basefile=`echo $$file | sed -e 's,^.*/,,'`; \ 52 - rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ 53 + rm -f $(DESTDIR)$(helpdir)/$(figdir)/$$basefile; \ 54 done; \ 55 - rmdir $(DESTDIR)$(docdir)/$(figdir); \ 56 + rmdir $(DESTDIR)$(helpdir)/$(figdir); \ 57 fi 58 -for file in $(xml_files); do \ 59 - rm -f $(DESTDIR)$(docdir)/$$file; \ 60 + rm -f $(DESTDIR)$(helpdir)/$$file; \ 61 done 62 - -rmdir $(DESTDIR)$(docdir) 63 + -rmdir $(DESTDIR)$(helpdir) 64 65 clean-local: clean-local-omf 66