lp:~sil2100/ubuntu-geoip/merge_missing_changelog

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-geoip at revision 37

PS Jenkins bot (community): Approve (continuous-integration) on 2013-07-19

Sebastien Bacher: Approve on 2013-07-19

Diff: 32 lines (+22/-0)

1 file modified

debian/changelog (+22/-0)

api

Superseded for merging into lp:~ubuntu-geoip-team/ubuntu-geoip/ubuntu

Ubuntu GeoIP Team: Pending requested 2013-07-19

Diff: 15737 lines (+1001/-14307)

34 files modified

.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+12/-0)
AUTHORS (+1/-5)
ChangeLog (+1/-421)
INSTALL (+0/-365)
Makefile.am (+3/-1)
Makefile.am.coverage (+48/-0)
Makefile.in (+0/-798)
aclocal.m4 (+0/-2009)
autogen.sh (+11/-0)
config.h.in (+0/-79)
configure (+0/-7587)
configure.ac (+29/-3)
data/Makefile.in (+0/-511)
debian/changelog (+53/-5)
debian/compat (+1/-0)
debian/control (+17/-10)
debian/copyright (+2/-2)
debian/rules (+10/-6)
debian/watch (+0/-2)
depcomp (+0/-630)
install-sh (+0/-520)
m4/gcov.m4 (+86/-0)
missing (+0/-376)
mkinstalldirs (+0/-162)
po/Makefile.in.in (+0/-217)
src/Makefile.am (+5/-1)
src/Makefile.in (+0/-563)
src/ubuntu-geoip-provider.c (+188/-34)
tests/Makefile.am (+35/-0)
tests/buenos-aires.xml (+1/-0)
tests/cableone-sherman-tx.xml (+1/-0)
tests/canonical-data-center.xml (+1/-0)
tests/dbus-interface.c (+494/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

41. By Łukasz Zemczak on 2013-07-19

releasing version 1.0.1-0ubuntu5

40. By Łukasz Zemczak on 2013-07-19

Backport r35 to fix build in saucy

39. By Łukasz Zemczak on 2013-07-19

releasing version 1.0.1-0ubuntu4

38. By Łukasz Zemczak on 2013-07-19

* Backport upstream commits:
  - Fix ordering of parameters (lp: #1067037)
  - support for proxies (lp: #1130097)
* debian/control:
  - Build-depends on libsoup-gnome2.4-dev

37. By Łukasz Zemczak on 2013-07-19

Don't use deprecated g_type_init() with recent glib2.0.

36. By Łukasz Zemczak on 2013-07-09

Modifications related to compliance with our packaging standards.

Approved by PS Jenkins bot, Robert Bruce Park.

35. By Ted Gould on 2013-06-19

Fix deprecation in libsoup.

Approved by Sebastien Bacher, PS Jenkins bot.

34. By Ted Gould on 2013-03-13

Add the gnome feature for proxy configuration support. Fixes: https://bugs.launchpad.net/bugs/1130097.

Approved by Charles Kerr, PS Jenkins bot.

33. By Stefan Schmidt on 2013-03-13

Fix ordering of parameters. Fixes: https://bugs.launchpad.net/bugs/1067037.

Approved by Ted Gould, PS Jenkins bot.

32. By Ted Gould on 2013-03-13

Ignoring g_type_init() where it is deprecated. Fixes: https://bugs.launchpad.net/bugs/1112832.

Approved by Ted Gould, PS Jenkins bot.