lp:~noskcaj/ubuntu/trusty/gelemental/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/trusty/gelemental/merge
Branch merges
- Michael Terry: Approve
-
Diff: 45235 lines (+1251/-43253)63 files modified.pc/579183_adjust_size_middle_button.patch/src/buttons.cc (+0/-281)
.pc/604612_fix_menu_category.patch/data/gelemental.desktop.in (+0/-8)
.pc/604618_scrollable_properties_dialog.patch/src/dialogs.cc (+0/-298)
.pc/656372_element_renames.patch/libelemental/data.cc (+0/-173)
.pc/656372_element_renames.patch/po/da.po (+0/-2564)
.pc/656372_element_renames.patch/po/de.po (+0/-2637)
.pc/656372_element_renames.patch/po/en_CA.po (+0/-2594)
.pc/656372_element_renames.patch/po/en_GB.po (+0/-2594)
.pc/656372_element_renames.patch/po/en_US.po (+0/-2593)
.pc/656372_element_renames.patch/po/es.po (+0/-2527)
.pc/656372_element_renames.patch/po/fr.po (+0/-2644)
.pc/656372_element_renames.patch/po/it.po (+0/-2624)
.pc/656372_element_renames.patch/po/nl.po (+0/-2528)
.pc/656372_element_renames.patch/po/pl.po (+0/-2590)
.pc/656372_element_renames.patch/po/pt.po (+0/-2527)
.pc/656372_element_renames.patch/po/ru.po (+0/-2529)
.pc/656372_element_renames.patch/po/sv.po (+0/-2556)
.pc/656372_element_renames.patch/po/tr.po (+0/-2565)
.pc/665529_glib_headers.patch/libelemental/misc/extras.cc (+0/-131)
.pc/665529_glib_headers.patch/libelemental/misc/widgets.cc (+0/-642)
.pc/665529_glib_headers.patch/src/main.cc (+0/-397)
.pc/add_new_wave_theme.patch/src/buttons.cc (+0/-280)
.pc/applied-patches (+0/-13)
.pc/czech_translation_559028.patch/po/LINGUAS (+0/-14)
.pc/fix_gtkmm_2.18.patch/libelemental/misc/widgets.cc (+0/-642)
.pc/fix_zinc_german_translation.patch/libelemental/data.cc (+0/-173)
.pc/ftbfs_doxygen_590382.patch/docs/api/Makefile.am (+0/-40)
.pc/ftbfs_doxygen_590382.patch/docs/api/Makefile.in (+0/-424)
.pc/ftbfs_missing_limits.patch/libelemental/value.hh (+0/-368)
.pc/lp1051992_elements_update.patch/libelemental/data.cc (+0/-173)
.pc/lp673285_link_in_about.patch/src/main.cc (+0/-396)
data/gelemental.desktop.in (+1/-1)
debian/changelog (+29/-0)
debian/control (+9/-8)
debian/patches/656372_element_renames.patch (+1166/-31)
debian/patches/lp1051992_elements_update.patch (+0/-25)
debian/patches/series (+1/-2)
debian/rules (+5/-3)
docs/api/Makefile.am (+1/-1)
docs/api/Makefile.in (+1/-1)
libelemental/data.cc (+5/-5)
libelemental/misc/extras.cc (+1/-1)
libelemental/misc/widgets.cc (+2/-2)
libelemental/value.hh (+0/-1)
po/LINGUAS (+0/-1)
po/cs.po (+0/-2607)
po/da.po (+2/-2)
po/de.po (+2/-2)
po/en_CA.po (+2/-2)
po/en_GB.po (+2/-2)
po/en_US.po (+2/-2)
po/es.po (+1/-1)
po/fr.po (+2/-2)
po/it.po (+1/-1)
po/nl.po (+2/-2)
po/pl.po (+2/-2)
po/pt.po (+1/-1)
po/ru.po (+1/-1)
po/sv.po (+2/-2)
po/tr.po (+1/-1)
src/buttons.cc (+1/-2)
src/dialogs.cc (+3/-11)
src/main.cc (+3/-3)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 16. By Jackson Doak
-
* Use autoreconf instead of autotools-dev to fix ppc64el ftbfs
- Build-dep on dh-auttoreconf, intltool
- add --with autoreconf to rules - 15. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Add binary -dbg packages with debugging symbols:
- debian/control:
+ add gelemental-dbg stanza
+ add libelemental0-dbg stanza
- debian/rules:
+ split dh_strip calls in binary-arch target
+ add appropriate --dbg-package flags to dh_strip calls
* Drop lp1051992_elements_ update. patch, fixed in debian - 13. By Charlie_Smotherman
-
* Updated Flerovium and Livermorium elements. Thx Etienne Beaule.
* Fixed typo in Francium. Thx Benjamin Kerensa.
(LP: #1051992) - 12. By Angel Abad
-
* Merge from Debian testing. Remaining changes:
- debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch
- Add binary -dbg packages with debugging symbols:
- debian/control:
+ add gelemental-dbg stanza
+ add libelemental0-dbg stanza
- debian/rules:
+ split dh_strip calls in binary-arch target
+ add appropriate --dbg-package flags to dh_strip calls - 11. By Angel Abad
-
* Merge from Debian testing. Remaining changes:
- debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch
- Add binary -dbg packages with debugging symbols:
- debian/control:
+ add gelemental-dbg stanza
+ add libelemental0-dbg stanza
- debian/rules:
+ split dh_strip calls in binary-arch target
+ add appropriate --dbg-package flags to dh_strip calls - 10. By Angel Abad
-
* Merge from debian unstable. Remaining changes:
- debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch
- Add binary -dbg packages with debugging symbols:
- debian/control:
+ add gelemental-dbg stanza
+ add libelemental0-dbg stanza
- debian/rules:
+ split dh_strip calls in binary-arch target
+ add appropriate --dbg-package flags to dh_strip calls - 9. By Angel Abad
-
* Merge from debian unstable (LP: #662355). Remaining changes:
- debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch
- Add binary -dbg packages with debugging symbols:
- debian/control:
+ add gelemental-dbg stanza
+ add libelemental0-dbg stanza
- debian/rules:
+ split dh_strip calls in binary-arch target
+ add appropriate --dbg-package flags to dh_strip calls - 8. By David Futcher
-
* Merge from debian testing (LP: #585487). Remaining changes:
- debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch
- Add binary -dbg packages with debugging symbols:
- debian/control:
+ add gelemental-dbg stanza
+ add libelemental0-dbg stanza
- debian/rules:
+ split dh_strip calls in binary-arch target
+ add appropriate --dbg-package flags to dh_strip calls
* debian/control: Add ${misc:Depends} to all binary stanza Depends fields
to placate Lintian 'debhelper-but-no- misc-depends' - 7. By Cesare Tirabassi
-
* debian/
patches/ add_new_ wave_theme. dpatch: Added (LP: #486798).
- add the New Wave theme to the list of themes that have issues
with button colours.
* debian/patches/ 00list: updated IAW the patch.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/trusty/gelemental