Merge lp:~robert-ancell/libunity/update-deprecation-tags into lp:libunity

Proposed by Robert Ancell
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 331
Merged at revision: 333
Proposed branch: lp:~robert-ancell/libunity/update-deprecation-tags
Merge into: lp:libunity
Diff against target: 38 lines (+3/-3)
3 files modified
configure.ac (+1/-1)
debian/control (+1/-1)
src/unity-appinfo-manager.vala (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/libunity/update-deprecation-tags
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+353363@code.launchpad.net

Commit message

Update deprecated tag to recent format

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

LGTM

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

I guess we also need a followup branch fixing dependency on valac, right?

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Updated branch to bump version in debian/control.

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2018-02-07 12:29:29 +0000
+++ configure.ac 2019-02-03 22:37:00 +0000
@@ -63,7 +63,7 @@
63AM_PROG_CC_STDC63AM_PROG_CC_STDC
64AC_HEADER_STDC64AC_HEADER_STDC
65AM_PROG_LIBTOOL65AM_PROG_LIBTOOL
66AM_PROG_VALAC([0.18.0])66AM_PROG_VALAC([0.31.1])
67AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["Can't find suitable vala compiler."])])67AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["Can't find suitable vala compiler."])])
6868
69###################################################################69###################################################################
7070
=== modified file 'debian/control'
--- debian/control 2014-02-04 21:38:14 +0000
+++ debian/control 2019-02-03 22:37:00 +0000
@@ -9,7 +9,7 @@
9 autotools-dev,9 autotools-dev,
10 pkg-config,10 pkg-config,
11 intltool,11 intltool,
12 valac (>= 0.22.0),12 valac (>= 0.31.1),
13 libglib2.0-dev (>= 2.32.1),13 libglib2.0-dev (>= 2.32.1),
14 libdee-dev (>= 1.2.5~),14 libdee-dev (>= 1.2.5~),
15 libdbusmenu-glib-dev (>= 0.4.90),15 libdbusmenu-glib-dev (>= 0.4.90),
1616
=== modified file 'src/unity-appinfo-manager.vala'
--- src/unity-appinfo-manager.vala 2016-05-16 23:12:22 +0000
+++ src/unity-appinfo-manager.vala 2019-02-03 22:37:00 +0000
@@ -97,7 +97,7 @@
97 });97 });
98 }98 }
9999
100 [Deprecated (replacement = "AppInfoManager.get_default")]100 [Version (deprecated = true, replacement = "AppInfoManager.get_default")]
101 public static AppInfoManager get_instance ()101 public static AppInfoManager get_instance ()
102 {102 {
103 return AppInfoManager.get_default ();103 return AppInfoManager.get_default ();

Subscribers

People subscribed via source and target branches