Merge lp:~boiko/history-service/no_build_type_override into lp:history-service

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 201
Merged at revision: 208
Proposed branch: lp:~boiko/history-service/no_build_type_override
Merge into: lp:history-service
Diff against target: 19 lines (+0/-10)
1 file modified
debian/rules (+0/-10)
To merge this branch: bzr merge lp:~boiko/history-service/no_build_type_override
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+269315@code.launchpad.net

Commit message

Do not override the build type.
Also remove a block of unused code from debian/rules.

Description of the change

Do not override the build type.
Also remove a block of unused code from debian/rules.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
201. By Gustavo Pichorim Boiko

Merge trunk.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

Looks good. thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/rules'
--- debian/rules 2014-04-03 19:30:39 +0000
+++ debian/rules 2015-08-28 10:15:05 +0000
@@ -10,15 +10,5 @@
10%:10%:
11 dh $@ --parallel --with translations11 dh $@ --parallel --with translations
1212
13override_dh_auto_configure:
14 dh_auto_configure -- -DCMAKE_BUILD_TYPE=Debug
15
16override_dh_auto_test:13override_dh_auto_test:
17 CTEST_OUTPUT_ON_FAILURE=1 make -C obj-$(DEB_HOST_GNU_TYPE) test14 CTEST_OUTPUT_ON_FAILURE=1 make -C obj-$(DEB_HOST_GNU_TYPE) test
18
19#override_dh_translations:
20 # Override dh_translations to work around http://pad.lv/1183262.
21 # Unfortunately, the default build directory is not exposed
22 # (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774).
23 #$(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) history-service.pot
24

Subscribers

People subscribed via source and target branches