This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 9ce9f5634cc3125a51b9d1c20eea07d118cda327 Author: Sven Eckelmann <[email protected]> Date: Mon Jun 1 13:24:00 2009 +0200 Remove changes outside of debian/* --- debian/changelog | 1 + {icons => debian}/mupen64plus-large.xpm | 0 install.sh | 13 ++----------- mupen64plus.desktop.in | 4 ++-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 91bbc67..fa28883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ mupen64plus (1.5-2) UNRELEASED; urgency=low - Remove unused configure target - Use quilt to patch files * Don't mark files in /usr/share as conffiles - they are only templates + * Remove changes outside of debian/* -- Sven Eckelmann <[email protected]> Mon, 01 Jun 2009 12:27:41 +0200 diff --git a/icons/mupen64plus-large.xpm b/debian/mupen64plus-large.xpm similarity index 100% rename from icons/mupen64plus-large.xpm rename to debian/mupen64plus-large.xpm diff --git a/install.sh b/install.sh index 878f92f..ab40d76 100755 --- a/install.sh +++ b/install.sh @@ -42,18 +42,17 @@ fi usage() { -printf "usage: $(basename $0) [PREFIX] [SHAREDIR] [BINDIR] [LIBDIR] [MANDIR] [APPLICATIONSDIR] [PIXMAPSDIR] +printf "usage: $(basename $0) [PREFIX] [SHAREDIR] [BINDIR] [LIBDIR] [MANDIR] [APPLICATIONSDIR] \tPREFIX - installation directories prefix (default: /usr/local) \tSHAREDIR - path to Mupen64Plus shared data files (default: \$PREFIX/share/mupen64plus) \tBINDIR - path to Mupen64Plus binary program files (default: \$PREFIX/bin) \tLIBDIR - path to Mupen64Plus plugins (default: \$SHAREDIR/plugins) \tMANDIR - path to manual files (default: \$PREFIX/man/man1) \tAPPLICATIONSDIR - path to place .desktop file in (default: \$PREFIX/share/applications) -\tPIXMAPSDIR - path to .xpm icons (default: \$PREFIX/share/pixmaps) " } -if [ $# -gt 7 ]; then +if [ $# -gt 6 ]; then usage exit 1 fi @@ -65,9 +64,6 @@ LIBDIR="${4:-${SHAREDIR}/plugins}" MANDIR="${5:-${PREFIX}/man/man1}" APPLICATIONSDIR="${6:-${PREFIX}/share/applications}" -#Esta es una modificación por parte de Félix para poder copiar el archivo xpm, que es el icono que se usará en el archivo .desktop -PIXMAPSDIR="${7:-${PREFIX}/share/pixmaps}" - printf "Installing Mupen64Plus to ${PREFIX}\n" $INSTALL -d -v "${SHAREDIR}" $INSTALL -d -v "${SHAREDIR}/config" @@ -79,11 +75,6 @@ $INSTALL -d -v "${SHAREDIR}/fonts" $INSTALL -m 0644 fonts/* "${SHAREDIR}/fonts" $INSTALL -d -v "${SHAREDIR}/icons" $INSTALL -m 0644 icons/*.png "${SHAREDIR}/icons" - -#Esta es una modificación por parte de Félix para poder copiar el archivo xpm, que es el icono que se usará en el archivo .desktop -$INSTALL -d -v "${PIXMAPSDIR}" -$INSTALL -m 0644 icons/*.xpm "${PIXMAPSDIR}" - $INSTALL -d -v "${SHAREDIR}/icons/32x32" $INSTALL -m 0644 icons/32x32/* "${SHAREDIR}/icons/32x32" $INSTALL -d -v "${SHAREDIR}/icons/22x22" diff --git a/mupen64plus.desktop.in b/mupen64plus.desktop.in index ecc3cc7..c532dce 100644 --- a/mupen64plus.desktop.in +++ b/mupen64plus.desktop.in @@ -3,9 +3,9 @@ Encoding=UTF-8 Type=Application TryExec=mupen64plus Exec=mupen64plus -Icon=mupen64plus-large.xpm +Icon=SHARE_DIR/icons/mupen64plus-large.png Comment=Mupen64Plus Nintendo 64 Emulator Terminal=false Name=Mupen64Plus GenericName=Nintendo 64 Emulator -Categories=Application;Game; +Categories=Qt;Game; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
