[Pkg-bitcoin-commits] [electrum] 05/05: Merge divergent branches due to me forgetting to push.

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository electrum.

commit 1c5961ae0c45d91c3e70cd076f6d7109a36309e1
Merge: 7482a23 e89bf72
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Wed Jan 15 01:07:40 2014 +0200

    Merge divergent branches due to me forgetting to push.

 debian/README.source                                    | 11 +++++++++++
 debian/changelog                                        | 17 +++++++++++++++--
 debian/control                                          |  5 +++--
 debian/{control => control.in}                          | 16 ++++------------
 ...ocal_share.patch => 2002_dont_use_local_share.patch} |  6 ++----
 debian/patches/README                                   |  3 +++
 debian/patches/series                                   |  2 +-
 debian/rules                                            | 15 +++++++++++++++
 8 files changed, 54 insertions(+), 21 deletions(-)

diff --cc debian/changelog
index 90310f8,e594f74..abee137
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,24 +1,29 @@@
++electrum (1.9.5-2) UNRELEASED; urgency=medium
++
++  [ Vasudev Kamath ]
++  * Add Tristan Seligmann as uploader in debian/control.in
++  * Build-Depends added to debian/control moved to debian/rules for clean
++    regeneration of control using CDBS.
++  * Rename dont_use_local_share.patch to follow patch naming micro
++    guidelines as defined in debian/patches/README.
++  * Clean up patch headers of dont_use_local_share.patch
++  * Add README.source describing some CDBS conventions used in the package.
++
++ -- Tristan Seligmann <mithrandi at debian.org>  Wed, 15 Jan 2014 01:05:47 +0200
++
  electrum (1.9.5-1) unstable; urgency=low
  
+   [ Tristan Seligmann ]
    * New upstream release (closes: #730353).
      - Contacts bugfix included in 1.8.1 (closes: #727232).
+   * Add myself to Uploaders.
    * Acknowledge NMU.
    * Update watch file.
-   * Add myself to Uploaders.
    * Update mk18n.py patch and ship new translations file.
    * Bump dependency on python-ecdsa for secp256k1.
 +  * Remove deprecated CDBS dependency management.
  
 -  [ Vasudev Kamath ]
 -  * Add Tristan Seligmann as uploader in debian/control.in
 -  * Build-Depends added to debian/control moved to debian/rules for clean
 -    regeneration of control using CDBS.
 -  * Rename dont_use_local_share.patch to follow patch naming micro
 -    guidelines as defined in debian/patches/README.
 -  * Clean up patch headers of dont_use_local_share.patch
 -  * Add README.source describing some CDBS conventions used in the package.
 -
 - -- Vasudev Kamath <kamathvasudev at gmail.com>  Sat, 11 Jan 2014 22:27:26 +0530
 + -- Tristan Seligmann <mithrandi at debian.org>  Wed, 11 Dec 2013 11:52:51 +0200
  
  electrum (1.8-1.1) unstable; urgency=low
  

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