r54018 - in /desktop/experimental/gtk+4.0/debian: changelog control control.in gtk-4-examples.install libgtk-4-bin.install libgtk-4-common.install.in

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Sun Sep 17 11:37:58 UTC 2017 

Author: jbicha
Date: Sun Sep 17 11:37:57 2017
New Revision: 54018

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54018
Log:
Have libgtk-4-bin and libgtk-4-common and gtk-4-examples depend on their gtk3 counterparts.

until we figure out how to handle the file conflicts there. The conflicted
files have not changed in gtk4.
See GNOME bug 774912.

Modified:
    desktop/experimental/gtk+4.0/debian/changelog
    desktop/experimental/gtk+4.0/debian/control
    desktop/experimental/gtk+4.0/debian/control.in
    desktop/experimental/gtk+4.0/debian/gtk-4-examples.install
    desktop/experimental/gtk+4.0/debian/libgtk-4-bin.install
    desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in

Modified: desktop/experimental/gtk+4.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/changelog?rev=54018&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/changelog	[utf-8] Sun Sep 17 11:37:57 2017
@@ -1,5 +1,6 @@
 gtk+4.0 (3.91.2-1) UNRELEASED; urgency=medium
 
+  [ Emilio Pozuelo Monfort ]
   * New major release, GTK+ 4 (beta version).
     Rename everything as appropriate for GTK+ 4.
   * Don't abort on test suite failures.
@@ -22,6 +23,12 @@
     not present in 3.91.2 but will be in the next release.
   * Update watch file.
   * Point Vcs-* to experimental.
+
+  [ Jeremy Bicha ]
+  * Have libgtk-4-bin and libgtk-4-common and gtk-4-examples depend on
+    their gtk3 counterparts until we figure out how to handle the file
+    conflicts there. The conflicted files have not changed in gtk4.
+    See GNOME bug 774912.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 11 Sep 2017 23:33:08 +0200
 

Modified: desktop/experimental/gtk+4.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/control?rev=54018&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/control	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/control	[utf-8] Sun Sep 17 11:37:57 2017
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 10.3~),
                gnome-pkg-tools (>= 0.11),
                dpkg-dev (>= 1.17.14),
@@ -105,7 +105,8 @@
 Section: misc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         libgtk-3-common
 Recommends: libgtk-4-0
 Breaks: libgtk-4-0 (<< 3.5.4)
 Replaces: libgtk-4-0 (<< 3.5.4)
@@ -124,7 +125,8 @@
 Depends: ${misc:Depends}, ${shlibs:Depends},
          libgtk-4-0 (>= ${source:Version}),
          libgtk-4-common (>= ${source:Version}),
-         gtk-update-icon-cache
+         gtk-update-icon-cache,
+         libgtk-3-bin
 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
@@ -199,7 +201,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgtk-4-0 (= ${binary:Version})
+         libgtk-4-0 (= ${binary:Version}),
+         gtk-3-examples
 Breaks: libgtk-4-common (<< 3.5.4)
 Replaces: libgtk-4-common (<< 3.5.4)
 Description: example files for GTK+ 4

Modified: desktop/experimental/gtk+4.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/control.in?rev=54018&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/control.in	[utf-8] Sun Sep 17 11:37:57 2017
@@ -105,7 +105,8 @@
 Section: misc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         libgtk-3-common
 Recommends: @SHARED_PKG@
 Breaks: @SHARED_PKG@ (<< 3.5.4)
 Replaces: @SHARED_PKG@ (<< 3.5.4)
@@ -124,7 +125,8 @@
 Depends: ${misc:Depends}, ${shlibs:Depends},
          @SHARED_PKG@ (>= ${source:Version}),
          @COMMON_PKG@ (>= ${source:Version}),
-         gtk-update-icon-cache
+         gtk-update-icon-cache,
+         libgtk-3-bin
 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
@@ -199,7 +201,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         @SHARED_PKG@ (= ${binary:Version})
+         @SHARED_PKG@ (= ${binary:Version}),
+         gtk-3-examples
 Breaks: @COMMON_PKG@ (<< 3.5.4)
 Replaces: @COMMON_PKG@ (<< 3.5.4)
 Description: example files for GTK+ 4

Modified: desktop/experimental/gtk+4.0/debian/gtk-4-examples.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/gtk-4-examples.install?rev=54018&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/gtk-4-examples.install	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/gtk-4-examples.install	[utf-8] Sun Sep 17 11:37:57 2017
@@ -8,8 +8,9 @@
 usr/share/applications/gtk4-widget-factory.desktop
 usr/share/icons/hicolor/*/*/gtk4-widget-factory*
 usr/share/icons/hicolor/*/*/gtk4-demo*
-usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
-usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
+# Currently shipped by gtk-3-examples
+#usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
+#usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
 usr/share/man/*/gtk4-encode-symbolic-svg.*
 usr/share/man/*/gtk4-demo.*
 usr/share/man/*/gtk4-demo-application.*

Modified: desktop/experimental/gtk+4.0/debian/libgtk-4-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/libgtk-4-bin.install?rev=54018&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/libgtk-4-bin.install	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/libgtk-4-bin.install	[utf-8] Sun Sep 17 11:37:57 2017
@@ -2,8 +2,9 @@
 usr/bin/gtk4-builder-tool
 usr/bin/gtk4-launch
 usr/bin/gtk4-query-settings
-usr/share/gettext/its/gtkbuilder.its
-usr/share/gettext/its/gtkbuilder.loc
+# Currently shipped by libgtk-3-bin
+#usr/share/gettext/its/gtkbuilder.its
+#usr/share/gettext/its/gtkbuilder.loc
 usr/share/man/man1/gtk4-broadwayd.1
 usr/share/man/man1/gtk4-builder-tool.1
 usr/share/man/man1/gtk4-launch.1

Modified: desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B4.0/debian/libgtk-4-common.install.in?rev=54018&op=diff
==============================================================================
--- desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in	[utf-8] (original)
+++ desktop/experimental/gtk+4.0/debian/libgtk-4-common.install.in	[utf-8] Sun Sep 17 11:37:57 2017
@@ -1,6 +1,7 @@
 @CONFDIR@/im-multipress.conf
 usr/share/locale
 usr/share/themes
+# Currently shipped by libgtk-3-common
 #usr/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
-usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
-usr/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
+#usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
+#usr/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml

More information about the pkg-gnome-commits mailing list