r9390 - in /desktop/experimental/metacity/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Mar 26 19:54:28 2007
New Revision: 9390

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9390
Log:
* Import /desktop/experimental/metacity at 7970.
* Use ${gnome:Version} and ${gnome:NextVersion} to loosen the
  dependencies.
* Build-depend on gnome-pkg-tools 0.6.
* Call gnome-version.mk
* Replace the x-dev build-dependency by x11proto-core-dev.

Modified:
    desktop/experimental/metacity/debian/changelog
    desktop/experimental/metacity/debian/control
    desktop/experimental/metacity/debian/control.in
    desktop/experimental/metacity/debian/rules

Modified: desktop/experimental/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/metacity/debian/changelog?rev=9390&op=diff
==============================================================================
--- desktop/experimental/metacity/debian/changelog (original)
+++ desktop/experimental/metacity/debian/changelog Mon Mar 26 19:54:28 2007
@@ -6,7 +6,14 @@
   [ Loic Minier ]
   * Merge 1:2.14.5-2.
 
- -- Loic Minier <lool at dooz.org>  Fri, 10 Nov 2006 11:08:20 +0100
+  [ Josselin Mouette ]
+  * Use ${gnome:Version} and ${gnome:NextVersion} to loosen the 
+    dependencies.
+  * Build-depend on gnome-pkg-tools 0.6.
+  * Call gnome-version.mk.
+  * Replace the x-dev build-dependency by x11proto-core-dev.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 21 Nov 2006 20:50:05 +0100
 
 metacity (1:2.16.2-1) experimental; urgency=low
 

Modified: desktop/experimental/metacity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/metacity/debian/control?rev=9390&op=diff
==============================================================================
--- desktop/experimental/metacity/debian/control (original)
+++ desktop/experimental/metacity/debian/control Mon Mar 26 19:54:28 2007
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Marco Cabizza <marco87 at gmail.com>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs (>= 0.4.37), debhelper (>= 4.1.0), gettext, libgtk2.0-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev (>= 2.4.23), libgconf2-dev (>= 2.6.1-2), libglade2-dev (>= 2.4.0-1), libice-dev, libsm-dev, libx11-dev, libxt-dev, libxext-dev, libxinerama-dev, libxrandr-dev, x-dev, libxinerama-dev, libstartup-notification0-dev (>= 0.7), libxml-parser-perl, gnome-pkg-tools, dpkg-dev (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.37), debhelper (>= 4.1.0), gettext, libgtk2.0-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev (>= 2.4.23), libgconf2-dev (>= 2.6.1-2), libglade2-dev (>= 2.4.0-1), libice-dev, libsm-dev, libx11-dev, libxt-dev, libxext-dev, libxinerama-dev, libxrandr-dev, x11proto-core-dev, libxinerama-dev, libstartup-notification0-dev (>= 0.7), libxml-parser-perl, gnome-pkg-tools (>= 0.6), dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: libmetacity0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion})
 Description: library of lightweight GTK2 based Window Manager
  Metacity is a small window manager, using gtk2 to do everything.
  .
@@ -22,7 +22,7 @@
 Package: metacity
 Section: x11
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion})
 Provides: x-window-manager
 Suggests: gnome-control-center (>= 1:2.5.4)
 Description: A lightweight GTK2 based Window Manager

Modified: desktop/experimental/metacity/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/metacity/debian/control.in?rev=9390&op=diff
==============================================================================
--- desktop/experimental/metacity/debian/control.in (original)
+++ desktop/experimental/metacity/debian/control.in Mon Mar 26 19:54:28 2007
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Marco Cabizza <marco87 at gmail.com>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.37), debhelper (>= 4.1.0), gettext, libgtk2.0-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev (>= 2.4.23), libgconf2-dev (>= 2.6.1-2), libglade2-dev (>= 2.4.0-1), libice-dev, libsm-dev, libx11-dev, libxt-dev, libxext-dev, libxinerama-dev, libxrandr-dev, x-dev, libxinerama-dev, libstartup-notification0-dev (>= 0.7), libxml-parser-perl, gnome-pkg-tools, dpkg-dev (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.37), debhelper (>= 4.1.0), gettext, libgtk2.0-dev (>= 2.10.0-1), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev (>= 2.4.23), libgconf2-dev (>= 2.6.1-2), libglade2-dev (>= 2.4.0-1), libice-dev, libsm-dev, libx11-dev, libxt-dev, libxext-dev, libxinerama-dev, libxrandr-dev, x11proto-core-dev, libxinerama-dev, libstartup-notification0-dev (>= 0.7), libxml-parser-perl, gnome-pkg-tools (>= 0.6), dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: libmetacity0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion})
 Description: library of lightweight GTK2 based Window Manager
  Metacity is a small window manager, using gtk2 to do everything.
  .
@@ -22,7 +22,7 @@
 Package: metacity
 Section: x11
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, metacity-common (>= ${gnome:Version}), metacity-common (<< ${gnome:NextVersion})
 Provides: x-window-manager
 Suggests: gnome-control-center (>= 1:2.5.4)
 Description: A lightweight GTK2 based Window Manager

Modified: desktop/experimental/metacity/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/metacity/debian/rules?rev=9390&op=diff
==============================================================================
--- desktop/experimental/metacity/debian/rules (original)
+++ desktop/experimental/metacity/debian/rules Mon Mar 26 19:54:28 2007
@@ -6,6 +6,7 @@
 include /usr/share/cdbs/1/rules/utils.mk
 
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-startup-notification=yes --enable-xsync=yes
 DEB_DH_MAKESHLIBS_ARGS_libmetacity0 += -V 'libmetacity0 (>= 1:2.14)'