tags 667246 + patch
thanks
diff -Nru libjsoncpp-0.6.0~rc2/debian/changelog
libjsoncpp-0.6.0~rc2/debian/changelog
--- libjsoncpp-0.6.0~rc2/debian/changelog 2011-12-04 18:46:53.000000000
+0000
+++ libjsoncpp-0.6.0~rc2/debian/changelog 2012-04-17 05:55:03.000000000
+0000
@@ -1,3 +1,10 @@
+libjsoncpp (0.6.0~rc2-2.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Don't hard-code the gcc version. Closes: #667246.
+
+ -- Matthias Klose <d...@debian.org> Tue, 17 Apr 2012 07:54:15 +0200
+
libjsoncpp (0.6.0~rc2-2) unstable; urgency=low
* Bug fix: "jsoncpp headers installed in unexpected location", thanks to
diff -Nru libjsoncpp-0.6.0~rc2/debian/rules libjsoncpp-0.6.0~rc2/debian/rules
--- libjsoncpp-0.6.0~rc2/debian/rules 2011-11-28 17:12:38.000000000 +0000
+++ libjsoncpp-0.6.0~rc2/debian/rules 2012-04-17 05:54:13.000000000 +0000
@@ -4,6 +4,8 @@
DESTDIR=debian/tmp
VERSION=`sed -r s/-rc[0-9]+$$// version`
+GCC_VERSION := $(shell gcc --version | sed -n '1s/.* //p' | sed 's/\..$$//')
+
%:
dh $@
@@ -28,9 +30,9 @@
install -vd $(DESTDIR)/usr/lib/pkgconfig
install -vd $(DESTDIR)/usr/include/json
install -vd $(DESTDIR)/usr/share/doc/jsoncpp-api-html
- install -v libs/linux-gcc-4.6/libjson_linux-gcc-4.6_libmt.so \
+ install -v
libs/linux-gcc-$(GCC_VERSION)/libjson_linux-gcc-$(GCC_VERSION)_libmt.so \
$(DESTDIR)/usr/lib/libjsoncpp.so.$(VERSION)
- install -v libs/linux-gcc-4.6/libjson_linux-gcc-4.6_libmt.a \
+ install -v
libs/linux-gcc-$(GCC_VERSION)/libjson_linux-gcc-$(GCC_VERSION)_libmt.a \
$(DESTDIR)/usr/lib/libjsoncpp.a
install -v -m 0644 debian/pkgconfig/* $(DESTDIR)/usr/lib/pkgconfig
install -v include/json/* $(DESTDIR)/usr/include/json
