[mgrs] 06/08: Drop patches, applied upstream.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Aug 7 08:07:17 UTC 2015


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

sebastic pushed a commit to branch master
in repository mgrs.

commit 02c0e493640e732e2e1513f12c9cceb33c776595
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 7 09:46:18 2015 +0200

    Drop patches, applied upstream.
---
 debian/changelog                               |  1 +
 debian/patches/0001-Correct-license-typo.patch | 30 --------------------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e24c534..076157d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mgrs (0.0.3-1) UNRELEASED; urgency=medium
 
   * Fix unrecognised option in watchfile.
   * New upstream release.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 07 Aug 2015 09:45:24 +0200
 
diff --git a/debian/patches/0001-Correct-license-typo.patch b/debian/patches/0001-Correct-license-typo.patch
deleted file mode 100644
index fbb050b..0000000
--- a/debian/patches/0001-Correct-license-typo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e73c0f243df4cf2273e2ce9b9a59f4925fcabf9b Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic at xs4all.nl>
-Date: Thu, 26 Feb 2015 19:17:06 +0100
-Subject: Correct 'license' typo
-Origin: https://github.com/sebastic/mgrs/commit/e73c0f243df4cf2273e2ce9b9a59f4925fcabf9b
-Bug: https://github.com/proj4js/mgrs/pull/7
-Applied-Upstream: https://github.com/proj4js/mgrs/commit/b3d361d28e6aeb150f9fd57b5336b4062d671d9f
-
-Fix two typos in the license exception section.
----
- readme.md |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/readme.md
-+++ b/readme.md
-@@ -34,11 +34,11 @@ npm run build
- ```
- 
- 
--Lisensed under the MIT linsense except:
-+Licensed under the MIT license except:
- 
- Portions of this software are based on a port of components from the OpenMap
- com.bbn.openmap.proj.coords Java package. An initial port was initially created
- by Patrice G. Cappelaere and included in Community Mapbuilder
- (http://svn.codehaus.org/mapbuilder/), which is licensed under the LGPL license
- as per http://www.gnu.org/copyleft/lesser.html. OpenMap is licensed under the
--[following license agreement](openmap.md):
-\ No newline at end of file
-+[following license agreement](openmap.md):
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b53dbc1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Correct-license-typo.patch

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



More information about the Pkg-grass-devel mailing list