diff --git a/debian/changelog b/debian/changelog index e53b6261cb..79a4ba0ffa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gtk+3.0 (3.24.12-2) UNRELEASED; urgency=medium + + * Move gtk-encode-symbolic-svg from gtk-3-examples to libgtk-3-bin. + It's more of a development tool than an example. + + -- Simon McVittie Mon, 25 Nov 2019 11:17:59 +0000 + gtk+3.0 (3.24.12-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 643364dbd0..8f75152720 100644 --- a/debian/control +++ b/debian/control @@ -123,6 +123,8 @@ Depends: gtk-update-icon-cache, ${shlibs:Depends}, libgtk-3-common (>= ${source:Version}), libgtk-3-0 (>= ${source:Version}) +Breaks: gtk-3-examples (<< 3.24.12-2~) +Replaces: gtk-3-examples (<< 3.24.12-2~) Description: programs for the GTK graphical user interface library GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK is suitable diff --git a/debian/control.in b/debian/control.in index fb393cd223..871c7f5e69 100644 --- a/debian/control.in +++ b/debian/control.in @@ -123,6 +123,8 @@ Depends: gtk-update-icon-cache, ${shlibs:Depends}, @COMMON_PKG@ (>= ${source:Version}), @SHARED_PKG@ (>= ${source:Version}) +Breaks: @EXAMPLES_PKG@ (<< 3.24.12-2~) +Replaces: @EXAMPLES_PKG@ (<< 3.24.12-2~) Description: programs for the GTK graphical user interface library GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK is suitable diff --git a/debian/gtk-3-examples.install b/debian/gtk-3-examples.install index 390d01d3ee..2ab0c654ca 100644 --- a/debian/gtk-3-examples.install +++ b/debian/gtk-3-examples.install @@ -1,4 +1,3 @@ -usr/bin/gtk-encode-symbolic-svg usr/bin/gtk3-demo usr/bin/gtk3-demo-application usr/bin/gtk3-icon-browser @@ -12,7 +11,6 @@ usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml usr/share/icons/hicolor/*/*/gtk3-demo* usr/share/icons/hicolor/*/*/gtk3-widget-factory* usr/share/installed-tests/gtk+ -usr/share/man/*/gtk-encode-symbolic-svg.* usr/share/man/*/gtk3-demo-application.* usr/share/man/*/gtk3-demo.* usr/share/man/*/gtk3-icon-browser.* diff --git a/debian/libgtk-3-bin.install b/debian/libgtk-3-bin.install index 1edd79618e..f1db600463 100644 --- a/debian/libgtk-3-bin.install +++ b/debian/libgtk-3-bin.install @@ -1,9 +1,11 @@ usr/bin/broadwayd usr/bin/gtk-builder-tool +usr/bin/gtk-encode-symbolic-svg usr/bin/gtk-launch usr/bin/gtk-query-settings usr/share/gettext/its/gtkbuilder.its usr/share/gettext/its/gtkbuilder.loc +usr/share/man/*/gtk-encode-symbolic-svg.* usr/share/man/man1/broadwayd.1 usr/share/man/man1/gtk-builder-tool.1 usr/share/man/man1/gtk-launch.1