r26991 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in libgtk2.0-dev.install.in rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Mar 20 18:38:56 UTC 2011
Author: pochu
Date: Sun Mar 20 18:38:51 2011
New Revision: 26991
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26991
Log:
* Temporarily disable the gir package build.
* Upload to unstable.
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/control
desktop/unstable/gtk+2.0/debian/control.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in
desktop/unstable/gtk+2.0/debian/rules
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=26991&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Sun Mar 20 18:38:51 2011
@@ -1,3 +1,10 @@
+gtk+2.0 (2.24.3-1~sid1) unstable; urgency=low
+
+ * Temporarily disable the gir package build.
+ * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 20 Mar 2011 18:33:28 +0000
+
gtk+2.0 (2.24.3-1) experimental; urgency=low
* New upstream release.
Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=26991&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Sun Mar 20 18:38:51 2011
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 7.0.50~),
gettext,
pkg-config,
autotools-dev,
libglib2.0-dev (>= 2.27.3),
libgdk-pixbuf2.0-dev (>= 2.22.1),
- libpango1.0-dev (>= 1.28.3-4),
+ libpango1.0-dev (>= 1.28.3),
libatk1.0-dev (>= 1.32.0),
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
@@ -29,13 +29,13 @@
dpkg-dev (>= 1.13.19),
x11proto-xext-dev,
libcups2-dev (>= 1.2),
- gobject-introspection (>= 0.9.12-4~),
- libgirepository1.0-dev (>= 0.9.3),
- gir1.2-glib-2.0,
- gir1.2-freedesktop,
- gir1.2-atk-1.0,
- gir1.2-pango-1.0,
- gir1.2-gdkpixbuf-2.0,
+# gobject-introspection (>= 0.9.12-4~),
+# libgirepository1.0-dev (>= 0.9.3),
+# 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,
@@ -219,22 +219,22 @@
.
This package contains the pixbuf theme engine.
-Package: gir1.2-gtk-2.0
-Architecture: any
-Depends: libgtk2.0-common,
- ${misc:Depends},
- ${shlibs:Depends},
- ${gir:Depends}
-Conflicts: gobject-introspection-repository, gir1.0-gtk-2.0
-Replaces: gir1.0-gtk-2.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
- for projects ranging from small one-off tools to complete application
- suites.
- .
- This package can be used by other packages using the GIRepository format to
- generate dynamic bindings.
+#Package: gir1.2-gtk-2.0
+#Architecture: any
+#Depends: libgtk2.0-common,
+# ${misc:Depends},
+# ${shlibs:Depends},
+# ${gir:Depends}
+#Conflicts: gobject-introspection-repository, gir1.0-gtk-2.0
+#Replaces: gir1.0-gtk-2.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
+# for projects ranging from small one-off tools to complete application
+# suites.
+# .
+# This package can be used by other packages using the GIRepository format to
+# generate dynamic bindings.
Package: libgail18
Architecture: any
Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=26991&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in [utf-8] Sun Mar 20 18:38:51 2011
@@ -9,7 +9,7 @@
autotools-dev,
libglib2.0-dev (>= 2.27.3),
libgdk-pixbuf2.0-dev (>= 2.22.1),
- libpango1.0-dev (>= 1.28.3-4),
+ libpango1.0-dev (>= 1.28.3),
libatk1.0-dev (>= 1.32.0),
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
@@ -29,13 +29,13 @@
dpkg-dev (>= 1.13.19),
x11proto-xext-dev,
libcups2-dev (>= 1.2),
- gobject-introspection (>= 0.9.12-4~),
- libgirepository1.0-dev (>= 0.9.3),
- gir1.2-glib-2.0,
- gir1.2-freedesktop,
- gir1.2-atk-1.0,
- gir1.2-pango-1.0,
- gir1.2-gdkpixbuf-2.0,
+# gobject-introspection (>= 0.9.12-4~),
+# libgirepository1.0-dev (>= 0.9.3),
+# 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,
@@ -219,22 +219,22 @@
.
This package contains the pixbuf theme engine.
-Package: gir1.2-gtk-2.0
-Architecture: any
-Depends: @COMMON_PKG@,
- ${misc:Depends},
- ${shlibs:Depends},
- ${gir:Depends}
-Conflicts: gobject-introspection-repository, gir1.0-gtk-2.0
-Replaces: gir1.0-gtk-2.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
- for projects ranging from small one-off tools to complete application
- suites.
- .
- This package can be used by other packages using the GIRepository format to
- generate dynamic bindings.
+#Package: gir1.2-gtk-2.0
+#Architecture: any
+#Depends: @COMMON_PKG@,
+# ${misc:Depends},
+# ${shlibs:Depends},
+# ${gir:Depends}
+#Conflicts: gobject-introspection-repository, gir1.0-gtk-2.0
+#Replaces: gir1.0-gtk-2.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
+# for projects ranging from small one-off tools to complete application
+# suites.
+# .
+# This package can be used by other packages using the GIRepository format to
+# generate dynamic bindings.
Package: libgail18
Architecture: any
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-dev.install.in?rev=26991&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in [utf-8] Sun Mar 20 18:38:51 2011
@@ -8,6 +8,6 @@
debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig
debian/install/shared/@LIBDIR@/gtk- at APIVER@/include @LIBDIR@/gtk- at APIVER@
debian/install/shared/usr/share/aclocal usr/share
-debian/install/shared/usr/share/gir-1.0 usr/share
+#debian/install/shared/usr/share/gir-1.0 usr/share
# from the static flavor
debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@
Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=26991&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules [utf-8] Sun Mar 20 18:38:51 2011
@@ -3,9 +3,7 @@
# Debian GNOME Maintainers
DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-# get-orig-source target
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := gtk+
@@ -53,7 +51,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.23.90
+SHVER := 2.24.0
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
@@ -77,7 +75,8 @@
# package groups, used in rule dependencies and in cleanup
BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) libgail-doc
-BINARY_ARCH_PKGS := $(SHARED_PKG) $(UDEB_PKG) $(DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) gir1.2-gtk-2.0 libgail18 libgail-dbg libgail-dev libgail-common
+BINARY_ARCH_PKGS := $(SHARED_PKG) $(UDEB_PKG) $(DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) libgail18 libgail-dbg libgail-dev libgail-common
+# gir1.2-gtk-2.0
ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS)
# list of flavors we build; each gets a builddir, a configure pass (configure
@@ -127,7 +126,7 @@
shared_configure_flags := $(configure_flags) \
--enable-shared \
- --enable-introspection=yes \
+ --enable-introspection=no \
--disable-static
shared_udeb_configure_flags := $(shared_configure_flags) \
--disable-xcomposite \
@@ -331,7 +330,7 @@
-X$(MODULES_BASE_PATH) \
-V"libgail18 (>= $(SHVER)), libgail-common (>= $(SHVER))" \
-- -c4
- dh_girepository -pgir1.2-gtk-2.0
+ #dh_girepository -pgir1.2-gtk-2.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