[qmapshack] 04/05: Drop patches, applied upstream.

Bas Couwenberg sebastic at debian.org
Sun May 14 11:46:17 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qmapshack.

commit b7b5071cc24398594defe87c36dc2b01beebdcfa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 14 13:23:47 2017 +0200

    Drop patches, applied upstream.
---
 debian/changelog                |  1 +
 debian/patches/desktop-ru.patch | 12 ------------
 debian/patches/quazip.patch     | 16 ----------------
 debian/patches/series           |  2 --
 4 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02f781e..9117549 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qmapshack (1.8.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 14 May 2017 13:20:44 +0200
 
diff --git a/debian/patches/desktop-ru.patch b/debian/patches/desktop-ru.patch
deleted file mode 100644
index ac77728..0000000
--- a/debian/patches/desktop-ru.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Fix Russian desktop file translation.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/src/locale/qmapshack_ru.desktop
-+++ b/src/locale/qmapshack_ru.desktop
-@@ -1,3 +1,3 @@
- #Translations
--Name[de]=QMapShack
--GenericName[de]= Администрация GPS данных и карт
-\ No newline at end of file
-+Name[ru]=QMapShack
-+GenericName[ru]= Администрация GPS данных и карт
diff --git a/debian/patches/quazip.patch b/debian/patches/quazip.patch
deleted file mode 100644
index 08a917f..0000000
--- a/debian/patches/quazip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Add search paths for quazip headers.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/cmake/Modules/FindQuaZip.cmake
-+++ b/cmake/Modules/FindQuaZip.cmake
-@@ -29,6 +29,10 @@ else (QUAZIP_LIBRARIES AND QUAZIP_INCLUD
-             /usr/local/include/quazip5
-             /opt/local/include/quazip5
-             /sw/include/quazip5
-+            /usr/include/quazip
-+            /usr/local/include/quazip
-+            /opt/local/include/quazip
-+            /sw/include/quazip
-             ${CMAKE_INSTALL_PREFIX}/include
-             ${QUAZIP_DEV_PATH}/include/
-     )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bfcca1f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-quazip.patch
-desktop-ru.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git



More information about the Pkg-grass-devel mailing list