From 00b1881f20af3424ab0c28a6ad46622d8f451395 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 6 Jul 2016 22:56:10 -0400 Subject: [PATCH 1/4] dont forget to run `bumpversion` instead of manually bumping --- .bumpversion.cfg | 2 +- packaging/ubuntu/lbry.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 59949225b..9bfee007a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.4 +current_version = 0.3.5 commit = True tag = True message = Bump version: {current_version} -> {new_version} diff --git a/packaging/ubuntu/lbry.desktop b/packaging/ubuntu/lbry.desktop index e918c529f..e2428fdee 100644 --- a/packaging/ubuntu/lbry.desktop +++ b/packaging/ubuntu/lbry.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=0.3.4 +Version=0.3.5 Name=LBRY Comment=The world's first user-owned content marketplace Icon=lbry From 5368c9139970828c6b08861571e0623338613003 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Thu, 7 Jul 2016 00:18:29 -0400 Subject: [PATCH 2/4] lbry replaces old lbrynet --- packaging/ubuntu/ubuntu_package_setup.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/ubuntu/ubuntu_package_setup.sh b/packaging/ubuntu/ubuntu_package_setup.sh index 59d9ecfc7..9d74901e8 100755 --- a/packaging/ubuntu/ubuntu_package_setup.sh +++ b/packaging/ubuntu/ubuntu_package_setup.sh @@ -180,6 +180,8 @@ cat "$PACKAGING_DIR/postinst_append" >> control/postinst # change package name from lbrynet to lbry sed -i 's/^Package: lbrynet/Package: lbry/' control/control +echo "Conflicts: lbrynet (<< 0.3.5)" >> control/control +echo "Replaces: lbrynet (<< 0.3.5)" >> control/control # repackage .deb $SUDO chown -R root:root control data From 4caee284bc079be0d302c3f48e54ba05c1c6ae38 Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Thu, 7 Jul 2016 12:06:07 -0500 Subject: [PATCH 3/4] add slack notifications to travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4032ac442..3f6107a7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,9 @@ matrix: language: generic osx_image: xcode7.3 +notifications: + slack: lbry:8biSXNd1yr9jJ76zyI5KhWZv + cache: directories: - $HOME/.cache/pip From dfc0ca9525303e720a06dd7c0a8485ae88364eda Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Mon, 11 Jul 2016 12:05:27 -0500 Subject: [PATCH 4/4] change slack key and encrypt it --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f6107a7d..ab972c6bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,8 @@ matrix: osx_image: xcode7.3 notifications: - slack: lbry:8biSXNd1yr9jJ76zyI5KhWZv + slack: + secure: "fAvSDLBZ04nu5sDumJSlQdUkCAE45QpbxCP97M1IUljRKpYk+JrbKi760oZz80Lz0SVNOZHiafN0EA6BE94Lg292cxhTLP8TbVkScTEHeliwqHFnH9vHvrM5ftdMrwNAx0VojlyMO0HzfQBoO2uPbffmuFD8gFdSKmhJQ58E5JD4KvLsdtQCxr3dzoBHXxOpozQKBMsTxV0oqCLT4x7GY+9R0iXB3WMSjxP5bHFxTDIP7l0DvixoftAwWeNOcct/Bfbw1ny221C31hiRq1DN0XO34+EtOoTP7BFFHWX1P3v5CiGnA9oxl/7YERAG9admzSECIICh+MPADll1qEkEwqcqpjfT87sv6wxKfVebIZCX2HLe1aNFplgNoZo3LszAJ23dhVo/8M+xUApmbYR7n7JksO2pPQYWF1mGhq8MEPhJk0JAnCNbeS1Tm1pHrFJh6Vm+bvD92BrrfaZBWi9bIRhFxLQ9SCvqy376/l42GMU41+uDvivXWYWZCm1UR4ibeY5QFUt5nOnd9nB+GDNJt9TkWBXwtvfrKKa9q48CUMKZgUOsLD5lfkENDslWwtGAnGkP1WPDRnimEAeIj3q4dQtJjOE8ZErzTWuDTRj57tdCrMOfR41HPgbeLwSAANUZm8p5Uom79LZi1JoOIlE87K4mYPs45Tz0GlEi+HYSos0=" cache: directories: