Merge lp:~robru/unity-lens-applications/merge-distro into lp:unity-lens-applications

Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 376
Merged at revision: 375
Proposed branch: lp:~robru/unity-lens-applications/merge-distro
Merge into: lp:unity-lens-applications
Diff against target: 28 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
src/unity-ratings-db.c (+2/-2)
To merge this branch: bzr merge lp:~robru/unity-lens-applications/merge-distro
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+194273@code.launchpad.net

Commit message

Merge manual distro upload back to trunk.

Description of the change

Jenkins cannot daily_release this project until this merge fixes the changelog.

To post a comment you must log in.
376. By Robert Bruce Park

Not just the changelog.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (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 2013-10-11 06:15:35 +0000
3+++ debian/changelog 2013-11-07 01:38:56 +0000
4@@ -1,3 +1,9 @@
5+unity-lens-applications (7.1.0+13.10.20131011-0ubuntu2) trusty; urgency=low
6+
7+ * Transition to libdb5.3 across the archive.
8+
9+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Sun, 03 Nov 2013 13:43:35 +0000
10+
11 unity-lens-applications (7.1.0+13.10.20131011-0ubuntu1) saucy; urgency=low
12
13 [ Pawel Stolowski ]
14
15=== modified file 'src/unity-ratings-db.c'
16--- src/unity-ratings-db.c 2012-03-12 10:51:57 +0000
17+++ src/unity-ratings-db.c 2013-11-07 01:38:56 +0000
18@@ -23,8 +23,8 @@
19
20 /* Hacky check, but we *really* need to have the same libdb version as the
21 * software-center is using to avoid a cascade of fail */
22-#if DB_VERSION_MAJOR != 5 || DB_VERSION_MINOR != 1
23- #error "unity-lens-applications only compiles and works against libdb-5.1. Please install the package libdb5.1-dev"
24+#if DB_VERSION_MAJOR != 5 || DB_VERSION_MINOR != 3
25+ #error "unity-lens-applications only compiles and works against libdb-5.3. Please install the package libdb5.3-dev"
26 #endif
27
28 struct _UnityRatingsDatabase {

Subscribers

People subscribed via source and target branches