r33443 - in /desktop/experimental/gtk+3.0/debian: changelog control control.in gtk-3-examples.install.in libgtk-3-common.install.in
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Mar 21 02:07:26 UTC 2012
Author: biebl
Date: Wed Mar 21 02:07:25 2012
New Revision: 33443
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33443
Log:
- Remove a few obsolete Conflicts/Replaces.
* Move org.gtk.Demo.gschema.xml gsettings schema from libgtk-3-common to
gtk-3-examples. Add the necessary Breaks/Replaces.
Modified:
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/control
desktop/experimental/gtk+3.0/debian/control.in
desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in
desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in
Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=33443&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Wed Mar 21 02:07:25 2012
@@ -11,10 +11,13 @@
package.
- Update dependencies of libgtk-3-dev. Strip the minimum version from
libx*-dev, since those versions were older then lenny anyway.
+ - Remove a few obsolete Conflicts/Replaces.
* Refresh patches.
* Disable 043_notebook_scroll.patch, it needs to be updated.
-
- -- Michael Biebl <biebl at debian.org> Wed, 21 Mar 2012 02:41:41 +0100
+ * Move org.gtk.Demo.gschema.xml gsettings schema from libgtk-3-common to
+ gtk-3-examples. Add the necessary Breaks/Replaces.
+
+ -- Michael Biebl <biebl at debian.org> Wed, 21 Mar 2012 03:06:51 +0100
gtk+3.0 (3.3.16-1) experimental; urgency=low
Modified: desktop/experimental/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control?rev=33443&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control [utf-8] Wed Mar 21 02:07:25 2012
@@ -59,8 +59,6 @@
libgtk-3-bin
Suggests: librsvg2-common,
gvfs
-Conflicts: libgtk3.0-0
-Replaces: libgtk3.0-0
Breaks: gnome-themes-standard (<< 3.3),
murrine-themes (<= 0.98.2)
Multi-Arch: same
@@ -81,8 +79,6 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Provides: gtk3-binver-3.0.0
-Conflicts: libgtk3.0-0-udeb
-Replaces: libgtk3.0-0-udeb
Description: GTK+ graphical user interface library - minimal runtime
This is a udeb, or a microdeb, for the debian-installer.
.
@@ -99,10 +95,8 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: libgtk-3-0
-Conflicts: libgtk3.0-common
Breaks: libgtk-3-0 (<< 3.2.2-3)
-Replaces: libgtk3.0-common,
- libgtk-3-0 (<< 3.2.2-3)
+Replaces: libgtk-3-0 (<< 3.2.2-3)
Multi-Arch: foreign
Description: common files for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@@ -118,8 +112,6 @@
Depends: ${misc:Depends},
libgtk-3-0 (>= ${source:Version}),
libgtk-3-common (= ${source:Version})
-Conflicts: libgtk3.0-bin
-Replaces: libgtk3.0-bin
Multi-Arch: foreign
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@@ -154,8 +146,6 @@
libxdamage-dev,
pkg-config (>= 0.26-1)
Suggests: libgtk-3-doc
-Conflicts: libgtk3.0-dev
-Replaces: libgtk3.0-dev
Description: development files for the GTK+ library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -172,8 +162,6 @@
Depends: libgtk-3-0 (= ${binary:Version}),
libgtk-3-common,
${misc:Depends}
-Conflicts: libgtk3.0-0-dbg
-Replaces: libgtk3.0-0-dbg
Description: GTK+ libraries and debugging symbols
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -192,8 +180,6 @@
libatk1.0-doc,
libpango1.0-doc
Suggests: devhelp
-Conflicts: libgtk3.0-doc
-Replaces: libgtk3.0-doc
Multi-Arch: foreign
Description: documentation for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@@ -211,8 +197,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libgtk-3-0 (= ${binary:Version})
-Conflicts: gtk-3.0-examples
-Replaces: gtk-3.0-examples
+Breaks: libgtk-3-common (<< 3.3.20-1)
+Replaces: libgtk-3-common (<< 3.3.20-1)
Description: example files for GTK+ 3
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -229,8 +215,6 @@
${misc:Depends},
${shlibs:Depends},
${gir:Depends}
-Conflicts: gir1.0-gtk-3.0
-Replaces: gir1.0-gtk-3.0
Description: GTK+ graphical user interface library -- gir bindings
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -245,8 +229,6 @@
Depends: ${misc:Depends},
${shlibs:Depends},
libgtk-3-0 (= ${binary:Version})
-Conflicts: libgail3.0-0
-Replaces: libgail3.0-0
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Description: GNOME Accessibility Implementation Library -- shared libraries
@@ -266,8 +248,6 @@
pkg-config (>= 0.26-1),
libatk1.0-dev (>= 1.13.0)
Suggests: libgail-3-doc
-Conflicts: libgail3.0-dev
-Replaces: libgail3.0-dev
Description: GNOME Accessibility Implementation Library -- development files
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -282,8 +262,6 @@
Priority: extra
Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version})
Recommends: libgtk-3-0-dbg
-Conflicts: libgail3.0-0-dbg
-Replaces: libgail3.0-0-dbg
Multi-Arch: same
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".
@@ -297,8 +275,6 @@
Section: doc
Depends: ${misc:Depends}
Suggests: devhelp
-Conflicts: libgail3.0-doc
-Replaces: libgail3.0-doc
Multi-Arch: foreign
Description: documentation files of the Gail library
Gail implements ATK interfaces for GTK+ widgets which are dynamically
Modified: desktop/experimental/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control.in?rev=33443&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control.in [utf-8] Wed Mar 21 02:07:25 2012
@@ -59,8 +59,6 @@
@BIN_PKG@
Suggests: librsvg2-common,
gvfs
-Conflicts: libgtk3.0-0
-Replaces: libgtk3.0-0
Breaks: gnome-themes-standard (<< 3.3),
murrine-themes (<= 0.98.2)
Multi-Arch: same
@@ -81,8 +79,6 @@
Depends: ${shlibs:Depends},
${misc:Depends}
Provides: @GTK_BINVER_DEP@
-Conflicts: libgtk3.0-0-udeb
-Replaces: libgtk3.0-0-udeb
Description: GTK+ graphical user interface library - minimal runtime
This is a udeb, or a microdeb, for the debian-installer.
.
@@ -99,10 +95,8 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: @SHARED_PKG@
-Conflicts: libgtk3.0-common
Breaks: @SHARED_PKG@ (<< 3.2.2-3)
-Replaces: libgtk3.0-common,
- @SHARED_PKG@ (<< 3.2.2-3)
+Replaces: @SHARED_PKG@ (<< 3.2.2-3)
Multi-Arch: foreign
Description: common files for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@@ -118,8 +112,6 @@
Depends: ${misc:Depends},
@SHARED_PKG@ (>= ${source:Version}),
@COMMON_PKG@ (= ${source:Version})
-Conflicts: libgtk3.0-bin
-Replaces: libgtk3.0-bin
Multi-Arch: foreign
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@@ -154,8 +146,6 @@
libxdamage-dev,
pkg-config (>= 0.26-1)
Suggests: @DOC_PKG@
-Conflicts: libgtk3.0-dev
-Replaces: libgtk3.0-dev
Description: development files for the GTK+ library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -172,8 +162,6 @@
Depends: @SHARED_PKG@ (= ${binary:Version}),
@COMMON_PKG@,
${misc:Depends}
-Conflicts: libgtk3.0-0-dbg
-Replaces: libgtk3.0-0-dbg
Description: GTK+ libraries and debugging symbols
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -192,8 +180,6 @@
libatk1.0-doc,
libpango1.0-doc
Suggests: devhelp
-Conflicts: libgtk3.0-doc
-Replaces: libgtk3.0-doc
Multi-Arch: foreign
Description: documentation for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
@@ -211,8 +197,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
@SHARED_PKG@ (= ${binary:Version})
-Conflicts: gtk-3.0-examples
-Replaces: gtk-3.0-examples
+Breaks: @COMMON_PKG@ (<< 3.3.20-1)
+Replaces: @COMMON_PKG@ (<< 3.3.20-1)
Description: example files for GTK+ 3
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -229,8 +215,6 @@
${misc:Depends},
${shlibs:Depends},
${gir:Depends}
-Conflicts: gir1.0-gtk-3.0
-Replaces: gir1.0-gtk-3.0
Description: GTK+ graphical user interface library -- gir bindings
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -245,8 +229,6 @@
Depends: ${misc:Depends},
${shlibs:Depends},
@SHARED_PKG@ (= ${binary:Version})
-Conflicts: libgail3.0-0
-Replaces: libgail3.0-0
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Description: GNOME Accessibility Implementation Library -- shared libraries
@@ -266,8 +248,6 @@
pkg-config (>= 0.26-1),
libatk1.0-dev (>= 1.13.0)
Suggests: libgail-3-doc
-Conflicts: libgail3.0-dev
-Replaces: libgail3.0-dev
Description: GNOME Accessibility Implementation Library -- development files
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -282,8 +262,6 @@
Priority: extra
Depends: ${misc:Depends}, libgail-3-0 (= ${binary:Version})
Recommends: @DEBUG_PKG@
-Conflicts: libgail3.0-0-dbg
-Replaces: libgail3.0-0-dbg
Multi-Arch: same
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".
@@ -297,8 +275,6 @@
Section: doc
Depends: ${misc:Depends}
Suggests: devhelp
-Conflicts: libgail3.0-doc
-Replaces: libgail3.0-doc
Multi-Arch: foreign
Description: documentation files of the Gail library
Gail implements ATK interfaces for GTK+ widgets which are dynamically
Modified: desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/gtk-3-examples.install.in?rev=33443&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/gtk-3-examples.install.in [utf-8] Wed Mar 21 02:07:25 2012
@@ -1,3 +1,4 @@
debian/install/shared/usr/bin/gtk3-demo usr/bin
debian/install/shared/usr/bin/gtk3-widget-factory usr/bin
debian/install/shared/usr/share/gtk-3.0/demo usr/share/gtk-3.0
+debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml usr/share/glib-2.0/schemas
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-common.install.in?rev=33443&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-common.install.in [utf-8] Wed Mar 21 02:07:25 2012
@@ -1,4 +1,5 @@
debian/install/shared/@CONFDIR@/im-multipress.conf @CONFDIR@
debian/install/shared/usr/share/locale usr/share
debian/install/shared/usr/share/themes usr/share
-debian/install/shared/usr/share/glib-2.0 usr/share
+debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml usr/share/glib-2.0/schemas
+debian/install/shared/usr/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml usr/share/glib-2.0/schemas
More information about the pkg-gnome-commits
mailing list