r25893 - in /desktop/experimental/gtk+3.0/debian: changelog control control.in gir1.0-gtk-3.0.install.in gir1.2-gtk-3.0.install.in rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sun Dec 12 15:03:55 UTC 2010


Author: pochu
Date: Sun Dec 12 15:03:45 2010
New Revision: 25893

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25893
Log:
* Update to the new gir policy:
  - Rename gir1.0-gtk-3.0 to gir1.2-gtk-3.0.
  - Bump the gobject-introspection build dependency.
  - Build depend on gir1.2 packages.

Added:
    desktop/experimental/gtk+3.0/debian/gir1.2-gtk-3.0.install.in
      - copied unchanged from r25887, desktop/experimental/gtk+3.0/debian/gir1.0-gtk-3.0.install.in
Removed:
    desktop/experimental/gtk+3.0/debian/gir1.0-gtk-3.0.install.in
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/rules

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=25893&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Sun Dec 12 15:03:45 2010
@@ -1,10 +1,14 @@
-gtk+3.0 (2.91.6-1) UNRELEASED; urgency=low
+gtk+3.0 (2.91.5-2) experimental; urgency=low
 
   * debian/control.in,
     debian/rules:
     + Remove the chrpath hack, it's been fixed in libtool.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 08 Dec 2010 23:58:24 +0100
+  * Update to the new gir policy:
+    - Rename gir1.0-gtk-3.0 to gir1.2-gtk-3.0.
+    - Bump the gobject-introspection build dependency.
+    - Build depend on gir1.2 packages.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 12 Dec 2010 16:03:02 +0100
 
 gtk+3.0 (2.91.5-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=25893&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control [utf-8] Sun Dec 12 15:03:45 2010
@@ -29,13 +29,13 @@
                dpkg-dev (>= 1.13.19),
                x11proto-xext-dev,
                libcups2-dev (>= 1.2),
-               gobject-introspection (>= 0.9.3),
+               gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.3),
-               gir1.0-glib-2.0,
-               gir1.0-freedesktop,
-               gir1.0-atk-1.0,
-               gir1.0-pango-1.0,
-               gir1.0-gdkpixbuf-2.0,
+               gir1.2-glib-2.0,
+               gir1.2-freedesktop,
+               gir1.2-atk-1.0,
+               gir1.2-pango-1.0,
+               gir1.2-gdkpixbuf-2.0,
                quilt,
                gawk,
                xsltproc,
@@ -218,12 +218,13 @@
  .
  This package contains the pixbuf theme engine.
 
-Package: gir1.0-gtk-3.0
+Package: gir1.2-gtk-3.0
 Architecture: any
 Depends: libgtk3.0-common,
          ${misc:Depends},
          ${shlibs:Depends},
          ${gir:Depends}
+Conflicts: gir1.0-gtk-3.0
 Description: The GTK+ graphical user interface library -- gir bindings
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable

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=25893&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control.in [utf-8] Sun Dec 12 15:03:45 2010
@@ -29,13 +29,13 @@
                dpkg-dev (>= 1.13.19),
                x11proto-xext-dev,
                libcups2-dev (>= 1.2),
-               gobject-introspection (>= 0.9.3),
+               gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.3),
-               gir1.0-glib-2.0,
-               gir1.0-freedesktop,
-               gir1.0-atk-1.0,
-               gir1.0-pango-1.0,
-               gir1.0-gdkpixbuf-2.0,
+               gir1.2-glib-2.0,
+               gir1.2-freedesktop,
+               gir1.2-atk-1.0,
+               gir1.2-pango-1.0,
+               gir1.2-gdkpixbuf-2.0,
                quilt,
                gawk,
                xsltproc,
@@ -218,12 +218,13 @@
  .
  This package contains the pixbuf theme engine.
 
-Package: gir1.0-gtk-3.0
+Package: gir1.2-gtk-3.0
 Architecture: any
 Depends: @COMMON_PKG@,
          ${misc:Depends},
          ${shlibs:Depends},
          ${gir:Depends}
+Conflicts: gir1.0-gtk-3.0
 Description: The GTK+ graphical user interface library -- gir bindings
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable

Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=25893&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Sun Dec 12 15:03:45 2010
@@ -77,7 +77,7 @@
 
 # package groups, used in rule dependencies and in cleanup
 BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) libgail3.0-doc
-BINARY_ARCH_PKGS := $(SHARED_PKG) $(UDEB_PKG) $(DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) gir1.0-gtk-3.0 libgail3.0-0 libgail3.0-0-dbg libgail3.0-dev libgail3.0-common
+BINARY_ARCH_PKGS := $(SHARED_PKG) $(UDEB_PKG) $(DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) gir1.2-gtk-3.0 libgail3.0-0 libgail3.0-0-dbg libgail3.0-dev libgail3.0-common
 ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS)
 
 # list of flavors we build; each gets a builddir, a configure pass (configure
@@ -322,7 +322,7 @@
 		-X$(MODULES_BASE_PATH) \
 		-V"libgail3.0-0 (>= $(SHVER)), libgail3.0-common (>= $(SHVER))" \
 		-- -c4
-	dh_girepository -pgir1.0-gtk-3.0
+	dh_girepository -pgir1.2-gtk-3.0
 	dh_installdeb -s
 	# override shlibs for libraries from this source before computing
 	# dependencies of packages generated from this source; we already have




More information about the pkg-gnome-commits mailing list