Substitute GTK_BINVER_DEP as a substvar rather than using sed
This will make it easier to stop making d/control a generated file.
This commit is contained in:
parent
fe7f8d646a
commit
385cee5c59
6
debian/control
vendored
6
debian/control
vendored
@ -2,7 +2,7 @@ Source: gtk+3.0
|
||||
Section: libs
|
||||
Priority: optional
|
||||
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
|
||||
Uploaders: Simon McVittie <smcv@debian.org>, Jeremy Bícha <jbicha@ubuntu.com>
|
||||
Uploaders: Simon McVittie <smcv@debian.org>, Dmitry Shachnev <mitya57@debian.org>, Jeremy Bícha <jbicha@ubuntu.com>
|
||||
Build-Depends: adwaita-icon-theme-full <!nocheck>,
|
||||
at-spi2-core <!nocheck>,
|
||||
dbus-daemon <!nocheck>,
|
||||
@ -74,7 +74,7 @@ Depends: adwaita-icon-theme,
|
||||
${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
libgtk-3-common (>= ${source:Version})
|
||||
Provides: gtk3-binver-3.0.0
|
||||
Provides: ${gtk:BinVer}
|
||||
Recommends: libgtk-3-bin,
|
||||
librsvg2-common
|
||||
Suggests: gvfs,
|
||||
@ -93,7 +93,7 @@ Section: debian-installer
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends},
|
||||
${shlibs:Depends}
|
||||
Provides: gtk3-binver-3.0.0
|
||||
Provides: ${gtk:BinVer}
|
||||
Description: GTK graphical user interface library - minimal runtime
|
||||
This is a udeb, or a microdeb, for the debian-installer.
|
||||
.
|
||||
|
4
debian/control.in
vendored
4
debian/control.in
vendored
@ -74,7 +74,7 @@ Depends: adwaita-icon-theme,
|
||||
${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
@COMMON_PKG@ (>= ${source:Version})
|
||||
Provides: @GTK_BINVER_DEP@
|
||||
Provides: ${gtk:BinVer}
|
||||
Recommends: @BIN_PKG@,
|
||||
librsvg2-common
|
||||
Suggests: gvfs,
|
||||
@ -93,7 +93,7 @@ Section: debian-installer
|
||||
Architecture: any
|
||||
Depends: ${misc:Depends},
|
||||
${shlibs:Depends}
|
||||
Provides: @GTK_BINVER_DEP@
|
||||
Provides: ${gtk:BinVer}
|
||||
Description: GTK graphical user interface library - minimal runtime
|
||||
This is a udeb, or a microdeb, for the debian-installer.
|
||||
.
|
||||
|
11
debian/rules
vendored
11
debian/rules
vendored
@ -67,7 +67,6 @@ debian/%: debian/%.in
|
||||
-e "s#@SONAME@#$(SONAME)#g" \
|
||||
-e "s#@APIVER@#$(APIVER)#g" \
|
||||
-e "s#@VERSION@#$(DEB_VERSION_UPSTREAM)#g" \
|
||||
-e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \
|
||||
-e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
|
||||
-e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \
|
||||
-e "s#@DEV_PKG@#$(DEV_PKG)#g" \
|
||||
@ -273,11 +272,11 @@ override_dh_makeshlibs:
|
||||
dh_makeshlibs -plibgail-3-0 -- -c4
|
||||
dh_makeshlibs --remaining-packages -X$(MODULES_BASE_PATH)
|
||||
|
||||
dpkg_gencontrol_args = -Vgtk:BinVer=$(GTK_BINVER_DEP)
|
||||
# libcloudproviders is in Ubuntu "universe"
|
||||
override_dh_gencontrol:
|
||||
ifneq ($(shell dpkg-vendor --query vendor),Ubuntu)
|
||||
dh_gencontrol -- \
|
||||
-VcloudProvider:Depends='libcloudproviders-dev (>= 0.3.2)'
|
||||
else
|
||||
dh_gencontrol
|
||||
dpkg_gencontrol_args += -VcloudProvider:Depends='libcloudproviders-dev (>= 0.3.2)'
|
||||
endif
|
||||
|
||||
override_dh_gencontrol:
|
||||
dh_gencontrol -- $(dpkg_gencontrol_args)
|
||||
|
Loading…
Reference in New Issue
Block a user