3 files changed, 36 insertions, 97 deletions
diff --git a/.gitignore b/.gitignore
index f168f8151..8b38cec7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -528,100 +528,3 @@ asn1_*.[cx]
 /tools/krb5-gssapi.pc
 /tools/krb5.pc
 /tools/krb5-config
-
-# Debian
-/debian/autoreconf.after
-/debian/autoreconf.before
-/debian/*.debhelper.log
-/include/hcrypto/aes.h
-/include/hcrypto/bn.h
-/include/hcrypto/des.h
-/include/hcrypto/dh.h
-/include/hcrypto/dsa.h
-/include/hcrypto/ec.h
-/include/hcrypto/ecdh.h
-/include/hcrypto/ecdsa.h
-/include/hcrypto/engine.h
-/include/hcrypto/evp-cc.h
-/include/hcrypto/evp-hcrypto.h
-/include/hcrypto/evp.h
-/include/hcrypto/hmac.h
-/include/hcrypto/md2.h
-/include/hcrypto/md4.h
-/include/hcrypto/md5.h
-/include/hcrypto/pkcs12.h
-/include/hcrypto/rand.h
-/include/hcrypto/rc2.h
-/include/hcrypto/rc4.h
-/include/hcrypto/rsa.h
-/include/hcrypto/sha.h
-/include/hcrypto/ui.h
-/lib/hcrypto/hcrypto
-/lib/hcrypto/hcrypto-link
-/lib/hcrypto/test_rand
-debian/heimdal-clients-x
-debian/heimdal-clients/
-debian/heimdal-dev/
-debian/heimdal-docs/
-debian/heimdal-kdc/
-debian/heimdal-multidev/
-debian/tmp/
-lib/hdb/test_hdbplugin
-*.substvars
-*.debhelper
-debian/files
-debian/heimdal-dbg/
-debian/heimdal-kcm/
-debian/heimdal-servers-x/
-debian/heimdal-servers/
-debian/libasn1-8-heimdal/
-debian/libgssapi3-heimdal/
-debian/libhcrypto4-heimdal/
-debian/libhdb9-heimdal/
-debian/libheimbase1-heimdal/
-debian/libheimntlm0-heimdal/
-debian/libhx509-5-heimdal/
-debian/libkadm5clnt7-heimdal/
-debian/libkadm5srv8-heimdal/
-debian/libkafs0-heimdal/
-debian/libkdc2-heimdal/
-debian/libkrb5-26-heimdal/
-debian/libotp0-heimdal/
-debian/libroken18-heimdal/
-debian/libsl0-heimdal/
-debian/libwind0-heimdal/
-lib/gssapi/test_add_store_cred
-lib/hcrypto/crypto-test
-lib/hcrypto/crypto-test2
-lib/hcrypto/destest
-lib/hcrypto/error
-lib/hcrypto/example_evp_cipher
-lib/hcrypto/mdtest
-lib/hcrypto/rc2test
-lib/hcrypto/rctest
-lib/hcrypto/test-out-1
-lib/hcrypto/test-out-15
-lib/hcrypto/test-out-16
-lib/hcrypto/test-out-17
-lib/hcrypto/test-out-31
-lib/hcrypto/test-out-32
-lib/hcrypto/test-out-33
-lib/hcrypto/test-out-7
-lib/hcrypto/test_bn
-lib/hcrypto/test_bulk
-lib/hcrypto/test_cipher
-lib/hcrypto/test_crypto
-lib/hcrypto/test_dh
-lib/hcrypto/test_engine_dso
-lib/hcrypto/test_hmac
-lib/hcrypto/test_pkcs12
-lib/hcrypto/test_pkcs5
-lib/hcrypto/test_rsa
-lib/hcrypto/unix
-lib/roken/test-detach
-tests/bin/intr
-tests/gss/check-basic
-tests/gss/krb5ccfile2
-tests/kdc/foopassword.rkpty
-tests/kdc/krb5-slave2.conf
-tests/kdc/notfoopassword
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 000000000..b04fced5d
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,34 @@
+autoreconf.after
+autoreconf.before
+*.debhelper.log
+heimdal-clients-x
+heimdal-clients/
+heimdal-dev/
+heimdal-docs/
+heimdal-kdc/
+heimdal-multidev/
+tmp/
+*.substvars
+*.debhelper
+files
+heimdal-dbg/
+heimdal-kcm/
+heimdal-servers-x/
+heimdal-servers/
+libasn1-8-heimdal/
+libgssapi3-heimdal/
+libhcrypto4-heimdal/
+libhdb9-heimdal/
+libheimbase1-heimdal/
+libheimntlm0-heimdal/
+libhx509-5-heimdal/
+libkadm5clnt7-heimdal/
+libkadm5srv8-heimdal/
+libkafs0-heimdal/
+libkdc2-heimdal/
+libkrb5-26-heimdal/
+libotp0-heimdal/
+libroken18-heimdal/
+libsl0-heimdal/
+libwind0-heimdal/
+debhelper-build-stamp
diff --git a/debian/rules b/debian/rules
index afcbcee34..9580fe385 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,6 +113,8 @@ override_dh_install:
 	mkdir -p debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal
 	mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.a \
 		debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal
+	mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
+		debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal
 	mv $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so \
 		debian/heimdal-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/heimdal
 	# remove general purpose utilities