r25903 - in /desktop/experimental/nautilus/debian: changelog control control.in gir1.0-nautilus-3.0.install gir1.2-nautilus-3.0.install rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sun Dec 12 16:30:45 UTC 2010 

Author: pochu
Date: Sun Dec 12 16:30:44 2010
New Revision: 25903

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25903
Log:
* Update to the new gir policy:
  - Rename gir1.0-nautilus-3.0 to gir1.2-nautilus-3.0.
  - Bump the gobject-introspection build dependency.
* Switch to source format 3.0 (quilt).
* debian/control.in,
  debian/rules:
  - Call dh_girepository and let the gir package depend
    on gir:Depends, to get gir dependencies. Build depend
    on the necessary gir1.2 packages for that.

Added:
    desktop/experimental/nautilus/debian/gir1.2-nautilus-3.0.install
      - copied unchanged from r25898, desktop/experimental/nautilus/debian/gir1.0-nautilus-3.0.install
    desktop/experimental/nautilus/debian/source/
    desktop/experimental/nautilus/debian/source/format
Removed:
    desktop/experimental/nautilus/debian/gir1.0-nautilus-3.0.install
Modified:
    desktop/experimental/nautilus/debian/changelog
    desktop/experimental/nautilus/debian/control
    desktop/experimental/nautilus/debian/control.in
    desktop/experimental/nautilus/debian/rules

Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=25903&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog [utf-8] (original)
+++ desktop/experimental/nautilus/debian/changelog [utf-8] Sun Dec 12 16:30:44 2010
@@ -1,3 +1,17 @@
+nautilus (2.91.3-2) UNRELEASED; urgency=low
+
+  * Update to the new gir policy:
+    - Rename gir1.0-nautilus-3.0 to gir1.2-nautilus-3.0.
+    - Bump the gobject-introspection build dependency.
+  * Switch to source format 3.0 (quilt).
+  * debian/control.in,
+    debian/rules:
+    - Call dh_girepository and let the gir package depend
+      on gir:Depends, to get gir dependencies. Build depend
+      on the necessary gir1.2 packages for that.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 12 Dec 2010 16:50:26 +0100
+
 nautilus (2.91.3-1) experimental; urgency=low
 
   * New upstream release

Modified: desktop/experimental/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control?rev=25903&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control [utf-8] Sun Dec 12 16:30:44 2010
@@ -10,10 +10,7 @@
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
-               gobject-introspection (>= 0.9.12),
-               libgirepository1.0-dev (>= 0.9.12),
                cdbs (>= 0.4.41),
-               quilt,
                gnome-pkg-tools (>= 0.13),
                dpkg-dev (>= 1.13.19),
                libatk1.0-dev (>= 1.32.0),
@@ -34,6 +31,11 @@
                libgconf2-dev,
                x11proto-core-dev,
                shared-mime-info (>= 0.50),
+               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev (>= 0.9.12),
+               gir1.2-glib-2.0,
+               gir1.2-atk-1.0,
+               gir1.2-gtk-3.0,
                libglib2.0-doc,
                libgtk2.0-doc
 Homepage: http://www.gnome.org/projects/nautilus/
@@ -144,10 +146,11 @@
  This package provides the necessary development libraries and include
  files to develop and compile Nautilus extensions.
 
-Package: gir1.0-nautilus-3.0
+Package: gir1.2-nautilus-3.0
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends},
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
          ${misc:Depends}
 Description: libraries for nautilus components - gir bindings
  Nautilus is the official file manager and graphical shell for the

Modified: desktop/experimental/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/control.in?rev=25903&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/control.in [utf-8] (original)
+++ desktop/experimental/nautilus/debian/control.in [utf-8] Sun Dec 12 16:30:44 2010
@@ -5,10 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
                dh-autoreconf,
-               gobject-introspection (>= 0.9.12),
-               libgirepository1.0-dev (>= 0.9.12),
                cdbs (>= 0.4.41),
-               quilt,
                gnome-pkg-tools (>= 0.13),
                dpkg-dev (>= 1.13.19),
                libatk1.0-dev (>= 1.32.0),
@@ -29,6 +26,11 @@
                libgconf2-dev,
                x11proto-core-dev,
                shared-mime-info (>= 0.50),
+               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev (>= 0.9.12),
+               gir1.2-glib-2.0,
+               gir1.2-atk-1.0,
+               gir1.2-gtk-3.0,
                libglib2.0-doc,
                libgtk2.0-doc
 Homepage: http://www.gnome.org/projects/nautilus/
@@ -139,10 +141,11 @@
  This package provides the necessary development libraries and include
  files to develop and compile Nautilus extensions.
 
-Package: gir1.0-nautilus-3.0
+Package: gir1.2-nautilus-3.0
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends},
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
          ${misc:Depends}
 Description: libraries for nautilus components - gir bindings
  Nautilus is the official file manager and graphical shell for the

Modified: desktop/experimental/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/rules?rev=25903&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/rules [utf-8] (original)
+++ desktop/experimental/nautilus/debian/rules [utf-8] Sun Dec 12 16:30:44 2010
@@ -1,14 +1,13 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus \
@@ -21,4 +20,7 @@
 binary-post-install/nautilus-data::
 	dh_installmime -p$(cdbs_curpkg)
 
+$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
+	dh_girepository -p$(cdbs_curpkg)
+
 common-binary-post-install-arch:: list-missing

Added: desktop/experimental/nautilus/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/source/format?rev=25903&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/source/format (added)
+++ desktop/experimental/nautilus/debian/source/format [utf-8] Sun Dec 12 16:30:44 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list