sync

diff --git a/INSTALL b/INSTALL
index 281f0bd..2848342 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -51,4 +51,5 @@ Note: it will install things in traditional directories plus
 ruby_archdir and ruby_libdir.
 Change FPATH in ${buildroot}/local/lib/site_ruby/1.8/booh/config.rb to suit your $buildroot
 
-Find icons for your menu system in the icons/ subdir.
+Find desktop stuff (.desktop entry and icons) for your menu/packaging system
+in the destkop/ subdir.

diff --git a/data/man/man1/album2booh.1 b/data/man/man1/album2booh.1
index 20ed096..e775be7 100644 (file)
--- a/data/man/man1/album2booh.1
+++ b/data/man/man1/album2booh.1
@@ -13,7 +13,7 @@
 .\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 .\"
 
-.TH BOOH 15 "March 2008" "BOOH" "The booh web-album"
+.TH BOOH 1 "March 2008" "BOOH" "The booh web-album"
 
 .SH NAME
 album2booh \- a configuration converter from album
@@ -42,7 +42,7 @@ already exist)
 Set max verbosity level (0: errors, 1: warnings, 2: important messages, 3: other messages)
 
 .SH AUTHOR
-Written by Guillaume Cottenceau and Stephane Fillod.
+Written by Guillaume Cottenceau and St\['e]phane Fillod.
 .br
 Visit official homepage: http://booh.org/
 
@@ -51,7 +51,7 @@ Visit official homepage: http://booh.org/
 
 .SH COPYRIGHT
 Copyright \(co 2005-2008 Guillaume Cottenceau.
-Copyright \(co 2007 Stephane Fillod.
+Copyright \(co 2007 St\['e]phane Fillod.
 .br
 This is Free Software; this software is licensed under the GPL version 2, as published by the Free Software Foundation.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

diff --git a/icons/booh-16x16.png b/desktop/booh-16x16.png
similarity index 100%
rename from icons/booh-16x16.png
rename to desktop/booh-16x16.png

diff --git a/icons/booh-32x32.png b/desktop/booh-32x32.png
similarity index 100%
rename from icons/booh-32x32.png
rename to desktop/booh-32x32.png

diff --git a/icons/booh-48x48.png b/desktop/booh-48x48.png
similarity index 100%
rename from icons/booh-48x48.png
rename to desktop/booh-48x48.png

diff --git a/desktop/booh-classifier.desktop b/desktop/booh-classifier.desktop
new file mode 100644 (file)
index 0000000..f3badec
--- /dev/null
+++ b/desktop/booh-classifier.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Booh Classifier
+GenericName=Photos and Videos Classifier
+GenericName[fr]=Trieuse de photos et vidéos
+GenericName[de]=Foto- und Videosortierer
+Comment=Classify pour photos and videos
+Comment[fr]=Triez vos photos et vidéos
+Comment[de]=Sortieren Sie Ihre Fotos und Videos
+Exec=booh-classifier
+Icon=booh-48x48.png
+Terminal=false
+Categories=Graphics;2DGraphics;Photography;GTK;

diff --git a/desktop/booh.desktop b/desktop/booh.desktop
new file mode 100644 (file)
index 0000000..d4b50e0
--- /dev/null
+++ b/desktop/booh.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Booh
+GenericName=Web Album Generator
+GenericName[fr]=Générateur de Web-Album
+GenericName[de]=Webalbum-Generator
+Comment=Create albums to show your photos and videos on the web
+Comment[fr]=Créez des albums pour montrer vos photos et vidéos sur le web
+Comment[de]=Erstellen Sie Foto- und Videoalben zur Veröffentlichung auf Internet
+Exec=booh
+Icon=booh-48x48.png
+Terminal=false
+Categories=Graphics;2DGraphics;Photography;GTK;