diff --git a/.travis.yml b/.travis.yml index 6d1bf6bd..49516ff1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ cache: env: global: - # Environment variables for + # Environment variables for packaging - PRODUCT=flameshot - VERSION=0.6.0 - RELEASE=1 @@ -33,10 +33,12 @@ matrix: # 28 env: OS=fedora DIST=28 EXTEN=rpm services: docker - - os: linux - # 29 - env: OS=fedora DIST=29 EXTEN=rpm - services: docker + # cups-libs-2.2.8-6 cannot be found, correct is cups-libs-2.2.8-7, + # maybe it was caused by upstream docker images, so disable temporarily. + # - os: linux + # # 29 + # env: OS=fedora DIST=29 EXTEN=rpm + # services: docker - os: linux # 16.04 LTS env: OS=ubuntu DIST=xenial EXTEN=deb diff --git a/debian/rules b/debian/rules index 5888922e..8314b358 100755 --- a/debian/rules +++ b/debian/rules @@ -5,19 +5,23 @@ # see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS #export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic # package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export QT_SELECT := 5 %: dh $@ +override_dh_auto_configure: + # The existence of an empty .git directory triggers syncqt. + mkdir .git || true + dh_auto_configure -- CONFIG+=packaging CONFIG-=debug CONFIG+=release # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 )