refresh patches

3 files changed, 23 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 5361e032..f18bc5bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+helm (2.3.3-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Refresh patches.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 04 Dec 2016 11:19:48 -0700
+
 helm (2.3.2-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0003-decruft-README.patch b/debian/patches/0003-decruft-README.patch
index c8f77397..81284c7a 100644
--- a/debian/patches/0003-decruft-README.patch
+++ b/debian/patches/0003-decruft-README.patch
@@ -8,29 +8,32 @@ Subject: decruft-README
 
 --- a/README.md
 +++ b/README.md
-@@ -1,17 +1,8 @@
+@@ -1,19 +1,11 @@
 -<p><a href="http://www.gnu.org/licenses/gpl-3.0.txt"><img src="https://img.shields.io/badge/license-GPL_3-green.svg" alt="License GPL 3" /></a>
 -<a href="https://melpa.org/#/helm"><img alt="MELPA" src="https://melpa.org/packages/helm-badge.svg"/></a>
 -<a href="https://stable.melpa.org/#/helm"><img alt="MELPA Stable" src="https://stable.melpa.org/packages/helm-badge.svg"/></a></p>
 +Maintainance of Helm is a lot of work that I do freely on my sparse
 +time, please consider donating:
 +<https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=thierry.volpiatto@gmail.com&amp;lc=US&amp;currency_code=EUR&amp;bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted>
-+or or <https://gratipay.com/emacs-helm/>
  
 -<h1>Emacs-helm</h1>
--
++or <https://gratipay.com/emacs-helm/>
+ 
 -<p><img src="https://avatars3.githubusercontent.com/u/1541688?v=3&amp;s=200" alt="Emacs-helm" title="" /></p>
--
++or <https://www.strongcoin.com/?ref=1HyxLfpdJL81rnk2n6dPmbCkaozk4zzPRh>
+ 
 -<p>Maintainance of Helm is a lot of work that I do freely on my sparse time,</p> 
 -<p>please <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=thierry.volpiatto@gmail.com&amp;lc=US&amp;currency_code=EUR&amp;bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" alt="Donate" title="" /></a> to help this project, </p> 
 -or [![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.3.0/dist/gratipay.png)](https://gratipay.com/emacs-helm/)
 -
 -
+-or with [Bitcoins](https://www.strongcoin.com/?ref=1HyxLfpdJL81rnk2n6dPmbCkaozk4zzPRh)
+-
 -<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-generate-toc again -->
  **Table of Contents**
  
  - [Introduction](#introduction)
-@@ -34,8 +25,6 @@ or [![Support via Gratipay](https://cdn.
+@@ -36,8 +28,6 @@ or with [Bitcoins](https://www.strongcoi
  - [Bugs & Improvements](#bugs--improvements)
  - [Getting help](#getting-help)
  
@@ -39,7 +42,7 @@ Subject: decruft-README
  # Introduction
  
  `Helm` is an Emacs framework for incremental completions and narrowing
-@@ -61,98 +50,11 @@ and dired operations in Helm.
+@@ -63,98 +53,11 @@ and dired operations in Helm.
  
  # Getting Started
  
@@ -141,7 +144,7 @@ Subject: decruft-README
  
  The full configuration I (the helm maintainer) use is
  [here](https://github.com/thierryvolpiatto/emacs-tv-config/blob/master/init-helm-thierry.el).
-@@ -200,9 +102,9 @@ To make helm-mode start with Emacs init
+@@ -202,9 +105,9 @@ To make helm-mode start with Emacs init
  To discover helm commands, look at helm menu item in Emacs menu. 
  
  Another way to discover helm commands: run the shell script:
@@ -154,7 +157,7 @@ Subject: decruft-README
  
  ## Advanced usage
  
-@@ -210,7 +112,7 @@ Helm contains many features, some of whi
+@@ -212,7 +115,7 @@ Helm contains many features, some of whi
  visually. Here is a demo of `helm-buffers-list` used with
  `helm-moccur`. Demo starts with `Eval: START` in the minibuffer.
  
@@ -163,7 +166,7 @@ Subject: decruft-README
  
  - Regexp `*C` selects the C buffers. `*Tcl` in the demo selects TCL
    buffers, then with `*C` switches back to C buffers.
-@@ -350,8 +252,8 @@ interacts with many Emacs features, bugs
+@@ -352,8 +255,8 @@ interacts with many Emacs features, bugs
  itself.
  
  One way to ascertain that the bugs are helm-related, recreate the
@@ -174,7 +177,7 @@ Subject: decruft-README
  
  # Getting help
  
-@@ -361,5 +263,3 @@ are two readily available locations.
+@@ -363,5 +266,3 @@ are two readily available locations.
  
  Cheers,<br>
  The Helm Team
diff --git a/debian/patches/0005-remove-async-dependency.patch b/debian/patches/0005-remove-async-dependency.patch
index b7035d7a..728fc9ff 100644
--- a/debian/patches/0005-remove-async-dependency.patch
+++ b/debian/patches/0005-remove-async-dependency.patch
@@ -12,18 +12,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/helm-pkg.el
 +++ b/helm-pkg.el
 @@ -3,7 +3,6 @@
- (define-package "helm" "2.3.2"
+ (define-package "helm" "2.3.3"
    "Helm is an Emacs incremental and narrowing framework"
    '((emacs "24.4")
 -    (async "1.9")
      (popup "0.5.3")
-     (helm-core "2.3.2"))
+     (helm-core "2.3.3"))
    :url "https://emacs-helm.github.io/helm/")
 --- a/helm-core-pkg.el
 +++ b/helm-core-pkg.el
 @@ -2,8 +2,7 @@
  
- (define-package "helm-core" "2.3.2"
+ (define-package "helm-core" "2.3.3"
    "Development files for Helm"
 -  '((emacs "24.4")
 -    (async "1.9"))