retitle 685803: unblock: vala-0.16/0.16.1-2 thanks On 24.08.2012 18:58, Michael Biebl wrote: > Unfortunately, this means that a few important files are no longer > installed because of that, because the are unversioned [1]. > The most important one is /usr/share/aclocal/vala.m4, which provides > macros which are needed if you autoreconf vala using packages. > > To fix that, we intend to install those unversioned files > in /usr/share/vala-0.16/ and manage them via alternatives. > > The current version in wheezy is broken in that regard which severly > limits its usefulness for vala developers. > We thus would like to fix this bug for wheezy. > > A potential debdiff was created by Rico Tzschichholz. > It contains two unrelated changes (dropping unneeded quilt b-dep and > using -c4 for dpkg-gensymbols, which are a result of the Ubuntu merge). > If you consider those changes inappropriate for wheezy, let us know.
I've dropped the unrelated changes which are not necessary to fix #678342 and uploaded 0.16.1-2. New debdiff attached. Cheers, Michael unblock vala-0.16/0.16.1-2 -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/changelog b/debian/changelog
index 30ec213..21f24ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+vala-0.16 (0.16.1-2) unstable; urgency=low
+
+ * Team upload.
+
+ [ Rico Tzschichholz ]
+ * valac-0.16.install:
+ - install the pkgconfig file to detect vapigen install path (LP: #1012304)
+ * 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.
+
+ -- Michael Biebl <bi...@debian.org> Wed, 05 Sep 2012 02:38:39 +0200
+
vala-0.16 (0.16.1-1) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index eca1765..d3a3707 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,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..484cf6c 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
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#
signature.asc
Description: OpenPGP digital signature
