summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas D Steeves <nsteeves@gmail.com>2018-05-26 21:54:36 -0400
committerNicholas D Steeves <nsteeves@gmail.com>2018-05-26 21:54:36 -0400
commit5f0b69b875fad4b6bb3342a0bb1e97527d765183 (patch)
treea0a615ad5ff6ffbd5adaf8caa998981a95d95ab5
parent6755ef3aefe61b3a6d32f8a1fc2111e770258617 (diff)
Drop patches merged upstream:
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/0001-Correct-Version-and-Last-Updated-date.patch25
-rw-r--r--debian/patches/0002-Remove-executable-bit-from-README.org-and-writegood-.patch19
-rw-r--r--debian/patches/series2
4 files changed, 6 insertions, 48 deletions
diff --git a/debian/changelog b/debian/changelog
index c467b20..19e4988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-writegood-mode (2.0.2-3) UNRELEASED; urgency=medium
+writegood-mode (2.0.3-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Add Applied-Upstream links to patches.
* Lower case short description.
* Declare compat level 11.
@@ -8,8 +9,11 @@ writegood-mode (2.0.2-3) UNRELEASED; urgency=medium
* Declare Standards-Version: 4.1.4. (No additional changes needed).
* Switch Vcs from alioth to salsa.
* Update Maintainer team name and email address.
+ * Drop patches merged upstream:
+ - 0001-Correct-Version-and-Last-Updated-date.patch
+ - 0002-Remove-executable-bit-from-README.org-and-writegood-.patch
- -- Nicholas D Steeves <nsteeves@gmail.com> Thu, 12 Apr 2018 19:26:28 -0400
+ -- Nicholas D Steeves <nsteeves@gmail.com> Sat, 26 May 2018 21:55:02 -0400
writegood-mode (2.0.2-2) unstable; urgency=medium
diff --git a/debian/patches/0001-Correct-Version-and-Last-Updated-date.patch b/debian/patches/0001-Correct-Version-and-Last-Updated-date.patch
deleted file mode 100644
index 6b4df67..0000000
--- a/debian/patches/0001-Correct-Version-and-Last-Updated-date.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Nicholas D Steeves <nsteeves@gmail.com>
-Date: Tue, 25 Apr 2017 09:16:21 -0400
-Subject: Fix headers to use correct Version and Last-Updated date
-Forwarded: https://github.com/bnbeckwith/writegood-mode/pull/18
-Applied-Upstream: https://github.com/bnbeckwith/writegood-mode/commit/572fcbeab0b2892dd7e3e716b7de3cae728757e8
-
----
- writegood-mode.el | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: writegood-mode/writegood-mode.el
-===================================================================
---- writegood-mode.orig/writegood-mode.el
-+++ writegood-mode/writegood-mode.el
-@@ -2,8 +2,8 @@
- ;;
- ;; Author: Benjamin Beckwith
- ;; Created: 2010-8-12
--;; Version: 2.1
--;; Last-Updated: 2014-2-13
-+;; Version: 2.0
-+;; Last-Updated: 2015-03-25
- ;; URL: http://github.com/bnbeckwith/writegood-mode
- ;; Keywords: writing weasel-words grammar
- ;; Compatability:
diff --git a/debian/patches/0002-Remove-executable-bit-from-README.org-and-writegood-.patch b/debian/patches/0002-Remove-executable-bit-from-README.org-and-writegood-.patch
deleted file mode 100644
index 9c8249b..0000000
--- a/debian/patches/0002-Remove-executable-bit-from-README.org-and-writegood-.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Nicholas D Steeves <nsteeves@gmail.com>
-Date: Sun, 24 Sep 2017 13:22:33 -0400
-Subject: Remove executable bit from README.org and writegood-mode.el
-Forwarded: https://github.com/bnbeckwith/writegood-mode/pull/18
-Applied-Upstream: https://github.com/bnbeckwith/writegood-mode/commit/d42e8f5500400cedcfd9ab75db7a175165e2f47c
-
----
- README.org | 0
- writegood-mode.el | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- mode change 100755 => 100644 README.org
- mode change 100755 => 100644 writegood-mode.el
-
-diff --git a/README.org b/README.org
-old mode 100755
-new mode 100644
-diff --git a/writegood-mode.el b/writegood-mode.el
-old mode 100755
-new mode 100644
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eefe807..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Correct-Version-and-Last-Updated-date.patch
-0002-Remove-executable-bit-from-README.org-and-writegood-.patch