diff --git a/debian/changelog b/debian/changelog index 69ef20b..3be89a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -screengrab (1.95+20150907-1) unstable; urgency=medium +screengrab (1.95+20150929-1) experimental; urgency=medium [Alf Gaida ] + * Cherry-picking upstream version 1.95+20150929. * Changed mail address of czchen - * Cherry-picking upstream version 1.95+20150907. * Added .gitignore * Added watch file * Added lintian-overrides @@ -20,4 +20,4 @@ screengrab (1.95+20150907-1) unstable; urgency=medium [ Andrew Lee (李健秋) ] * Adding upstream version 1.95_pr1. - -- Alf Gaida Mon, 07 Sep 2015 23:00:38 +0200 + -- Alf Gaida Sun, 01 Nov 2015 23:34:44 +0100 diff --git a/debian/control b/debian/control index f293ff6..eb1e0c4 100644 --- a/debian/control +++ b/debian/control @@ -8,15 +8,15 @@ Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), libkf5windowsystem-dev, - libx11-dev, libqxt-dev, libqt5x11extras5-dev, - libqt5xdg-dev, + libqt5xdg-dev (>= 1.3.0), + libx11-dev, pkg-config, qttools5-dev, qttools5-dev-tools Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/screengrab.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/screengrab.git Vcs-Git: git://anonscm.debian.org/pkg-lxqt/screengrab.git Homepage: https://github.com/QtDesktop/screengrab diff --git a/src/modules/uploader/imgur/uploader_imgur.cpp b/src/modules/uploader/imgur/uploader_imgur.cpp index 5fd5b52..73e5b7e 100644 --- a/src/modules/uploader/imgur/uploader_imgur.cpp +++ b/src/modules/uploader/imgur/uploader_imgur.cpp @@ -43,11 +43,11 @@ void Uploader_ImgUr::startUploading() } /*! - * Return url for upload image + * Return url for upload image */ QUrl Uploader_ImgUr::apiUrl() { - return QUrl("http://api.imgur.com/2/upload"); + return QUrl("https://api.imgur.com/2/upload"); } /*! diff --git a/src/modules/uploader/uploaderconfig.cpp b/src/modules/uploader/uploaderconfig.cpp index 4fa075f..78ede10 100644 --- a/src/modules/uploader/uploaderconfig.cpp +++ b/src/modules/uploader/uploaderconfig.cpp @@ -31,13 +31,13 @@ // mediacru.sh settings #define DEF_MCSH_URL "https://mediacru.sh/api/upload/file" -QStringList UploaderConfig::_labelsList = QStringList() << "MediaCrush" << "Imgur"; +QStringList UploaderConfig::_labelsList = QStringList() << "Imgur" << "MediaCrush"; UploaderConfig::UploaderConfig() { QString configFile = Config::getConfigDir() + QDir::separator() + "uploader.conf"; _settings = new QSettings(configFile, QSettings::IniFormat); - _groupsList << "mediacru.sh" << "imgur.com"; + _groupsList << "imgur.com" << "mediacru.sh"; } UploaderConfig::~UploaderConfig()