[Pkg-privacy-commits] [onionshare] 01/08: Merge remote-tracking branch 'origin/debian' into jessie-backports

Intrigeri intrigeri at moszumanska.debian.org
Wed Dec 7 14:16:55 UTC 2016


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

intrigeri pushed a commit to branch jessie-backports
in repository onionshare.

commit 1bbef45c314e15bd2269a9fb2441f570f83a6fca
Merge: f438985 23b9dce
Author: anonym <anonym at riseup.net>
Date:   Thu Nov 24 16:48:53 2016 +0100

    Merge remote-tracking branch 'origin/debian' into jessie-backports

 .gitignore                                      |    1 +
 .travis.yml                                     |   13 +-
 BUILD.md                                        |   92 +-
 CHANGELOG.md                                    |   23 +
 LICENSE                                         |    2 +-
 MANIFEST.in                                     |   11 +-
 README.md                                       |   21 +-
 SECURITY.md                                     |    8 +-
 debian/README.source                            |   16 +
 debian/changelog                                |   27 +
 debian/control                                  |    8 +-
 debian/rules                                    |    7 +-
 install/Info.plist                              |   18 +
 install/build_deb.sh                            |    4 +-
 install/build_exe.bat                           |   10 +-
 install/build_osx.sh                            |   41 +-
 install/build_rpm.sh                            |    6 +-
 install/linux_scripts/onionshare-gui            |   29 -
 install/onionshare-launcher.py                  |   30 -
 install/onionshare-win.spec                     |   45 -
 install/onionshare.appdata.xml                  |    3 +-
 install/onionshare.desktop                      |    2 +-
 install/onionshare.nsi                          |  310 +-
 install/osx_scripts/onionshare                  |   30 -
 install/ppa_release.sh                          |    4 +-
 install/prepare_for_codesign.py                 |   36 -
 install/{linux_scripts => scripts}/onionshare   |   13 +-
 install/{osx_scripts => scripts}/onionshare-gui |    3 +-
 install/scripts/onionshare-nautilus.py          |   46 +
 locale/it.json                                  |   11 -
 locale/tr.json                                  |   12 -
 onionshare/__init__.py                          |    4 +-
 onionshare/helpers.py                           |  128 +-
 onionshare/{hs.py => onion.py}                  |   98 +-
 onionshare/onionshare.py                        |   77 +-
 onionshare/strings.py                           |   23 +-
 onionshare/web.py                               |  153 +-
 onionshare_gui/__init__.py                      |    4 +-
 onionshare_gui/common.py                        |   49 -
 onionshare_gui/downloads.py                     |   99 +-
 onionshare_gui/file_selection.py                |   47 +-
 onionshare_gui/onionshare_gui.py                |  166 +-
 onionshare_gui/options.py                       |   12 +-
 onionshare_gui/server_status.py                 |   48 +-
 {onionshare => resources/html}/404.html         |    0
 resources/html/denied.html                      |   18 +
 {onionshare => resources/html}/index.html       |    2 +-
 {images => resources/images}/drop_files.png     |  Bin
 {images => resources/images}/logo.png           |  Bin
 {images => resources/images}/server_started.png |  Bin
 {images => resources/images}/server_stopped.png |  Bin
 {images => resources/images}/server_working.png |  Bin
 {install => resources}/license.txt              | 1353 +++--
 {locale => resources/locale}/cs.json            |   18 +-
 {locale => resources/locale}/de.json            |    4 +-
 {locale => resources/locale}/en.json            |   24 +-
 {locale => resources/locale}/eo.json            |   12 +-
 {locale => resources/locale}/es.json            |    6 +-
 {locale => resources/locale}/fi.json            |    0
 {locale => resources/locale}/fr.json            |    6 +-
 resources/locale/it.json                        |   45 +
 {locale => resources/locale}/nl.json            |   10 +-
 {locale => resources/locale}/no.json            |    0
 {locale => resources/locale}/pt.json            |    0
 {locale => resources/locale}/ru.json            |    0
 resources/locale/tr.json                        |   45 +
 resources/version.txt                           |    1 +
 resources/wordlist.txt                          | 6800 +++++++++++++++++++++++
 screenshots/appdata-client.png                  |  Bin 63246 -> 87558 bytes
 screenshots/appdata-server.png                  |  Bin 114551 -> 107845 bytes
 screenshots/client.png                          |  Bin 61687 -> 90359 bytes
 screenshots/server.png                          |  Bin 37632 -> 65065 bytes
 setup.py                                        |  180 +-
 stdeb.cfg                                       |   10 +-
 test/onionshare_helpers_test.py                 |    6 +-
 test/onionshare_strings_test.py                 |   17 +-
 test/onionshare_test.py                         |    3 +-
 test/onionshare_web_test.py                     |   35 -
 test/test_helpers.py                            |    7 +-
 version                                         |    1 -
 80 files changed, 8664 insertions(+), 1729 deletions(-)

diff --cc debian/changelog
index 98b444e,80aabf0..31351df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,30 +1,49 @@@
+ onionshare (0.9.1-1) unstable; urgency=medium
+ 
+   * New upstream version.
+   * debian/README.source:
+     * Add build instructions.
+   * debian/patches:
+     * Drop obsolete patches.
+   * debian/rules:
+     Add env vars so that pybuild can find nosetests.
+ 
+   [ Ximin Luo ]
+   * Update to latest Standards-Version; no changes required.
+ 
+  -- Ulrike Uhlig <u at 451f.org>  Thu, 08 Sep 2016 10:45:05 +0200
+ 
+ onionshare (0.9-1) UNRELEASED; urgency=medium
+ 
+   * New upstream version.
+   * debian/control:
+     * Bump to new standards version.
+     * Update Depends: for Python3 and Qt5.
+     * Update Build-Depends: for Python3 and Qt5.
+   * debian/rules:
+     * Update build system to pybuild.
+ 
+  -- Ulrike Uhlig <u at 451f.org>  Sun, 17 Apr 2016 20:54:05 +0200
+ 
 +onionshare (0.8.1-2~bpo8+1) jessie-backports; urgency=high
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Ulrike Uhlig <u at 451f.org>  Mon, 30 May 2016 12:33:19 +0200
 +
 +onionshare (0.8.1-2) unstable; urgency=high
 +
 +  * debian/patches:
 +    * Add patch by M. Scherer to fix CVE-2016-5026.
 +
 + -- Ulrike Uhlig <u at 451f.org>  Thu, 26 May 2016 22:53:09 +0200
 +
 +onionshare (0.8.1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Ulrike Uhlig <u at 451f.org>  Mon, 07 Mar 2016 14:52:14 +0100
 +
  onionshare (0.8.1-1) unstable; urgency=medium
  
    * Team upload.

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



More information about the Pkg-privacy-commits mailing list