lp:~noskcaj/ubuntu/trusty/gtk2-engines/merge

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/trusty/gtk2-engines

Daniel Holbach (community): Approve on 2013-12-17

Diff: 1246 lines (+79/-922)

29 files modified

.pc/01_libm.patch/engines/clearlooks/Makefile.am (+0/-50)
.pc/01_libm.patch/engines/crux/Makefile.am (+0/-25)
.pc/01_libm.patch/engines/glide/Makefile.am (+0/-40)
.pc/01_libm.patch/engines/hc/Makefile.am (+0/-44)
.pc/01_libm.patch/engines/industrial/Makefile.am (+0/-45)
.pc/01_libm.patch/engines/lua/Makefile.am (+0/-117)
.pc/01_libm.patch/engines/mist/Makefile.am (+0/-22)
.pc/01_libm.patch/engines/redmond/Makefile.am (+0/-43)
.pc/01_libm.patch/engines/thinice/Makefile.am (+0/-24)
.pc/01_libm.patch/test/Makefile.am (+0/-153)
.pc/02_glib-single-include.patch/engines/clearlooks/src/animation.c (+0/-341)
.pc/applied-patches (+0/-2)
debian/changelog (+18/-0)
debian/control (+0/-1)
debian/control.in (+0/-1)
debian/patches/03_automake1.14.patch (+49/-0)
debian/patches/series (+1/-0)
debian/rules (+0/-3)
engines/clearlooks/Makefile.am (+1/-1)
engines/clearlooks/src/animation.c (+1/-1)
engines/crux/Makefile.am (+1/-1)
engines/glide/Makefile.am (+1/-1)
engines/hc/Makefile.am (+1/-1)
engines/industrial/Makefile.am (+1/-1)
engines/lua/Makefile.am (+1/-1)
engines/mist/Makefile.am (+1/-1)
engines/redmond/Makefile.am (+1/-1)
engines/thinice/Makefile.am (+1/-1)
test/Makefile.am (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

74. By Jackson Doak on 2013-12-15

* Merge from debian, remaining changes:
  - debian/control: Build depend on gnome-common, so we can get a .pot file
    to use for launchpad translations
  - debian/rules: build translations template
  - Update watch file to only track GNOME 2.20 as gtk-engines was then
    ported to gtk3 and finally abandoned.
* Drop our automake fix, debian now supports the new version
* Fix FTBS due to automake bug (Closes: #713353)

73. By Jackson Doak on 2013-12-15

Merging shared upstream rev into target branch.

72. By Dimitri John Ledkov on 2013-10-10

Force to use automake1.11, thus fixing FTBFS.

71. By Sebastien Bacher on 2012-09-25

Backport Debian revision to fix ftfbs with the current glib

70. By Steve Langasek on 2011-12-05

releasing version 1:2.20.2-1ubuntu1

69. By Steve Langasek on 2011-12-05

merge version 1:2.20.2-1 from Debian testing

68. By Steve Langasek on 2011-12-05

Merging shared upstream rev into target branch.

67. By Steve Langasek on 2011-12-05

Merging shared upstream rev into target branch.

66. By Loïc Minier on 2011-12-01

* Update watch file to only track GNOME 2.20 as gtk-engines was then ported
  to gtk3 and finally abandoned.
* Fix FTBFS due to missing -lm.
  - New patch 20_link-with-libm, adds AC_CHECK_LIBM and AC_SUBST(LIBM) to
    configure.ac and $(LIBM) to Makefile.am files for engines which need it
    in LIBADD.
  - New patch 90_autoreconf, generated with autoreconf -fi %% rm -rf
    autom4te.cache engines/support/*~; needed for 20_link-with-libm.
  - Drop patch 99_ltmain_as-needed, doesn't apply anymore since the addition
    of 90_autoreconf, but is probably obsoleted by it.

65. By Robert Ancell on 2010-11-03

* New upstream release
* debian/control:
  - Build depend on dh-autoreconf, gnome-common
* debian/source:
  - Use source version 3.0
* debian/rules:
  - Use autoreconf.mk
  - Drop simple-patchsys.mk
* debian/patches/99_autoreconf.patch:
  - Dropped, using dh-autoreconf instead