This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit b3b96a73a943fdcff8e15dde86c2adcae473a393 Author: Gabriel Rauter <[email protected]> Date: Tue Apr 5 00:40:01 2016 +0200 rename desk to desktop, remove virtual and add override --- CMakeLists.txt | 2 +- {desk => desktop}/CMakeLists.txt | 0 {desk => desktop}/aseprite-thumbnailer | 2 +- {desk => desktop}/gnome/aseprite.thumbnailer | 0 {desk => desktop}/kde/CMakeLists.txt | 0 {desk => desktop}/kde/aseprite_thumb_creator.cpp | 0 {desk => desktop}/kde/aseprite_thumb_creator.h | 4 ++-- {desk => desktop}/kde/asepritethumbnail.desktop | 0 {desk => desktop}/mime/aseprite.xml | 0 9 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa563b9..9fa7ef3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -400,7 +400,7 @@ if(APPLE) endif(APPLE) if(WITH_DESKTOP_INTEGRATION) - add_subdirectory(desk) + add_subdirectory(desktop) endif() ###################################################################### diff --git a/desk/CMakeLists.txt b/desktop/CMakeLists.txt similarity index 100% rename from desk/CMakeLists.txt rename to desktop/CMakeLists.txt diff --git a/desk/aseprite-thumbnailer b/desktop/aseprite-thumbnailer similarity index 86% rename from desk/aseprite-thumbnailer rename to desktop/aseprite-thumbnailer index 76e9124..5f8de9f 100755 --- a/desk/aseprite-thumbnailer +++ b/desktop/aseprite-thumbnailer @@ -7,7 +7,7 @@ if [ $# -ge 2 -a $# -lt 4 ]; then elif [ $# -eq 3 ]; then aseprite -b --frame-range "0,0" $1 --shrink-to "$3,$3" --sheet /tmp/Aseprite/$filename.png fi - mkdir -p $(dirname "$2"); mv /tmp/Aseprite/$filename.png $2; + mkdir -p $(dirname "$2"); mv /tmp/Aseprite/$filename.png $2; else echo "Parameters for aseprite thumbnailer are: inputfile outputfile [size]" fi diff --git a/desk/gnome/aseprite.thumbnailer b/desktop/gnome/aseprite.thumbnailer similarity index 100% rename from desk/gnome/aseprite.thumbnailer rename to desktop/gnome/aseprite.thumbnailer diff --git a/desk/kde/CMakeLists.txt b/desktop/kde/CMakeLists.txt similarity index 100% rename from desk/kde/CMakeLists.txt rename to desktop/kde/CMakeLists.txt diff --git a/desk/kde/aseprite_thumb_creator.cpp b/desktop/kde/aseprite_thumb_creator.cpp similarity index 100% rename from desk/kde/aseprite_thumb_creator.cpp rename to desktop/kde/aseprite_thumb_creator.cpp diff --git a/desk/kde/aseprite_thumb_creator.h b/desktop/kde/aseprite_thumb_creator.h similarity index 69% rename from desk/kde/aseprite_thumb_creator.h rename to desktop/kde/aseprite_thumb_creator.h index 399b6ae..c32e601 100644 --- a/desk/kde/aseprite_thumb_creator.h +++ b/desktop/kde/aseprite_thumb_creator.h @@ -9,8 +9,8 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_ASEPRITE_THUMBCREATOR) class AsepriteThumbCreator : public ThumbCreator { public: - virtual bool create(const QString& path, int width, int height, QImage& img); - virtual Flags flags() const; + bool create(const QString& path, int width, int height, QImage& img) override; + Flags flags() const override; }; #endif diff --git a/desk/kde/asepritethumbnail.desktop b/desktop/kde/asepritethumbnail.desktop similarity index 100% rename from desk/kde/asepritethumbnail.desktop rename to desktop/kde/asepritethumbnail.desktop diff --git a/desk/mime/aseprite.xml b/desktop/mime/aseprite.xml similarity index 100% rename from desk/mime/aseprite.xml rename to desktop/mime/aseprite.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
