On 24.08.2012 19:04, Michael Biebl wrote: > d'oh, forgot to actually attach the patch...
... and the first version was missing the debian/vala-0.16.dirs file. Fixed one attached. Sorry for the noise. Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From faca415886f2954331a622b8e9994e0d97d270a1 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz <ric...@t-online.de> Date: Fri, 24 Aug 2012 19:21:20 +0200 Subject: [PATCH] Merge ubuntu changes of vala-0.18 --- debian/changelog | 18 ++++++++++++++++++ debian/control | 5 +++-- debian/rules | 8 +++++--- debian/valac-0.16.dirs | 1 + debian/valac-0.16.install | 4 ++++ debian/valac-0.16.postinst | 6 +++++- 6 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 debian/valac-0.16.dirs diff --git a/debian/changelog b/debian/changelog index 30ec213..6c4c538 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +vala-0.16 (0.16.1-2) UNRELEASED; urgency=low + + * Merge ubuntu changes of vala-0.18 (done by Iain Lane and Didier Roche) + * valac-0.16.install: + - install the pkgconfig file to detect vapigen install path (LP: #1012304) + * Remove unneeded BD on quilt (thanks, Lintian) + * Install vala.m4/vapigen.m4/Makefile.vapigen/vapigen.pc into a versioned + directory and manage them using alternatives. Create an empty + /usr/share/vala/ directory to hold these. (Closes: #678342) + * debian/control: Conflict with older libvala-*-dev packages which install + vala.m4 + * debian/rules: Remove --sourcedir, so that dh_install can install the above + files which aren't in debian/tmp. + * Run dpkg-gensymbols with -c4 to fail the build if the symbols file is out + of date. + + -- Rico Tzschichholz <ric...@ubuntu.com> Fri, 24 Aug 2012 16:52:49 +0200 + vala-0.16 (0.16.1-1) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index eca1765..aba55c7 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Uploaders: Marc-Andre Lureau <marcandre.lur...@gmail.com>, Sjoerd Simons <sjo...@debian.org>, Sebastian Reichel <s...@debian.org> Build-Depends: debhelper (>= 7), - quilt, libglib2.0-dev (>= 2.26), bison (>= 2.3), autotools-dev, @@ -54,7 +53,9 @@ Depends: ${shlibs:Depends}, valac-0.16-vapi, ${misc:Depends} Conflicts: valac (<< 0.9.5), - vala-utils (<< 0.10) + vala-utils (<< 0.10), + libvala-0.10-dev (<< 0.10.4-2~), + libvala-0.12-dev (<< 0.12.4-3~) Replaces: vala-utils (<< 0.10) Provides: vala-utils Description: C# like language for the GObject system diff --git a/debian/rules b/debian/rules index 713d00d..59c2f3e 100755 --- a/debian/rules +++ b/debian/rules @@ -107,7 +107,8 @@ install: build install-stamp binary-indep: build install dh_testdir dh_testroot - dh_install -i --sourcedir=$(CURDIR)/debian/tmp + dh_install -i + dh_installdirs -i dh_installdocs -i -A NEWS README AUTHORS THANKS dh_installchangelogs -i ChangeLog dh_link -i @@ -121,7 +122,8 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_install -s --sourcedir=$(CURDIR)/debian/tmp + dh_install -s + dh_installdirs -s dh_installdocs -s -A README NEWS AUTHORS THANKS dh_installchangelogs -s ChangeLog dh_installman -s @@ -132,7 +134,7 @@ binary-arch: build install dh_strip -s dh_compress -s dh_fixperms -s - dh_makeshlibs -plibvala-0.16-0 -V + dh_makeshlibs -plibvala-0.16-0 -V -- -c4 dh_installdeb -s dh_shlibdeps -s -ldebian/libvala-0.16-0/usr/lib/$(DEB_HOST_MULTIARCH) dh_gencontrol -s diff --git a/debian/valac-0.16.dirs b/debian/valac-0.16.dirs new file mode 100644 index 0000000..c5a959f --- /dev/null +++ b/debian/valac-0.16.dirs @@ -0,0 +1 @@ +usr/share/vala diff --git a/debian/valac-0.16.install b/debian/valac-0.16.install index d184b04..dd42172 100644 --- a/debian/valac-0.16.install +++ b/debian/valac-0.16.install @@ -6,4 +6,8 @@ usr/bin/vapicheck-0.16 usr/share/man/man1/valac-0.16.1 usr/share/man/man1/vapigen-0.16.1 usr/share/man/man1/vala-gen-introspect-0.16.1 +usr/share/pkgconfig/vapigen-0.16.pc usr/lib/*/vala-0.16/gen-introspect-0.16 +vala.m4 /usr/share/vala-0.16/ +vapigen/vapigen.m4 /usr/share/vala-0.16/ +vapigen/Makefile.vapigen /usr/share/vala-0.16/ diff --git a/debian/valac-0.16.postinst b/debian/valac-0.16.postinst index 7929c87..ceb9af2 100644 --- a/debian/valac-0.16.postinst +++ b/debian/valac-0.16.postinst @@ -10,7 +10,11 @@ update-alternatives --install \ --slave /usr/share/man/man1/valac.1.gz valac.1.gz /usr/share/man/man1/valac-0.16.1.gz \ --slave /usr/share/man/man1/vala.1.gz vala.1.gz /usr/share/man/man1/vala-0.16.1.gz \ --slave /usr/share/man/man1/vala-gen-introspect.1.gz vala-gen-introspect.1.gz /usr/share/man/man1/vala-gen-introspect-0.16.1.gz \ - --slave /usr/share/man/man1/vapigen.1.gz vapigen.1.gz /usr/share/man/man1/vapigen-0.16.1.gz + --slave /usr/share/man/man1/vapigen.1.gz vapigen.1.gz /usr/share/man/man1/vapigen-0.16.1.gz \ + --slave /usr/share/aclocal/vala.m4 vala.m4 /usr/share/vala-0.16/vala.m4 \ + --slave /usr/share/aclocal/vapigen.m4 vapigen.m4 /usr/share/vala-0.16/vapigen.m4 \ + --slave /usr/share/vala/Makefile.vapigen Makefile.vapigen /usr/share/vala-0.16/Makefile.vapigen \ + --slave /usr/share/pkgconfig/vapigen.pc vapigen.pc /usr/share/pkgconfig/vapigen-0.16.pc #DEBHELPER# -- 1.7.10.4
signature.asc
Description: OpenPGP digital signature