Merge branch 'jn/static' into maint
The packaged static library has been useless for compression since
4.999.9beta-1 two and a half years ago.
* jn/static:
Do not let liblzma.a from xzdec-build clobber the real thing
diff --git a/debian/changelog b/debian/changelog
index 9a7cce5..39dffc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@
tests.
* debian/symbols: Bump minimal versions for lzma_easy_buffer_encode
and lzma_stream_buffer_encode.
+ * liblzma-dev: Install an appropriate library for static linking
+ instead of the decompression-only version used to build xzdec.
+ Thanks to Anton Tolchanov. Closes: #673001.
-- Jonathan Nieder <jrnieder@gmail.com> Thu, 24 May 2012 13:23:33 -0500
diff --git a/debian/rules b/debian/rules
index aac2cbb..9612d54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,8 +40,8 @@
check-TESTS
override_dh_auto_install:
- dh_auto_install --builddirectory debian/normal-build
dh_auto_install --builddirectory debian/xzdec-build
+ dh_auto_install --builddirectory debian/normal-build
override_dh_installchangelogs:
dh_installchangelogs debian/changelog.upstream
