Merge lp://staging/~larsu/gtk/calendar-day-selected into lp://staging/~ubuntu-desktop/gtk/ubuntu
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~larsu/gtk/calendar-day-selected |
| Merge into: | lp://staging/~ubuntu-desktop/gtk/ubuntu |
| Diff against target: |
28059 lines (+27405/-0) (has conflicts) 125 files modified
.bzr-builddeb/default.conf (+2/-0) debian/README.Debian (+29/-0) debian/changelog (+6811/-0) debian/compat (+1/-0) debian/control (+311/-0) debian/control.in (+308/-0) debian/copyright (+656/-0) debian/gir1.2-gtk-3.0.install (+1/-0) debian/gtk-3-examples.examples (+2/-0) debian/gtk-3-examples.install (+17/-0) debian/libgail-3-0-dbg.dirs (+1/-0) debian/libgail-3-0.install (+1/-0) debian/libgail-3-0.symbols (+14/-0) debian/libgail-3-dev.install (+3/-0) debian/libgail-3-doc.doc-base.gail-reference (+9/-0) debian/libgail-3-doc.install (+1/-0) debian/libgail-3-doc.links (+1/-0) debian/libgtk-3-0-dbg.links.in (+2/-0) debian/libgtk-3-0-udeb.install (+1/-0) debian/libgtk-3-0.install.in (+6/-0) debian/libgtk-3-0.links.in (+2/-0) debian/libgtk-3-0.postinst.in (+20/-0) debian/libgtk-3-0.postrm.in (+11/-0) debian/libgtk-3-0.symbols (+5086/-0) debian/libgtk-3-0.triggers.in (+2/-0) debian/libgtk-3-bin.install (+6/-0) debian/libgtk-3-bin.links.in (+3/-0) debian/libgtk-3-bin.manpages (+1/-0) debian/libgtk-3-bin.postrm (+15/-0) debian/libgtk-3-bin.preinst (+24/-0) debian/libgtk-3-common.gsettings-override (+2/-0) debian/libgtk-3-common.install.in (+5/-0) debian/libgtk-3-dev.install (+7/-0) debian/libgtk-3-dev.links.in (+2/-0) debian/libgtk-3-doc.doc-base.gdk.in (+13/-0) debian/libgtk-3-doc.doc-base.gtk.in (+11/-0) debian/libgtk-3-doc.docs (+1/-0) debian/libgtk-3-doc.install.in (+2/-0) debian/libgtk-3-doc.links.in (+6/-0) debian/missing-sources/README (+39/-0) debian/missing-sources/zlib.js-0.1.6/ChangeLog.md (+133/-0) debian/missing-sources/zlib.js-0.1.6/LICENSE (+28/-0) debian/missing-sources/zlib.js-0.1.6/LICENSE_min (+1/-0) debian/missing-sources/zlib.js-0.1.6/README.en.md (+285/-0) debian/missing-sources/zlib.js-0.1.6/README.md (+307/-0) debian/missing-sources/zlib.js-0.1.6/bin/rawinflate.min.js (+15/-0) debian/missing-sources/zlib.js-0.1.6/bin/rawinflate.min.js.map (+8/-0) debian/missing-sources/zlib.js-0.1.6/build.xml (+451/-0) debian/missing-sources/zlib.js-0.1.6/closure-primitives/base.js (+1498/-0) debian/missing-sources/zlib.js-0.1.6/closure-primitives/depswriter.py (+202/-0) debian/missing-sources/zlib.js-0.1.6/closure-primitives/source.py (+114/-0) debian/missing-sources/zlib.js-0.1.6/closure-primitives/treescan.py (+78/-0) debian/missing-sources/zlib.js-0.1.6/define/typedarray/hybrid.js (+14/-0) debian/missing-sources/zlib.js-0.1.6/define/typedarray/use.js (+9/-0) debian/missing-sources/zlib.js-0.1.6/deps.js (+25/-0) debian/missing-sources/zlib.js-0.1.6/export/adler32.js (+4/-0) debian/missing-sources/zlib.js-0.1.6/export/crc32.js (+5/-0) debian/missing-sources/zlib.js-0.1.6/export/deflate.js (+17/-0) debian/missing-sources/zlib.js-0.1.6/export/gunzip.js (+11/-0) debian/missing-sources/zlib.js-0.1.6/export/gunzip_member.js (+15/-0) debian/missing-sources/zlib.js-0.1.6/export/gzip.js (+7/-0) debian/missing-sources/zlib.js-0.1.6/export/inflate.js (+12/-0) debian/missing-sources/zlib.js-0.1.6/export/inflate_stream.js (+11/-0) debian/missing-sources/zlib.js-0.1.6/export/rawdeflate.js (+21/-0) debian/missing-sources/zlib.js-0.1.6/export/rawinflate.js (+12/-0) debian/missing-sources/zlib.js-0.1.6/export/rawinflate_stream.js (+11/-0) debian/missing-sources/zlib.js-0.1.6/export/unzip.js (+15/-0) debian/missing-sources/zlib.js-0.1.6/export/zip.js (+33/-0) debian/missing-sources/zlib.js-0.1.6/node/exports.js (+230/-0) debian/missing-sources/zlib.js-0.1.6/node/externs.js (+13/-0) debian/missing-sources/zlib.js-0.1.6/package.json (+29/-0) debian/missing-sources/zlib.js-0.1.6/src/adler32.js (+68/-0) debian/missing-sources/zlib.js-0.1.6/src/bitstream.js (+202/-0) debian/missing-sources/zlib.js-0.1.6/src/crc32.js (+142/-0) debian/missing-sources/zlib.js-0.1.6/src/deflate.js (+168/-0) debian/missing-sources/zlib.js-0.1.6/src/export_object.js (+33/-0) debian/missing-sources/zlib.js-0.1.6/src/gunzip.js (+238/-0) debian/missing-sources/zlib.js-0.1.6/src/gunzip_member.js (+51/-0) debian/missing-sources/zlib.js-0.1.6/src/gzip.js (+225/-0) debian/missing-sources/zlib.js-0.1.6/src/heap.js (+135/-0) debian/missing-sources/zlib.js-0.1.6/src/huffman.js (+93/-0) debian/missing-sources/zlib.js-0.1.6/src/inflate.js (+120/-0) debian/missing-sources/zlib.js-0.1.6/src/inflate_stream.js (+119/-0) debian/missing-sources/zlib.js-0.1.6/src/rawdeflate.js (+1195/-0) debian/missing-sources/zlib.js-0.1.6/src/rawinflate.js (+861/-0) debian/missing-sources/zlib.js-0.1.6/src/rawinflate_stream.js (+862/-0) debian/missing-sources/zlib.js-0.1.6/src/unzip.js (+565/-0) debian/missing-sources/zlib.js-0.1.6/src/util.js (+31/-0) debian/missing-sources/zlib.js-0.1.6/src/zip.js (+571/-0) debian/missing-sources/zlib.js-0.1.6/src/zlib.js (+24/-0) debian/patches/0001-GtkButtonBox-remove-spacing-when-buttons-are-linked.patch (+97/-0) debian/patches/0001-backport-mir-patches-from-upstream-master.patch (+2326/-0) debian/patches/0001-gtk-reftest-Force-icon-theme-to-Adwaita.patch (+39/-0) debian/patches/015_default-fallback-icon-theme.patch (+11/-0) debian/patches/016_no_offscreen_widgets_grabbing.patch (+24/-0) debian/patches/017_no_offscreen_device_grabbing.patch (+24/-0) debian/patches/018_gdkenumtypes.c_location.patch (+67/-0) debian/patches/030_tests_skip_filechooser.patch (+19/-0) debian/patches/032_mips_treeview_row_separator_height.patch (+18/-0) debian/patches/042_treeview_single-focus.patch (+16/-0) debian/patches/043_notebook_scroll.patch (+211/-0) debian/patches/060_ignore-random-icons.patch (+13/-0) debian/patches/071_fix-installation-of-HTML-images.patch (+28/-0) debian/patches/073-Use-AC_USE_SYSTEM_EXTENSIONS-to-get-_GNU_SOURCE-_XOP.patch (+112/-0) debian/patches/073_treeview_almost_fixed.patch (+78/-0) debian/patches/074_eventbox_scroll_mask.patch (+14/-0) debian/patches/bzg_gtkcellrenderer_grabbing_modifier.patch (+123/-0) debian/patches/calendar-always-emit-day-selected-once.patch (+198/-0) debian/patches/message-dialog-restore-traditional-look-on-unity.patch (+163/-0) debian/patches/print-dialog-show-options-of-remote-dnssd-printers.patch (+26/-0) debian/patches/reftest-known-fail.patch (+38/-0) debian/patches/restore_filechooser_typeaheadfind (+37/-0) debian/patches/series (+24/-0) debian/patches/ubuntu_gtk_custom_menu_items.patch (+365/-0) debian/patches/uimanager-guard-against-nested-node-updates.patch (+64/-0) debian/patches/x-canonical-accel.patch (+216/-0) debian/rules (+188/-0) debian/settings.ini (+5/-0) debian/source/format (+1/-0) debian/tests/build (+42/-0) debian/tests/control (+2/-0) debian/tests/python3-gi (+16/-0) debian/update-icon-caches (+26/-0) debian/update-icon-caches.8 (+19/-0) debian/watch (+3/-0) Conflict adding file .bzr-builddeb. Moved existing file to .bzr-builddeb.moved. Conflict adding file debian. Moved existing file to debian.moved. |
| To merge this branch: | bzr merge lp://staging/~larsu/gtk/calendar-day-selected |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| VCS imports | Pending | ||
|
Review via email:
|
|||
Commit message
Add debian/
Fixes infintite loop between indicator-datetime and the panel (LP: #1480387)
Description of the change
Add debian/
Fixes infintite loop between indicator-datetime and the panel (LP: #1480387)
Unmerged revisions
- 464. By Lars Karlitski
-
Add debian/
patches/ calendar- always- emit-day- selected- once.patch:
Fixes infintite loop between indicator-datetime and the panel (LP: #1480387) - 463. By Iain Lane
-
releasing package gtk+3.0 version 3.16.7-0ubuntu1
- 462. By Iain Lane
-
New upstream release 3.16.7
- 461. By Lars Uebernickel <email address hidden>
-
debian/
patches/ 0001-GtkButtonB ox-remove- spacing- when-buttons- are-linked. patch:
backport from master (LP: #1470434) - 460. By Iain Lane
-
releasing package gtk+3.0 version 3.16.6-1ubuntu1
- 459. By Iain Lane
-
* Merge with Debian. Remaining changes:
+ Enable Mir backend.
+ Drop 022_disable-viqr-im- for-vi- locale. patch
+ Drop 061_multiarch_module_ fallback. patch - unneeded in Ubuntu since we
cleared all old gtk modules out.
+ Install the settings.ini file to set our themes.
+ Enable parallel builds
+ Ubuntu specific patches:
- 073_treeview_almost_ fixed.patch
- 074_eventbox_scroll_ mask.patch
- bzg_gtkcellrenderer_grabbing_ modifier. patch
- ubuntu_gtk_custom_ menu_items. patch
- print-dialog-show-options- of-remote- dnssd-printers. patch
- uimanager-guard-against- nested- node-updates. patch
- x-canonical-accel.patch
- message-dialog- restore- traditional- look-on- unity.patch
- 0001-gtk-reftest- Force-icon- theme-to- Adwaita. patch
+ Add Breaks on gnome-shell << 3.16 - this needs to be updated at the same
time.
+ Add Breaks on old overlay-scrollbar versions which still provided the gtk3
module - we don't want to use this any more with GTK 3.16.
+ Update Mir backend from upstream git.
* New upstream release.
* Refresh patches.
* Drop obsolete Breaks from pre-wheezy.
* Remove debian/libgtk- 3-common. preinst. in, this file is a leftover from
gtk+2.0 and not necessary anymore. - 458. By Sebastien Bacher
-
releasing package gtk+3.0 version 3.16.5-1ubuntu2
- 457. By Sebastien Bacher
-
* debian/control.in:
- the previous upload stopped limited the architectures where the mir
backend is built, drop the restriction from the dev depends as well
(lp: #1475537) - 456. By Iain Lane
-
releasing package gtk+3.0 version 3.16.5-1ubuntu1
- 455. By Iain Lane
-
Merge 3.16.5-1 with Debian
