Indicator Date and Time

Merge lp:~sil2100/indicator-datetime/include_direct_push into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

  1. include_direct_push
  2. Merge into trunk.13.10
Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 224
Proposed branch: lp:~sil2100/indicator-datetime/include_direct_push
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 34 lines (+8/-2)
2 files modified
debian/changelog (+7/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~sil2100/indicator-datetime/include_direct_push
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Approve
Review via email: mp+169255@code.launchpad.net

Commit message

Include the missing version that got directly pushed to the distro... which is generally a bad idea.

Description of the change

Include the missing version that got directly pushed to the distro... which is generally a bad idea. Someone pushed directly to distro and now we have to fix that.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

marvelous! Thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-autolanding/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-autolanding/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-autolanding/4/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/54/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/54/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-autolanding/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-autolanding/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-autolanding/5/console

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 2013-06-13 10:54:37 +0000
3+++ debian/changelog 2013-06-13 16:56:26 +0000
4@@ -1,10 +1,16 @@
5-indicator-datetime (12.10.3daily13.06.07-0ubuntu2) UNRELEASED; urgency=low
6+indicator-datetime (12.10.3daily13.06.07-0ubuntu3) UNRELEASED; urgency=low
7
8 * Link test program in the right order. Importantly, make sure
9 XORG_GTEST_LIBS comes after it as it uses pthread.
10
11 -- Iain Lane <iain@orangesquash.org.uk> Thu, 13 Jun 2013 11:44:12 +0100
12
13+indicator-datetime (12.10.3daily13.06.07-0ubuntu2) saucy; urgency=low
14+
15+ * Build against libical 1.0
16+
17+ -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 13 Jun 2013 13:23:54 +0100
18+
19 indicator-datetime (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low
20
21 [ Jeremy Bicha ]
22
23=== modified file 'debian/control'
24--- debian/control 2013-05-29 12:08:32 +0000
25+++ debian/control 2013-06-13 16:56:26 +0000
26@@ -16,7 +16,7 @@
27 libido3-0.1-dev (>= 0.2.90),
28 libgeoclue-dev (>= 0.12.0),
29 libecal1.2-dev (>= 3.5),
30- libical-dev (>= 0.48),
31+ libical-dev (>= 1.0),
32 libgtk-3-dev (>= 3.1.4),
33 libcairo2-dev (>= 1.10),
34 libjson-glib-dev,

Subscribers

People subscribed via source and target branches