[grass] 05/08: Drop patches applied upstream.

Bas Couwenberg sebastic at debian.org
Wed Apr 5 06:27:22 UTC 2017 

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

sebastic pushed a commit to branch experimental
in repository grass.

commit 91944d0332a4fdff1d804d26362835f2c31f7c42
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 5 01:30:54 2017 +0200

    Drop patches applied upstream.
---
 debian/changelog                     |  1 +
 debian/patches/hicolor-icons.patch   | 62 ------------------------------------
 debian/patches/series                |  2 --
 debian/patches/spelling-errors.patch | 16 ----------
 4 files changed, 1 insertion(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2595e3..bb30e8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 grass (7.2.1~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
+  * Drop patches applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 05 Apr 2017 01:29:04 +0200
 
diff --git a/debian/patches/hicolor-icons.patch b/debian/patches/hicolor-icons.patch
deleted file mode 100644
index beda61d..0000000
--- a/debian/patches/hicolor-icons.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Fix hicolor icon name.
- grass.desktop uses Icon=grass not Icon=grass71.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3233
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/70166
-
---- a/gui/icons/Makefile
-+++ b/gui/icons/Makefile
-@@ -21,37 +21,37 @@ default: $(ETCICONS) $(HTMLICONS)
- 	$(MKDIR) $(ARCH_DISTDIR)/share/applications
- 	$(INSTALL_DATA) grass.desktop $(ARCH_DISTDIR)/share/applications
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps
--	$(INSTALL_DATA) grass-8x8.png $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps/grass71.png
-+	$(INSTALL_DATA) grass-8x8.png $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps
--	$(INSTALL_DATA) grass-16x16.png $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps/grass71.png
-+	$(INSTALL_DATA) grass-16x16.png $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps
--	$(INSTALL_DATA) grass-22x22.png $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps/grass71.png
-+	$(INSTALL_DATA) grass-22x22.png $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps
--	$(INSTALL_DATA) grass-24x24.png $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps/grass71.png
-+	$(INSTALL_DATA) grass-24x24.png $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps
--	$(INSTALL_DATA) grass-32x32.png $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps/grass71.png
-+	$(INSTALL_DATA) grass-32x32.png $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps
--	$(INSTALL_DATA) grass-36x36.png $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps/grass71.png
-+	$(INSTALL_DATA) grass-36x36.png $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps
--	$(INSTALL_DATA) grass-40x40.png $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps/grass71.png
-+	$(INSTALL_DATA) grass-40x40.png $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps
--	$(INSTALL_DATA) grass-42x42.png $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps/grass71.png
-+	$(INSTALL_DATA) grass-42x42.png $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps
--	$(INSTALL_DATA) grass-48x48.png $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps/grass71.png
-+	$(INSTALL_DATA) grass-48x48.png $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps
--	$(INSTALL_DATA) grass-64x64.png $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps/grass71.png
-+	$(INSTALL_DATA) grass-64x64.png $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps
--	$(INSTALL_DATA) grass-72x72.png $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps/grass71.png
-+	$(INSTALL_DATA) grass-72x72.png $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps
--	$(INSTALL_DATA) grass-80x80.png $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps/grass71.png
-+	$(INSTALL_DATA) grass-80x80.png $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps
--	$(INSTALL_DATA) grass-96x96.png $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps/grass71.png
-+	$(INSTALL_DATA) grass-96x96.png $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps
--	$(INSTALL_DATA) grass-128x128.png $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps/grass71.png
-+	$(INSTALL_DATA) grass-128x128.png $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps
--	$(INSTALL_DATA) grass-192x192.png $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps/grass71.png
-+	$(INSTALL_DATA) grass-192x192.png $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps/grass.png
- 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps
--	$(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass71.svg
-+	$(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass.svg
- 	$(MKDIR) $(ARCH_DISTDIR)/share/appdata
- 	$(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/appdata
- ### disable special 64bit icons (using different icons can be confusing for the user)
diff --git a/debian/patches/series b/debian/patches/series
index 882527c..e8223ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ instdir
 no-fail-html.patch
 appstream.patch
 jquery.patch
-spelling-errors.patch
-hicolor-icons.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 55c5836..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix spelling errors.
- * dependend -> dependent
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/raster/r.texture/r.texture.html
-+++ b/raster/r.texture/r.texture.html
-@@ -39,7 +39,7 @@ classes are small, but classes are disti
- ground, often opposing natural to human-made spaces: cultivated fields vs meadows
- or golf courses, palm tree plantations vs natural rain forest, but texture can
- also be a natural phenomen: dune fields, different canopies due to different
--tree species. The usefulness and use of texture is highly dependend on the 
-+tree species. The usefulness and use of texture is highly dependent on the 
- resolution of satellite imagery and on the scale of the human intervention or 
- the phenomenon that created the texture (also see the discussion of scale 
- dependency below). The user should observe the phenomenon visually in order to

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

More information about the Pkg-grass-devel mailing list