Merge branch 'master' into real-lbryum

.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}

.travis.yml

@@ -14,6 +14,10 @@ matrix:
           language: generic
           osx_image: xcode7.3
 
+notifications:
+  slack:
+    secure: "fAvSDLBZ04nu5sDumJSlQdUkCAE45QpbxCP97M1IUljRKpYk+JrbKi760oZz80Lz0SVNOZHiafN0EA6BE94Lg292cxhTLP8TbVkScTEHeliwqHFnH9vHvrM5ftdMrwNAx0VojlyMO0HzfQBoO2uPbffmuFD8gFdSKmhJQ58E5JD4KvLsdtQCxr3dzoBHXxOpozQKBMsTxV0oqCLT4x7GY+9R0iXB3WMSjxP5bHFxTDIP7l0DvixoftAwWeNOcct/Bfbw1ny221C31hiRq1DN0XO34+EtOoTP7BFFHWX1P3v5CiGnA9oxl/7YERAG9admzSECIICh+MPADll1qEkEwqcqpjfT87sv6wxKfVebIZCX2HLe1aNFplgNoZo3LszAJ23dhVo/8M+xUApmbYR7n7JksO2pPQYWF1mGhq8MEPhJk0JAnCNbeS1Tm1pHrFJh6Vm+bvD92BrrfaZBWi9bIRhFxLQ9SCvqy376/l42GMU41+uDvivXWYWZCm1UR4ibeY5QFUt5nOnd9nB+GDNJt9TkWBXwtvfrKKa9q48CUMKZgUOsLD5lfkENDslWwtGAnGkP1WPDRnimEAeIj3q4dQtJjOE8ZErzTWuDTRj57tdCrMOfR41HPgbeLwSAANUZm8p5Uom79LZi1JoOIlE87K4mYPs45Tz0GlEi+HYSos0="
+
 cache:
   directories:
     - $HOME/.cache/pip

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

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