Merge lp:~sil2100/ubuntu-geoip/merge_missing_changelog into lp:ubuntu-geoip

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 41
Merged at revision: 37
Proposed branch: lp:~sil2100/ubuntu-geoip/merge_missing_changelog
Merge into: lp:ubuntu-geoip
Diff against target: 32 lines (+22/-0)
1 file modified
debian/changelog (+22/-0)
To merge this branch: bzr merge lp:~sil2100/ubuntu-geoip/merge_missing_changelog
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sebastien Bacher Approve
Review via email: mp+175818@code.launchpad.net

Commit message

Merge in missing changelog entries from the already released versions to distro

Before daily releasing, there was a separate branch with packaging, which had 3 versions that got released but not merged into the changelog of the main branch. This branch re-adds them.

Description of the change

Merge in missing changelog entries from the already released versions to distro

Before daily releasing, there was a separate branch with packaging, which had 3 versions that got released but not merged into the changelog of the main branch. This branch re-adds them.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good to me

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
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-07-09 16:12:07 +0000
3+++ debian/changelog 2013-07-19 12:01:32 +0000
4@@ -7,6 +7,28 @@
5
6 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Tue, 09 Jul 2013 17:32:55 +0200
7
8+ubuntu-geoip (1.0.1-0ubuntu5) saucy; urgency=low
9+
10+ * Backport r35 to fix build in saucy
11+
12+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 24 Jun 2013 17:11:43 +0200
13+
14+ubuntu-geoip (1.0.1-0ubuntu4) raring; urgency=low
15+
16+ * Backport upstream commits:
17+ - Fix ordering of parameters (lp: #1067037)
18+ - support for proxies (lp: #1130097)
19+ * debian/control:
20+ - Build-depends on libsoup-gnome2.4-dev
21+
22+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 15 Mar 2013 11:53:53 +0100
23+
24+ubuntu-geoip (1.0.1-0ubuntu3) raring; urgency=low
25+
26+ * Don't use deprecated g_type_init() with recent glib2.0.
27+
28+ -- Matthias Klose <doko@ubuntu.com> Tue, 26 Feb 2013 10:46:13 +0100
29+
30 ubuntu-geoip (1.0.1-0ubuntu2) raring; urgency=low
31
32 * debian/control: build-depends on libdbustest1-dev

Subscribers

People subscribed via source and target branches