[Pkg-privacy-commits] [tails-installer] 02/02: Merge branch 'tails/jessie' into debian/sid

[Ulrike Uhlig]

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

ulrike pushed a commit to branch debian/sid
in repository tails-installer.

commit 6eb5112a299d39ad587c0652428602486712d5f9
Merge: e03bd67 2435afc
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu May 25 12:14:25 2017 +0200

    Merge branch 'tails/jessie' into debian/sid
    
    Conflicts:
    	debian/changelog

 data/tails-installer.appdata.xml | 33 ++++++++++++++++++++++++++++
 debian/changelog                 | 36 ++++++++++++++++++++++++++++++
 debian/patches/10731.patch       | 47 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 po/es_AR.po                      | 19 ++++++++--------
 po/fa.po                         | 11 +++++-----
 po/pt.po                         | 11 +++++-----
 po/sv.po                         | 17 ++++++++-------
 setup.py                         |  1 +
 9 files changed, 148 insertions(+), 28 deletions(-)

diff --cc debian/changelog
index 4b12057,2b91421..96cbf06
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,39 +1,47 @@@
+ tails-installer (4.4.14+dfsg-0tails2) bugfix-10731-lists-non-removable-devices; urgency=medium
+ 
+   [ kurono ]
+   * Don't allow attempting to install on non-removable USB sticks
+     (Closes: #10731).
+ 
+  -- intrigeri <intrigeri at boum.org>  Wed, 24 May 2017 15:12:34 +0000
+ 
+ tails-installer (4.4.14+dfsg-0tails1) feature-stretch; urgency=medium
+ 
+   [ Ulrike Uhlig ]
+   * Debian packaging Git repository now lives on Alioth.
+   * Bump standards version.
+ 
+   [ Muri Nicanor ]
+   * Added an AppStream metadata file
+   * Add the AppStream metadata file to the files to be installed on linux
+ 
+   [ sajolida ]
+   * Use our usual copyright line
+   * Copy description from Debian package
+   * Fix typo
+   * If this is meant for users, then the general Tails homepage makes more sense
+   * This is an optional contact address for distributors (and not users)
+   * Use our usual name
+ 
+   [ intrigeri ]
+   * AppStream metadata: drop project_group tag with invalid value.
+   * AppStream metadata: reformat description to make `appstream-util validate' happy.
+   * AppStream metadata: add <translation> tag.
+ 
+   [ anonym ]
+   * Import PO files from Transifex, update POT and PO files.
+ 
+  -- anonym <anonym at riseup.net>  Sat, 20 May 2017 10:52:25 +0200
+ 
 +tails-installer (4.4.13+dfsg-1) unstable; urgency=medium
 +
 +  * New upstream version.
 +   - Remove obsolete extlinux code (Closes: #813537).
 +   - debian/control: Add udisks2 as a dependency (Closes: #813539).
 +
 + -- Ulrike Uhlig <u at 451f.org>  Wed, 19 Apr 2017 16:45:43 +0200
 +
  tails-installer (4.4.13+dfsg-0tails1) testing; urgency=medium
  
    * Import PO files from Transifex, update POT and PO files.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git