r11783 - in /desktop/experimental/gtk+2.0/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Jul  3 16:55:25 2007
New Revision: 11783

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11783
Log:
* Don't call dh_python; use a hardcoded python dep instead.
* Really build-dep on a newer pango.

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/control
    desktop/experimental/gtk+2.0/debian/control.in
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=11783&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Jul  3 16:55:25 2007
@@ -5,10 +5,10 @@
     - Bump shlibs to >= 2.11.5.
     - Bump up libpango1.0-dev build-dep to >= 1.17.3.
     - Ship the new gtk-builder-convert Python script to convert Glade files to
-      GtkBuilder syntax in libgtk2.0-dev; call dh_python to generate a
-      ${python:Depends} but Recommend ${python:Depends} to avoid pulling
-      python on buildds; the script requires python >= 2.4, but this is not
-      enforced in the dependencies.
+      GtkBuilder syntax in libgtk2.0-dev; don't call dh_py* to generate a
+      ${python:Depends} but Recommend python (>= 2.4) to avoid pulling python
+      on buildds; the script requires python >= 2.4, but this is not enforced
+      in the dependencies.
     - Refresh patches 001_static-linking-dont-query-immodules,
       006_proper-directfb-modules, 040_filechooser_single-click to apply
       cleanly.

Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=11783&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control (original)
+++ desktop/experimental/gtk+2.0/debian/control Tue Jul  3 16:55:25 2007
@@ -7,7 +7,7 @@
                gettext,
                pkg-config,
                libglib2.0-dev (>= 2.13.5),
-               libpango1.0-dev (>= 1.15.3),
+               libpango1.0-dev (>= 1.17.3),
                libatk1.0-dev (>= 1.9.0),
                libx11-dev (>= 2:1.0.0-6),
                libxext-dev,
@@ -191,6 +191,7 @@
          libxcomposite-dev,
          libxdamage-dev,
          pkg-config
+Recommends: python (>= 2.4)
 Suggests: libgtk2.0-doc
 Replaces: libgtk1.3-dev,
           gtk2-engines-pixbuf (<< 2.8.18-5)

Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=11783&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in (original)
+++ desktop/experimental/gtk+2.0/debian/control.in Tue Jul  3 16:55:25 2007
@@ -7,7 +7,7 @@
                gettext,
                pkg-config,
                libglib2.0-dev (>= 2.13.5),
-               libpango1.0-dev (>= 1.15.3),
+               libpango1.0-dev (>= 1.17.3),
                libatk1.0-dev (>= 1.9.0),
                libx11-dev (>= 2:1.0.0-6),
                libxext-dev,
@@ -191,6 +191,7 @@
          libxcomposite-dev,
          libxdamage-dev,
          pkg-config
+Recommends: python (>= 2.4)
 Suggests: @DOC_PKG@
 Replaces: libgtk1.3-dev,
           gtk2-engines-pixbuf (<< 2.8.18-5)

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11783&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Tue Jul  3 16:55:25 2007
@@ -291,7 +291,6 @@
 	dh_strip -s --dbg-package=$(DEBUG_PKG)
 	dh_compress -s
 	dh_fixperms -s -Xusr/lib/$(SHARED_PKG)
-	dh_python -s
 	dh_makeshlibs -p$(SHARED_PKG) \
 		-X$(MODULES_BASE_PATH) \
 		-V"$(SHARED_PKG) (>= $(SHVER))" \