Permalink
Browse files

install tora icons into correct directory, fix .desktop file

  • Loading branch information...
1 parent d770630 commit 8289e4f39733cc504d034b4f203798d614c4c9ee @aclemons committed Nov 28, 2011
Showing with 23 additions and 12 deletions.
  1. +3 −3 tora/doinst.sh
  2. +9 −9 tora/tora.SlackBuild
  3. +11 −0 tora/tora.desktop
View
@@ -1,9 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+ /usr/bin/update-desktop-database -q /usr/share/applications >/dev/null 2>&1
fi
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+if [ -e /usr/share/icons/hicolor/icon-theme.cache ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor >/dev/null 2>&1
fi
fi
View
@@ -90,13 +90,13 @@ cd build
cd ..
mkdir -p $PKG/usr/share/applications
-cp debian/tora.desktop $PKG/usr/share/applications/
+cp "$CWD"/tora.desktop $PKG/usr/share/applications/
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README README.BINARIES \
- README.CMAKE README.CODESTYLE README.LAYOUT README.LICENSE README.OSX \
- README.RELEASE README.SVN README.WINDOWS TODO \
+ README.CMAKE README.CODESTYLE README.LAYOUT README.LICENSE \
+ README.RELEASE README.SVN TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -105,15 +105,15 @@ install --mode=0644 doc/help/*.html $PKG/usr/lib$LIBDIRSUFFIX/tora/help/
install --mode=0644 doc/help/images/*.png $PKG/usr/lib$LIBDIRSUFFIX/tora/help/images/
mkdir -p $PKG/usr/share/pixmaps
-install --mode=0644 src/icons/toramini.xpm $PKG/usr/share/pixmaps/
+install --mode=0644 src/icons/tora.xpm $PKG/usr/share/pixmaps/tora.xpm
-mkdir -p $PKG/usr/share/icons/hicolor/16x16
-install --mode=0644 src/icons/toramini.xpm $PKG/usr/share/icons/hicolor/16x16/tora.xpm
+mkdir -p $PKG/usr/share/icons/hicolor/16x16/apps/
+install --mode=0644 src/icons/toramini.xpm $PKG/usr/share/icons/hicolor/16x16/apps/tora.xpm
-mkdir -p $PKG/usr/share/icons/hicolor/32x32
-install --mode=0644 src/icons/tora.xpm $PKG/usr/share/icons/hicolor/32x32/tora.xpm
+mkdir -p $PKG/usr/share/icons/hicolor/32x32/apps
+install --mode=0644 src/icons/tora.xpm $PKG/usr/share/icons/hicolor/32x32/apps/tora.xpm
-# qscintilla from vanilla slackware doesn't install shared library were
+# qscintilla from vanilla slackware doesn't install shared library where
# tora looks for it, add a symlink
if [ "$ARCH" = "x86_64" ]; then
ln -s /usr/lib64/qt/lib/libqscintilla2.so.5 $PKG/usr/lib64/libqscintilla2.so.5
View
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=TOra
+Exec=/usr/bin/tora
+Icon=/usr/share/pixmaps/tora.xpm
+Type=Application
+MimeType=application/x-tora
+Comment=A graphical toolkit for database administration and development
+Comment[fr]=Une boite à outil graphique pour l'administration et le développement de base de données
+Comment[de]=Grafisches Toolkit zur Administration und Entwicklung von Datenbanken
+Categories=Application;Development;

0 comments on commit 8289e4f

Please sign in to comment.