diff -Nru blackchocobo-1.9.900/debian/bzr-builder.manifest blackchocobo-1.9.900/debian/bzr-builder.manifest --- blackchocobo-1.9.900/debian/bzr-builder.manifest 2017-11-06 00:32:14.000000000 +0000 +++ blackchocobo-1.9.900/debian/bzr-builder.manifest 2018-03-01 20:31:40.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~1280 -lp:~sithlord48/blackchocobo/trunk revid:git-v1:62fa2b853d450c42a467d0685c818eb58c87ebc4 +# bzr-builder format 0.3 deb-version {debupstream}-0~1281 +lp:~sithlord48/blackchocobo/trunk revid:git-v1:9d948eb17d6b56940817575f4f7a9fd1ba6c3b02 diff -Nru blackchocobo-1.9.900/debian/changelog blackchocobo-1.9.900/debian/changelog --- blackchocobo-1.9.900/debian/changelog 2017-11-06 00:32:14.000000000 +0000 +++ blackchocobo-1.9.900/debian/changelog 2018-03-01 20:31:40.000000000 +0000 @@ -1,13 +1,16 @@ -blackchocobo (1.9.900-0~1280~ubuntu17.10.1) artful; urgency=low +blackchocobo (1.9.900-0~1281~ubuntu17.10.1) artful; urgency=low * Auto build. - -- sithlord48 Mon, 06 Nov 2017 00:32:14 +0000 + -- sithlord48 Thu, 01 Mar 2018 20:31:40 +0000 blackchocobo (1.9.900) trusty; urgency=low - *New: Items Tab now Contains command buttons for keyitems and flyers for easier access. - *New: Advanced modes for different ff7tk widgets can be set indpendently in options. - *New: Apply Button for Replay Missions;Browse the options without changing your data. + *New: Items Tab now Contains command buttons for keyitems and flyers for + easier access. + *New: Advanced modes for different ff7tk widgets can be set indpendently in + options. + *New: Apply Button for Replay Missions;Browse the options without changing + your data. *Fixed: Cloud's Flashback now set Sephiroth's char data for you *Fixed: Snowboard times are now saved / read correctly. *Fixed: Backwards label for turtle paradise / keyItems diff -Nru blackchocobo-1.9.900/debian/compat blackchocobo-1.9.900/debian/compat --- blackchocobo-1.9.900/debian/compat 2017-11-06 00:32:13.000000000 +0000 +++ blackchocobo-1.9.900/debian/compat 2018-03-01 20:31:40.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru blackchocobo-1.9.900/debian/control blackchocobo-1.9.900/debian/control --- blackchocobo-1.9.900/debian/control 2017-11-06 00:32:13.000000000 +0000 +++ blackchocobo-1.9.900/debian/control 2018-03-01 20:31:40.000000000 +0000 @@ -2,14 +2,22 @@ Section: games Priority: extra Maintainer: Chris Rizzitello -Build-Depends: debhelper (>= 7.0.50~),qt5-default,qttools5-dev-tools,cdbs -Standards-Version: 3.9.5 +Build-Depends: + cmake, + debhelper (>= 9.0), + qt5-default, + qttools5-dev-tools, + libssl-dev +Standards-Version: 3.9.7 Homepage: http://blackchocobo.sourceforge.net #Vcs-Git: git://git.debian.org/collab-maint/blackchocobo.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/blackchocobo.git;a=summary Package: blackchocobo Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends} Description: FF7 Savegame Editor - Do lots of stuff w/ final fantasy vii savegame for pc,psx,emulators,psp, or psn versions + Do lots of stuff w/ final fantasy vii savegame for pc,psx,emulators,psp, or psn + versions diff -Nru blackchocobo-1.9.900/debian/docs blackchocobo-1.9.900/debian/docs --- blackchocobo-1.9.900/debian/docs 2017-11-06 00:32:13.000000000 +0000 +++ blackchocobo-1.9.900/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -COPYING.txt diff -Nru blackchocobo-1.9.900/debian/preinst blackchocobo-1.9.900/debian/preinst --- blackchocobo-1.9.900/debian/preinst 2017-11-06 00:32:13.000000000 +0000 +++ blackchocobo-1.9.900/debian/preinst 2018-03-01 20:31:40.000000000 +0000 @@ -1,10 +1,7 @@ -#! /bin/bash +#! /bin/bash -e #DEBHELPER# echo -e "Checking for and removing old install...\c" -if [ -d /usr/bin/blackchocobo ];then #check to see if older version installed. - rm -r /usr/bin/blackchocobo/ - echo "RM:/usr/bin/blackchcobo" -elif [ -d /opt/blackchocobo ];then +if [ -d /opt/blackchocobo ];then rm -r /opt/blackchocobo echo "RM: /opt/blackchocobo" else echo "Not Found" diff -Nru blackchocobo-1.9.900/debian/rules blackchocobo-1.9.900/debian/rules --- blackchocobo-1.9.900/debian/rules 2017-11-06 00:32:13.000000000 +0000 +++ blackchocobo-1.9.900/debian/rules 2018-03-01 20:31:40.000000000 +0000 @@ -1,4 +1,14 @@ #!/usr/bin/make -f +# -*- makefile -*- -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/qmake.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +#DPKG_EXPORT_BUILDFLAGS = 1 +#include /usr/share/dpkg/buildflags.mk + +%: + dh $@ --parallel --buildsystem=cmake + +override_dh_auto_install: + find . -name "COPYING.txt" -delete + dh_auto_install diff -Nru blackchocobo-1.9.900/.travis.yml blackchocobo-1.9.900/.travis.yml --- blackchocobo-1.9.900/.travis.yml 2017-11-06 00:32:13.000000000 +0000 +++ blackchocobo-1.9.900/.travis.yml 2018-03-01 20:31:40.000000000 +0000 @@ -1,33 +1,72 @@ language: cpp -complier: gcc sudo: required dist: trusty +os: + - linux + - osx +matrix: + exclude: +# Only do coverity or coverage build on Linux when the compiler is gcc + - os: linux + compiler: clang + env: COVERITY=1 + env: COVERAGE=1 +# Don't build with clang on Linux + - os: linux + compiler: clang +# Don't build with gcc on OSX + - os: osx + compiler: gcc + before_script: -- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y -- sudo add-apt-repository --yes ppa:beineri/opt-qt591-trusty -y -- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test -- sudo apt-get update -- sudo apt-get -y install build-essential qt5-default qttools5-dev-tools qt59tools qt59base g++-4.8 libssl-dev +- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then + sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; + sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; + sudo add-apt-repository --yes ppa:beineri/opt-qt591-trusty; + sudo apt-get update -qq; + sudo apt-get -y install build-essential qt5-default qt59tools qt59base g++-4.8 libssl-dev zsync; + fi +#MAC OS +- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then + brew update > /dev/null; + brew install qt5; + brew install openssl; + chmod -R 755 /usr/local/opt/qt5/*; + export QTDIR="/usr/local/opt/qt5"; + export PATH="/usr/local/opt/openssl/bin:$PATH"; + export PATH="$QTDIR/bin:$PATH"; + fi script: -- mkdir build_blackchocobo -- cd build_blackchocobo -- qmake "DEFINES+=OPENSSL=1" "LIBS+=-lcrypto" ../Black_Chocobo.pro -- make -j2 -- make INSTALL_ROOT=appdir install; find appdir/ -- mv appdir/usr/share/blackchocobo/lang appdir/usr/bin/lang -- rm -rf appdir/usr/share/blackchocobo -- wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -- chmod a+x linuxdeployqt*.AppImage -- unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH -- ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -- ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage - +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then + source /opt/qt*/bin/qt*-env.sh; + qmake "DEFINES+=OPENSSL=1" "LIBS+=-lcrypto" Black_Chocobo.pro; + make -j2; + make INSTALL_ROOT=appdir install; find appdir/; + mv appdir/usr/share/blackchocobo/lang appdir/usr/bin/lang; + rm -rf appdir/usr/share/blackchocobo appdir/usr/share/menu; + wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"; + chmod a+x linuxdeployqt*.AppImage; + unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH; + ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs; + ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage; + fi +- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then + export LIBRARY_PATH=/usr/local/opt/openssl/lib; + qmake "DEFINES+=OPENSSL=1" "LIBS+=-lcrypto" "INCLUDEPATH+=/usr/local/opt/openssl/include" qmake Black_Chocobo.pro; + make -j2; + mkdir -p Black_Chocobo.app/Contents/MacOS/lang; + mv lang/*.qm Black_Chocobo.app/Contents/MacOS/lang/; + macdeployqt Black_Chocobo.app/ -dmg; + fi after_success: -- find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh -- bash ./upload.sh ./Black_Chocobo*.AppImage* +- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then + find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ; + bash ./upload.sh Black_Chocobo*.AppImage*; + fi +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then bash ./upload.sh Black_Chocobo*.dmg*; fi env: global: @@ -40,7 +79,7 @@ project: name: "sithlord48/blackchocobo" description: "Final Fantasy VII Save Editor" - notification_email: sithlord48@gmail.com + notication_email: sithlord48@gmail.com build_command_prepend: "qmake Black_Chocobo.pro" build_command: "make -j 4" branch_pattern: coverity_scan