r41849 - in /desktop/unstable/metacity/debian: changelog control control.in libmetacity-private0a.install libmetacity-private0a.lintian-overrides libmetacity-private1.install metacity-common.install patches/ rules

mitya57-guest at users.alioth.debian.org mitya57-guest at users.alioth.debian.org
Sat Jun 14 13:32:53 UTC 2014


Author: mitya57-guest
Date: Sat Jun 14 13:32:52 2014
New Revision: 41849

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41849
Log:
* New upstream release.
* Drop all patches, applied upstream.
* Build-depend on libgtk-3-dev and libcanberra-gtk3-dev.
* Rename libmetacity-private0a to libmetacity-private-1,
  following upstream soname bump.
* Run wrap-and-sort.

Added:
    desktop/unstable/metacity/debian/libmetacity-private1.install
      - copied unchanged from r41848, desktop/unstable/metacity/debian/libmetacity-private0a.install
Removed:
    desktop/unstable/metacity/debian/libmetacity-private0a.install
    desktop/unstable/metacity/debian/libmetacity-private0a.lintian-overrides
    desktop/unstable/metacity/debian/patches/
Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/control
    desktop/unstable/metacity/debian/control.in
    desktop/unstable/metacity/debian/metacity-common.install
    desktop/unstable/metacity/debian/rules

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=41849&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog	[utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog	[utf-8] Sat Jun 14 13:32:52 2014
@@ -1,3 +1,14 @@
+metacity (1:3.12.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop all patches, applied upstream.
+  * Build-depend on libgtk-3-dev and libcanberra-gtk3-dev.
+  * Rename libmetacity-private0a to libmetacity-private-1,
+    following upstream soname bump.
+  * Run wrap-and-sort.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 14 Jun 2014 17:24:26 +0400
+
 metacity (1:2.34.13-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/metacity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control?rev=41849&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control	[utf-8] (original)
+++ desktop/unstable/metacity/debian/control	[utf-8] Sat Jun 14 13:32:52 2014
@@ -10,29 +10,29 @@
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
+               gnome-pkg-tools (>= 0.10),
+               gsettings-desktop-schemas-dev (>= 3.3.0),
                intltool (>= 0.34.90),
-               libgtk2.0-dev (>= 2.24.0),
+               libcanberra-gtk3-dev,
+               libglib2.0-dev (>= 2.25.10),
+               libgtk-3-dev (>= 3.8.0),
+               libgtop2-dev,
+               libice-dev,
                libpango1.0-dev (>= 1.2.0),
-               libcanberra-gtk-dev,
-               gsettings-desktop-schemas-dev (>= 3.3.0),
-               libglib2.0-dev (>= 2.25.10),
+               libsm-dev,
                libstartup-notification0-dev (>= 0.7),
-               libgtop2-dev,
+               libx11-dev,
                libxcomposite-dev (>= 1:0.2),
+               libxcursor-dev,
+               libxdamage-dev,
+               libxext-dev,
                libxfixes-dev,
+               libxinerama-dev,
+               libxrandr-dev,
                libxrender-dev,
-               libxdamage-dev,
-               libxcursor-dev,
                libxt-dev,
-               libx11-dev,
-               libxinerama-dev,
-               libxext-dev,
-               libxrandr-dev,
-               libsm-dev,
-               libice-dev,
-               zenity,
                yelp-tools,
-               gnome-pkg-tools (>= 0.10)
+               zenity
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/metacity
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/metacity
@@ -40,18 +40,16 @@
 Package: metacity
 Section: x11
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: gnome-icon-theme,
+         gsettings-desktop-schemas (>= 3.3.0),
+         libmetacity-private1 (= ${binary:Version}),
+         metacity-common (= ${source:Version}),
+         zenity,
          ${misc:Depends},
-         libmetacity-private0a (= ${binary:Version}),
-         metacity-common (= ${source:Version}),
-         gsettings-desktop-schemas (>= 3.3.0),
-         zenity,
-         gnome-icon-theme
+         ${shlibs:Depends}
 Provides: x-window-manager
-Recommends: gnome-session | x-session-manager,
-            gnome-themes-standard
-Suggests: gnome-control-center (>= 1:3.4.0),
-          xdg-user-dirs
+Recommends: gnome-session | x-session-manager, gnome-themes-standard
+Suggests: gnome-control-center (>= 1:3.4.0), xdg-user-dirs
 Description: lightweight GTK+ window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -61,14 +59,14 @@
  .
  This package contains the core binaries.
 
-Package: libmetacity-private0a
+Package: libmetacity-private1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: metacity-common (= ${source:Version}),
          ${misc:Depends},
-         metacity-common (= ${source:Version})
-Breaks: libmetacity-private0
-Replaces: libmetacity-private0
+         ${shlibs:Depends}
+Breaks: libmetacity-private0, libmetacity-private0a
+Replaces: libmetacity-private0, libmetacity-private0a
 Description: library for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -94,9 +92,9 @@
 Package: libmetacity-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends},
-         libmetacity-private0a (= ${binary:Version}),
-         libgtk2.0-dev
+Depends: libgtk2.0-dev,
+         libmetacity-private1 (= ${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=41849&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control.in	[utf-8] (original)
+++ desktop/unstable/metacity/debian/control.in	[utf-8] Sat Jun 14 13:32:52 2014
@@ -5,29 +5,29 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
+               gnome-pkg-tools (>= 0.10),
+               gsettings-desktop-schemas-dev (>= 3.3.0),
                intltool (>= 0.34.90),
-               libgtk2.0-dev (>= 2.24.0),
+               libcanberra-gtk3-dev,
+               libglib2.0-dev (>= 2.25.10),
+               libgtk-3-dev (>= 3.8.0),
+               libgtop2-dev,
+               libice-dev,
                libpango1.0-dev (>= 1.2.0),
-               libcanberra-gtk-dev,
-               gsettings-desktop-schemas-dev (>= 3.3.0),
-               libglib2.0-dev (>= 2.25.10),
+               libsm-dev,
                libstartup-notification0-dev (>= 0.7),
-               libgtop2-dev,
+               libx11-dev,
                libxcomposite-dev (>= 1:0.2),
+               libxcursor-dev,
+               libxdamage-dev,
+               libxext-dev,
                libxfixes-dev,
+               libxinerama-dev,
+               libxrandr-dev,
                libxrender-dev,
-               libxdamage-dev,
-               libxcursor-dev,
                libxt-dev,
-               libx11-dev,
-               libxinerama-dev,
-               libxext-dev,
-               libxrandr-dev,
-               libsm-dev,
-               libice-dev,
-               zenity,
                yelp-tools,
-               gnome-pkg-tools (>= 0.10)
+               zenity
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/metacity
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/metacity
@@ -35,18 +35,16 @@
 Package: metacity
 Section: x11
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: gnome-icon-theme,
+         gsettings-desktop-schemas (>= 3.3.0),
+         libmetacity-private1 (= ${binary:Version}),
+         metacity-common (= ${source:Version}),
+         zenity,
          ${misc:Depends},
-         libmetacity-private0a (= ${binary:Version}),
-         metacity-common (= ${source:Version}),
-         gsettings-desktop-schemas (>= 3.3.0),
-         zenity,
-         gnome-icon-theme
+         ${shlibs:Depends}
 Provides: x-window-manager
-Recommends: gnome-session | x-session-manager,
-            gnome-themes-standard
-Suggests: gnome-control-center (>= 1:3.4.0),
-          xdg-user-dirs
+Recommends: gnome-session | x-session-manager, gnome-themes-standard
+Suggests: gnome-control-center (>= 1:3.4.0), xdg-user-dirs
 Description: lightweight GTK+ window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -56,14 +54,14 @@
  .
  This package contains the core binaries.
 
-Package: libmetacity-private0a
+Package: libmetacity-private1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: metacity-common (= ${source:Version}),
          ${misc:Depends},
-         metacity-common (= ${source:Version})
-Breaks: libmetacity-private0
-Replaces: libmetacity-private0
+         ${shlibs:Depends}
+Breaks: libmetacity-private0, libmetacity-private0a
+Replaces: libmetacity-private0, libmetacity-private0a
 Description: library for the Metacity window manager
  Metacity is a small window manager, using GTK+ to do everything.
  .
@@ -89,9 +87,9 @@
 Package: libmetacity-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends},
-         libmetacity-private0a (= ${binary:Version}),
-         libgtk2.0-dev
+Depends: libgtk2.0-dev,
+         libmetacity-private1 (= ${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/metacity-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/metacity-common.install?rev=41849&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/metacity-common.install	[utf-8] (original)
+++ desktop/unstable/metacity/debian/metacity-common.install	[utf-8] Sat Jun 14 13:32:52 2014
@@ -1,10 +1,10 @@
+doc/metacity-theme.dtd usr/share/sgml/metacity-common
+usr/share/GConf
+usr/share/glib-2.0
 usr/share/gnome
+usr/share/gnome-control-center/keybindings
 usr/share/help
 usr/share/locale
 usr/share/man
 usr/share/metacity
 usr/share/themes
-usr/share/gnome-control-center/keybindings
-usr/share/GConf
-usr/share/glib-2.0
-doc/metacity-theme.dtd usr/share/sgml/metacity-common

Modified: desktop/unstable/metacity/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/rules?rev=41849&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/rules	[utf-8] (original)
+++ desktop/unstable/metacity/debian/rules	[utf-8] Sat Jun 14 13:32:52 2014
@@ -8,8 +8,6 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-startup-notification=yes
-DEB_DH_MAKESHLIBS_ARGS_libmetacity-private0a += -V 'libmetacity-private0a (>= 1:2.34.0)'
 DEB_INSTALL_DOCS_metacity += doc/theme-format.txt
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-




More information about the pkg-gnome-commits mailing list