* Don't call dh_python; use a hardcoded python dep instead.
* Really build-dep on a newer pango.
This commit is contained in:
parent
6421588183
commit
e7ae9a955c
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -5,10 +5,10 @@ gtk+2.0 (2.11.5-1) experimental; urgency=low
|
||||
- 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.
|
||||
|
3
debian/control
vendored
3
debian/control
vendored
@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.22),
|
||||
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 @@ Depends: libgtk2.0-0 (= ${binary:Version}),
|
||||
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)
|
||||
|
3
debian/control.in
vendored
3
debian/control.in
vendored
@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.22),
|
||||
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 @@ Depends: @SHARED_PKG@ (= ${binary:Version}),
|
||||
libxcomposite-dev,
|
||||
libxdamage-dev,
|
||||
pkg-config
|
||||
Recommends: python (>= 2.4)
|
||||
Suggests: @DOC_PKG@
|
||||
Replaces: libgtk1.3-dev,
|
||||
gtk2-engines-pixbuf (<< 2.8.18-5)
|
||||
|
1
debian/rules
vendored
1
debian/rules
vendored
@ -291,7 +291,6 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
|
||||
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))" \
|
||||
|
Loading…
Reference in New Issue
Block a user