r45228 - in /desktop/unstable/metacity: ./ debian/

mitya57 at users.alioth.debian.org mitya57 at users.alioth.debian.org
Mon Jun 15 10:28:20 UTC 2015 

Author: mitya57
Date: Mon Jun 15 10:28:19 2015
New Revision: 45228

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45228
Log:
Merge experimental branch into unstable

Added:
    desktop/unstable/metacity/debian/libmetacity-private3.install   (props changed)
      - copied unchanged from r45227, desktop/experimental/metacity/debian/libmetacity-private3.install
    desktop/unstable/metacity/debian/libmetacity-private3.symbols
      - copied unchanged from r45227, desktop/experimental/metacity/debian/libmetacity-private3.symbols
Removed:
    desktop/unstable/metacity/debian/libmetacity-private2.install
    desktop/unstable/metacity/debian/libmetacity-private2.symbols
Modified:
    desktop/unstable/metacity/   (props changed)
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/control
    desktop/unstable/metacity/debian/control.in
    desktop/unstable/metacity/debian/rules
    desktop/unstable/metacity/debian/watch

Propchange: desktop/unstable/metacity/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/experimental/metacity:44660-45227

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=45228&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog	[utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog	[utf-8] Mon Jun 15 10:28:19 2015
@@ -1,8 +1,34 @@
-metacity (1:3.14.3-2) UNRELEASED; urgency=medium
-
+metacity (1:3.17.2-2) experimental; urgency=medium
+
+  * Add missing Breaks/Replaces on old gnome-accessibility-themes
+    (closes: #787858)
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 06 Jun 2015 15:09:55 +0300
+
+metacity (1:3.17.2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop unnecessary breaks from libmetacity-private3 package.
+    Thanks Ansgar Burchardt for the suggestion.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 06 Jun 2015 12:13:51 +0300
+
+metacity (1:3.17.1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Rename libmetacity-private2 to libmetacity-private3, following
+    upstream soname bump.
+  * Build-depend on libgtk-3-dev 3.15.2 (according to configure.ac).
+  * Update libmetacity-private3.symbols (there are many new exported
+    symbols).
+  * Break/Replace gnome-themes-standard-data (<< 3.15.90), because of
+    a file conflict.
+  * Watch unstable releases.
   * Remove dependency on gnome-icon-theme, no longer needed.
-
- -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 04 Feb 2015 09:53:10 +0300
+  * Install the correct file (NEWS) as upstream changelog.
+  * Remove no longer needed configure option.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 02 Jun 2015 00:00:04 +0300
 
 metacity (1:3.14.3-1) unstable; urgency=medium
 

Modified: desktop/unstable/metacity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control?rev=45228&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control	[utf-8] (original)
+++ desktop/unstable/metacity/debian/control	[utf-8] Mon Jun 15 10:28:19 2015
@@ -6,7 +6,7 @@
 Section: x11
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,
@@ -15,7 +15,7 @@
                intltool (>= 0.34.90),
                libcanberra-gtk3-dev,
                libglib2.0-dev (>= 2.36.0),
-               libgtk-3-dev (>= 3.12.0),
+               libgtk-3-dev (>= 3.15.2),
                libgtop2-dev,
                libice-dev,
                libpango1.0-dev (>= 1.2.0),
@@ -57,13 +57,12 @@
  .
  This package contains the core binaries.
 
-Package: libmetacity-private2
+Package: libmetacity-private3
 Section: libs
 Architecture: any
 Depends: metacity-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libmetacity-private0, libmetacity-private0a, libmetacity-private1
 Description: library for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -77,6 +76,10 @@
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: gnome-accessibility-themes (<< 3.15.90),
+        gnome-themes-standard-data (<< 3.15.90)
+Replaces: gnome-accessibility-themes (<< 3.15.90),
+          gnome-themes-standard-data (<< 3.15.90)
 Description: shared files for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -90,7 +93,7 @@
 Section: libdevel
 Architecture: any
 Depends: libgtk-3-dev,
-         libmetacity-private2 (= ${binary:Version}),
+         libmetacity-private3 (= ${binary:Version}),
          ${misc:Depends}
 Description: development files for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.

Modified: desktop/unstable/metacity/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control.in?rev=45228&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control.in	[utf-8] (original)
+++ desktop/unstable/metacity/debian/control.in	[utf-8] Mon Jun 15 10:28:19 2015
@@ -11,7 +11,7 @@
                intltool (>= 0.34.90),
                libcanberra-gtk3-dev,
                libglib2.0-dev (>= 2.36.0),
-               libgtk-3-dev (>= 3.12.0),
+               libgtk-3-dev (>= 3.15.2),
                libgtop2-dev,
                libice-dev,
                libpango1.0-dev (>= 1.2.0),
@@ -53,13 +53,12 @@
  .
  This package contains the core binaries.
 
-Package: libmetacity-private2
+Package: libmetacity-private3
 Section: libs
 Architecture: any
 Depends: metacity-common (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libmetacity-private0, libmetacity-private0a, libmetacity-private1
 Description: library for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -73,6 +72,10 @@
 Section: misc
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: gnome-accessibility-themes (<< 3.15.90),
+        gnome-themes-standard-data (<< 3.15.90)
+Replaces: gnome-accessibility-themes (<< 3.15.90),
+          gnome-themes-standard-data (<< 3.15.90)
 Description: shared files for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -86,7 +89,7 @@
 Section: libdevel
 Architecture: any
 Depends: libgtk-3-dev,
-         libmetacity-private2 (= ${binary:Version}),
+         libmetacity-private3 (= ${binary:Version}),
          ${misc:Depends}
 Description: development files for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.

Propchange: desktop/unstable/metacity/debian/libmetacity-private3.install
------------------------------------------------------------------------------
--- svn:mergeinfo	(added)
+++ svn:mergeinfo	Mon Jun 15 10:28:19 2015
@@ -0,0 +1 @@
+/desktop/experimental/metacity/debian/libmetacity-private3.install:44662-45227

Modified: desktop/unstable/metacity/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/rules?rev=45228&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/rules	[utf-8] (original)
+++ desktop/unstable/metacity/debian/rules	[utf-8] Mon Jun 15 10:28:19 2015
@@ -8,7 +8,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-startup-notification=yes
+DEB_INSTALL_CHANGELOGS_ALL = ./NEWS
 DEB_INSTALL_DOCS_metacity += doc/theme-format.txt
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed

Modified: desktop/unstable/metacity/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/watch?rev=45228&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/watch	[utf-8] (original)
+++ desktop/unstable/metacity/debian/watch	[utf-8] Mon Jun 15 10:28:19 2015
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/metacity/([\d\.]+[02468])/ metacity-(.*)\.tar\.xz
+http://ftp.gnome.org/pub/GNOME/sources/metacity/([\d\.]+)/ metacity-(.*)\.tar\.xz

More information about the pkg-gnome-commits mailing list