This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit d88cd5ee1b2162989b2a96cd3fd4ce211474eb49
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Jul 3 15:50:48 2016 +0200
Drop patches applied upstream, refresh remaining patch.
---
debian/changelog | 1 +
debian/patches/hicolor-icons.patch | 35 -----------------------------------
debian/patches/hurd.patch | 16 ----------------
debian/patches/kfreebsd.patch | 16 ----------------
debian/patches/original-typo.patch | 2 +-
debian/patches/qt54.patch | 26 --------------------------
debian/patches/series | 4 ----
7 files changed, 2 insertions(+), 98 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5de4fcf..6801583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qmapshack (1.6.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Update watch file to handle new tag convention and filenamemangling.
+ * Drop patches applied upstream, refresh remaining patch.
-- Bas Couwenberg <sebas...@debian.org> Sun, 03 Jul 2016 15:41:40 +0200
diff --git a/debian/patches/hicolor-icons.patch
b/debian/patches/hicolor-icons.patch
deleted file mode 100644
index e928e85..0000000
--- a/debian/patches/hicolor-icons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Install application icons in hicolor theme.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded:
https://bitbucket.org/maproom/qmapshack/pull-requests/100/install-application-icons-in-hicolor-theme/diff
-Applied-Upstream:
https://bitbucket.org/maproom/qmapshack/commits/d4639b7743157571e0e161c14169d605498ba6d9
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,24 +80,10 @@ if (UNIX AND NOT WIN32 AND NOT APPLE)
- )
-
- install(
-- FILES
-- src/icons/48x48/QMapShack.png
-+ DIRECTORY
-+ src/icons/hicolor
- DESTINATION
-- ${ICON_INSTALL_DIR}/hicolor/48x48/apps
-- )
--
-- install(
-- FILES
-- src/icons/32x32/QMapShack.png
-- DESTINATION
-- ${ICON_INSTALL_DIR}/hicolor/32x32/apps
-- )
--
-- install(
-- FILES
-- src/icons/QMapShack.svg
-- DESTINATION
-- ${ICON_INSTALL_DIR}/hicolor/scalable/apps
-+ ${ICON_INSTALL_DIR}
- )
-
- install(
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index e8a073d..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Add handling for GNU/Hurd.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: https://bitbucket.org/maproom/qmapshack/pull-requests/92
-Applied-Upstream:
https://bitbucket.org/maproom/qmapshack/commits/9248951bf6d2ab5f0f37e43d01e00eaec7264e6f
-
---- a/src/setup/IAppSetup.cpp
-+++ b/src/setup/IAppSetup.cpp
-@@ -36,7 +36,7 @@ IAppSetup* IAppSetup::getPlatformInstanc
- {
- #if defined(Q_OS_MAC)
- instance = new CAppSetupMac();
--#elif defined(Q_OS_LINUX) || defined(__FreeBSD_kernel__)
-+#elif defined(Q_OS_LINUX) || defined(__FreeBSD_kernel__) || defined(__GNU__)
- instance = new CAppSetupLinux();
- #elif defined (Q_OS_WIN32)
- instance = new CAppSetupWin();
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
deleted file mode 100644
index c95e0f9..0000000
--- a/debian/patches/kfreebsd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Add support kFreeBSD ports, treat like Linux.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: https://bitbucket.org/maproom/qmapshack/pull-requests/91
-Applied-Upstream:
https://bitbucket.org/maproom/qmapshack/commits/7e40795ba5cd3696eef315a8a94306d77941bb50
-
---- a/src/setup/IAppSetup.cpp
-+++ b/src/setup/IAppSetup.cpp
-@@ -36,7 +36,7 @@ IAppSetup* IAppSetup::getPlatformInstanc
- {
- #if defined(Q_OS_MAC)
- instance = new CAppSetupMac();
--#elif defined(Q_OS_LINUX)
-+#elif defined(Q_OS_LINUX) || defined(__FreeBSD_kernel__)
- instance = new CAppSetupLinux();
- #elif defined (Q_OS_WIN32)
- instance = new CAppSetupWin();
diff --git a/debian/patches/original-typo.patch
b/debian/patches/original-typo.patch
index 973d276..48cdf28 100644
--- a/debian/patches/original-typo.patch
+++ b/debian/patches/original-typo.patch
@@ -5,7 +5,7 @@ Applied-Upstream:
https://bitbucket.org/maproom/qmapshack/commits/111995e135a623
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
-@@ -6264,7 +6264,7 @@ Je n'ai pas envie de lire la docume
+@@ -6416,7 +6416,7 @@ Je n'ai pas envie de lire la docume
<translation type="obsolete">Avertissement !</translation>
</message>
<message>
diff --git a/debian/patches/qt54.patch b/debian/patches/qt54.patch
deleted file mode 100644
index 72cb12c..0000000
--- a/debian/patches/qt54.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix build with Qt < 5.4.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded:
https://bitbucket.org/maproom/qmapshack/pull-requests/96/fix-build-with-qt-54
-Applied-Upstream:
https://bitbucket.org/maproom/qmapshack/commits/0b2cd2dd39cb2564631331ffb9b1c71c66c0c13d
-
---- a/src/setup/CAppSetupMac.cpp
-+++ b/src/setup/CAppSetupMac.cpp
-@@ -92,7 +92,11 @@ QString CAppSetupMac::defaultCachePath()
-
- QString CAppSetupMac::userDataPath(QString subdir)
- {
-+#if QT_VERSION >= 0x050400
- QString dataDir =
QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation).first();
-+#else
-+ QString dataDir =
QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
-+#endif
- return IAppSetup::path(dataDir, subdir, false, 0);
- }
-
-@@ -141,4 +145,4 @@ void CAppSetupMac::migrateDirContent(QSt
- qDebug() << "error migrating directory" << dirSource;
- }
- }
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 034d798..7cc6c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
original-typo.patch
-kfreebsd.patch
-hurd.patch
-qt54.patch
-hicolor-icons.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qmapshack.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
