Skip to content

Commit e52dc8d

Browse files
holaztlupoDharkael
authored andcommitted
fix debian rules (flameshot-org#419)
* fix debian rules * remove fedora 27 building * change for code review * rollback
1 parent 665f309 commit e52dc8d

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.travis.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cache:
1313

1414
env:
1515
global:
16-
# Environment variables for
16+
# Environment variables for packaging
1717
- PRODUCT=flameshot
1818
- VERSION=0.6.0
1919
- RELEASE=1
@@ -33,10 +33,12 @@ matrix:
3333
# 28
3434
env: OS=fedora DIST=28 EXTEN=rpm
3535
services: docker
36-
- os: linux
37-
# 29
38-
env: OS=fedora DIST=29 EXTEN=rpm
39-
services: docker
36+
# cups-libs-2.2.8-6 cannot be found, correct is cups-libs-2.2.8-7,
37+
# maybe it was caused by upstream docker images, so disable temporarily.
38+
# - os: linux
39+
# # 29
40+
# env: OS=fedora DIST=29 EXTEN=rpm
41+
# services: docker
4042
- os: linux
4143
# 16.04 LTS
4244
env: OS=ubuntu DIST=xenial EXTEN=deb

debian/rules

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,23 @@
55

66

77
# see FEATURE AREAS in dpkg-buildflags(1)
8-
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
8+
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
99

1010
# see ENVIRONMENT in dpkg-buildflags(1)
1111
# package maintainers to append CFLAGS
1212
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
1313
# package maintainers to append LDFLAGS
14-
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
14+
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
1515

1616
export QT_SELECT := 5
1717

1818
%:
1919
dh $@
2020

21+
override_dh_auto_configure:
22+
# The existence of an empty .git directory triggers syncqt.
23+
mkdir .git || true
24+
dh_auto_configure -- CONFIG+=packaging CONFIG-=debug CONFIG+=release
2125

2226
# dh_make generated override targets
2327
# This is example for Cmake (See https://bugs.debian.org/641051 )

0 commit comments

Comments
 (0)