BAMF

Merge lp:~mterry/bamf/c4 into lp:bamf/0.4

  1. c4
  2. Merge into 0.4
Proposed by Michael Terry on 2012-11-14
Status: Merged
Approved by: Didier Roche on 2012-11-15
Approved revision: 499
Merged at revision: 499
Proposed branch: lp:~mterry/bamf/c4
Merge into: lp:bamf/0.4
Prerequisite: lp:~didrocks/bamf/dailybootstrap
Diff against target: 48 lines (+5/-1)
4 files modified
debian/changelog (+2/-1)
debian/libbamf0.symbols (+1/-0)
debian/libbamf3-0.symbols (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~mterry/bamf/c4
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2012-11-15
Marco Trevisan (Treviño) 2012-11-14 Approve on 2012-11-14
Review via email: mp+134313@code.launchpad.net

This proposal supersedes a proposal from 2012-11-14.

Commit Message

Use -c4 for dpkg-gensymbols to catch when we add or remove symbols from the library.

Description of the Change

Use -c4 for dpkg-gensymbols to catch when we add or remove symbols from the library. And add a couple symbols that were not added to the .symbols file before. (Had to bump version to put a valid version next to the symbols.)

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote : Posted in a previous version of this proposal

Thanks... I have just pushed a branch to bump version to 0.4, I'll merge it with this.

review: Approve
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-14 15:26:26 +0000
3+++ debian/changelog 2012-11-14 15:26:26 +0000
4@@ -1,6 +1,7 @@
5-bamf (0.3.4-0ubuntu2) UNRELEASED; urgency=low
6+bamf (0.3.5-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Michael Terry ]
9+ * New upstream release
10 * debian/control:
11 - Update Bzr-Vcs
12 - Build-Depend on dh-autoreconf
13
14=== modified file 'debian/libbamf0.symbols'
15--- debian/libbamf0.symbols 2012-08-30 13:42:01 +0000
16+++ debian/libbamf0.symbols 2012-11-14 15:26:26 +0000
17@@ -63,6 +63,7 @@
18 bamf_view_is_running@Base 0.2.20
19 bamf_view_is_sticky@Base 0.2.60
20 bamf_view_is_urgent@Base 0.2.20
21+ bamf_view_is_user_visible@Base 0.3.5
22 bamf_view_set_sticky@Base 0.2.60
23 bamf_view_user_visible@Base 0.2.20
24 bamf_window_get_monitor@Base 0.2.108
25
26=== modified file 'debian/libbamf3-0.symbols'
27--- debian/libbamf3-0.symbols 2012-08-31 19:54:23 +0000
28+++ debian/libbamf3-0.symbols 2012-11-14 15:26:26 +0000
29@@ -63,6 +63,7 @@
30 bamf_view_is_running@Base 0.2.20
31 bamf_view_is_sticky@Base 0.2.60
32 bamf_view_is_urgent@Base 0.2.20
33+ bamf_view_is_user_visible@Base 0.3.5
34 bamf_view_set_sticky@Base 0.2.60
35 bamf_view_user_visible@Base 0.2.20
36 bamf_window_get_monitor@Base 0.2.108
37
38=== modified file 'debian/rules'
39--- debian/rules 2012-11-07 19:51:56 +0000
40+++ debian/rules 2012-11-14 15:26:26 +0000
41@@ -2,6 +2,7 @@
42 # -*- Mode: Makefile; indent-tabs-mode: t -*-
43
44 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
45+export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
46
47 %:
48 dh $@ --with autoreconf

Subscribers

People subscribed via source and target branches