merged 1.6 maint branch modifs up to MERGED_TO_TRUNK_20061130

2006-11-30 13:38:44 +00:00
parent 03b6f05f23
commit 72fd14f208
46 changed files with 417 additions and 245 deletions
@@ -1,12 +1,11 @@
 bin/recoll
 bin/recollindex
 share/applications/recoll.desktop
-share/icons/recoll.png
+share/icons/hicolor/48x48/apps/recoll.png
 %%DATADIR%%/doc/docbook.css
 %%DATADIR%%/doc/usermanual.html
 %%DATADIR%%/examples/mimeconf
 %%DATADIR%%/examples/mimemap
-%%DATADIR%%/examples/rclmon.sh
 %%DATADIR%%/examples/recoll.conf
 %%DATADIR%%/filters/rcldjvu
 %%DATADIR%%/filters/rcldoc
@@ -45,3 +44,4 @@ share/icons/recoll.png
@dirrm %%DATADIR%%/translations
@dirrm %%DATADIR%%
@dirrmtry share/applications
+@dirrmtry share/icons