lp:~noskcaj/ubuntu/utopic/libgtkdatabox/merge

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/utopic/libgtkdatabox

Daniel Holbach (community): Approve on 2014-06-11

Diff: 19142 lines (+77/-18740)

23 files modified

.pc/01_libglage_example.patch/examples/basics_libglade.c (+0/-222)
.pc/04_missing_includes.patch/gtk/gtkdatabox_graph.c (+0/-502)
.pc/04_missing_includes.patch/gtk/gtkdatabox_markers.c (+0/-622)
.pc/05_explicit_link_libm.patch/examples/Makefile.am (+0/-74)
.pc/05_explicit_link_libm.patch/examples/Makefile.in (+0/-661)
.pc/06_gladeui-2.0.patch/configure (+0/-15714)
.pc/06_gladeui-2.0.patch/configure.ac (+0/-128)
.pc/06_gladeui-2.0.patch/glade/Makefile.am (+0/-57)
.pc/06_gladeui-2.0.patch/glade/Makefile.in (+0/-689)
.pc/applied-patches (+0/-4)
configure (+10/-10)
configure.ac (+3/-4)
debian/changelog (+21/-0)
debian/control (+13/-18)
debian/libgtkdatabox-0.9.2-0.lintian-overrides (+1/-1)
debian/rules (+2/-4)
examples/Makefile.am (+2/-4)
examples/Makefile.in (+2/-4)
examples/basics_libglade.c (+19/-0)
glade/Makefile.am (+2/-6)
glade/Makefile.in (+2/-8)
gtk/gtkdatabox_graph.c (+0/-4)
gtk/gtkdatabox_markers.c (+0/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

20. By Jackson Doak on 2014-06-09

* Sync with Debian. Remaining change:
  - Use dh-autoreconf for newer arches.

19. By Jackson Doak on 2014-06-09

Merging shared upstream rev into target branch.

18. By Daniel T Chen on 2014-01-16

Use dh-autoreconf for newer arches.

17. By Jeremy Bícha on 2013-06-02

* Sync with Debian. Remaining change:
  - Cope with 'pkg-config libglade-2.0 --variable=moduledir' returning a
    multiarch path.

16. By Sebastien Bacher on 2013-04-10

debian/patches/correct_link.patch: use -lm to fix build issue

15. By Colin Watson on 2012-01-25

Cope with 'pkg-config libglade-2.0 --variable=moduledir' returning a
multiarch path.

14. By Matthias Klose on 2011-09-01

Undefined GDK_DISABLE_DEPRECATED to avoid warning: assignment makes
pointer from integer without a cast. Fix FTBFS on amd64. LP: #831147.

13. By Andreas Tille on 2011-07-01

[Luk Claes]
* Don't ship .la files (Closes: #621640).

[Andreas Tille]
* Standards-Version: 3.9.2 (no changes needed)
* Debhelper 8 (control + compat)
* debian/source/format: 3.0 (quilt)
* debian/control: Short descriptions without leading article

12. By Luca Falavigna on 2011-05-21

* Non-maintainer upload.
* debian/patches/03_deprecated_GTK.patch:
  - Get rid of more deprecated GTK functions (Closes: #622040).

11. By Fabrice Coutadeur on 2011-04-02

gtkdatabox-0.9.1.1-gtk-2.22.patch: patch taken from Fedora to fix FTBFS
with gtk-2.2