diff -Nru geany-1.32/debian/changelog geany-1.32/debian/changelog --- geany-1.32/debian/changelog 2017-12-24 10:09:25.000000000 +0000 +++ geany-1.32/debian/changelog 2018-01-08 17:17:14.000000000 +0000 @@ -1,3 +1,13 @@ +geany (1.32-2) unstable; urgency=medium + + * [63e6a67] Split build-deps into multiple lines + * [8d2ab35] Build with gtk3 + * [1971363] Extract GEANY_ABI_VERSION and GEANY_API_VERSION properly. + These values are shifted left by some bits when gtk3 is enabled, so we can't + just use awk magic alone to dig it out of plugindata.h + + -- Chow Loong Jin Tue, 09 Jan 2018 01:17:14 +0800 + geany (1.32-1) unstable; urgency=medium * [59dd949] Add eht16's GPG key to signing-key.asc diff -Nru geany-1.32/debian/clean geany-1.32/debian/clean --- geany-1.32/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ geany-1.32/debian/clean 2018-01-08 17:17:14.000000000 +0000 @@ -0,0 +1 @@ +debian/dumpabiver diff -Nru geany-1.32/debian/control geany-1.32/debian/control --- geany-1.32/debian/control 2017-12-24 10:09:25.000000000 +0000 +++ geany-1.32/debian/control 2018-01-08 17:17:14.000000000 +0000 @@ -7,7 +7,14 @@ Homepage: http://www.geany.org Vcs-Git: https://anonscm.debian.org/git/pkg-geany/packages/geany.git Vcs-Browser: https://anonscm.debian.org/git/pkg-geany/packages/geany.git -Build-Depends: debhelper (>= 9), libgtk2.0-dev, libglib2.0-dev, libatk1.0-dev, libpango1.0-dev, intltool, chrpath, dh-autoreconf +Build-Depends: debhelper (>= 9), + libgtk-3-dev, + libglib2.0-dev, + libatk1.0-dev, + libpango1.0-dev, + intltool, + chrpath, + dh-autoreconf Standards-Version: 3.9.8 Package: geany diff -Nru geany-1.32/debian/dumpabiver.c geany-1.32/debian/dumpabiver.c --- geany-1.32/debian/dumpabiver.c 1970-01-01 00:00:00.000000000 +0000 +++ geany-1.32/debian/dumpabiver.c 2018-01-08 17:17:14.000000000 +0000 @@ -0,0 +1,9 @@ +#include "geany.h" +#include "plugindata.h" + +int main() +{ + printf("GEANY_ABI=geany-abi-%d\nGEANY_API=geany-api-%d\n", + GEANY_ABI_VERSION, GEANY_API_VERSION); + return 0; +} diff -Nru geany-1.32/debian/rules geany-1.32/debian/rules --- geany-1.32/debian/rules 2017-12-24 10:09:25.000000000 +0000 +++ geany-1.32/debian/rules 2018-01-08 17:17:14.000000000 +0000 @@ -10,7 +10,7 @@ NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_auto_configure: - dh_auto_configure -- --enable-vte --enable-the-force + dh_auto_configure -- --enable-vte --enable-the-force --enable-gtk3 sed -i -r 's,^sys_lib_dlsearch_path_spec="(.*)$$,sys_lib_dlsearch_path_spec="/usr/lib /lib \1,' $(CURDIR)/libtool override_dh_auto_install: @@ -29,9 +29,13 @@ override_dh_install: dh_install --list-missing -override_dh_gencontrol: - echo -n "geany:Provides=geany-abi-`grep 'define GEANY_ABI_VERSION' src/plugindata.h |awk '{print $$3}' |sed 's#[^0-9]##g'`," \ - >> debian/geany.substvars - echo " geany-api-`grep 'define GEANY_API_VERSION' src/plugindata.h |awk '{print $$3}' |sed 's#[^0-9]##g'`" \ - >> debian/geany.substvars - dh_gencontrol +debian/dumpabiver: debian/dumpabiver.c + $(CC) -o $@ $< \ + -Isrc -Isrc/tagmanager -Iscintilla/include \ + $(shell pkg-config --cflags --libs glib-2.0 gtk+-3.0 gthread-2.0) \ + -DGTK -DGEANY_PRIVATE + +override_dh_gencontrol: debian/dumpabiver + eval $(shell $<) && \ + dh_gencontrol -- \ + "-Vgeany:Provides=$${GEANY_ABI}, $${GEANY_API}"