1 files changed, 20 insertions, 15 deletions
diff --git a/debian/rules b/debian/rules
index 3583ed4f7..d194653ef 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file - for GNUPG (0.9.10)
+# debian/rules file - for GNUPG (1.0.3)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998 James Troup
@@ -32,26 +32,31 @@ binary-arch:	checkroot build # test
 	$(checkdir)
 	-rm -rf debian/tmp
 	install -d debian/tmp/DEBIAN/
-	install -m 755 debian/preinst debian/postinst debian/postrm debian/tmp/DEBIAN/
-	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	install -m 755 debian/preinst debian/prerm debian/postinst debian/postrm debian/tmp/DEBIAN/
+	$(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install
 	strip debian/tmp/usr/bin/*
+	chmod 644 debian/tmp/usr/lib/gnupg/*
 	sed -e "s#../g10/gpg#gpg#" < tools/lspgpot > debian/tmp/usr/bin/lspgpot
 	chmod 755 debian/tmp/usr/bin/lspgpot
 	strip --strip-unneeded debian/tmp/usr/lib/gnupg/*
-	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/man/man1/gpg.1 \
-	    > debian/tmp/usr/man/man1/gpg.1.new
-	mv debian/tmp/usr/man/man1/gpg.1.new debian/tmp/usr/man/man1/gpg.1
-	gzip -9v debian/tmp/usr/man/man1/*
-	install -d debian/tmp/usr/doc/gnupg/
-	install -m 644 debian/changelog debian/tmp/usr/doc/gnupg/changelog.Debian
+	# In response to #53714... no idea if it's correct, will check with upstream
+	mv debian/tmp/usr/share/locale/es_ES debian/tmp/usr/share/locale/es
+	sed -e "s#/usr/local/#/usr/#" < debian/tmp/usr/share/man/man1/gpg.1 \
+	    > debian/tmp/usr/share/man/man1/gpg.1.new
+	mv debian/tmp/usr/share/man/man1/gpg.1.new debian/tmp/usr/share/man/man1/gpg.1
+	gzip -9v debian/tmp/usr/share/man/man1/*
+	# Remove from /usr/share/gnupg that we install into /usr/share/doc/gnupg/
+	rm debian/tmp/usr/share/gnupg/FAQ debian/tmp/usr/share/gnupg/faq.html
+	install -d debian/tmp/usr/share/doc/gnupg/
+	install -m 644 debian/changelog debian/tmp/usr/share/doc/gnupg/changelog.Debian
 	install -m 644 debian/README.Debian README NEWS THANKS TODO doc/DETAILS \
-		doc/FAQ doc/OpenPGP debian/tmp/usr/doc/gnupg/
+		doc/FAQ doc/faq.html doc/OpenPGP debian/tmp/usr/share/doc/gnupg/
 	for i in po util mpi cipher tools g10 checks include; do \
-		install -m 644 $$i/ChangeLog debian/tmp/usr/doc/gnupg/changelog.$$i; done
-	install -m 644 ChangeLog debian/tmp/usr/doc/gnupg/changelog.toplevel
-	gzip -9v debian/tmp/usr/doc/gnupg/*
-	ln -s changelog.g10.gz debian/tmp/usr/doc/gnupg/changelog.gz
-	install -m 644 debian/copyright debian/tmp/usr/doc/gnupg/
+		install -m 644 $$i/ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.$$i; done
+	install -m 644 ChangeLog debian/tmp/usr/share/doc/gnupg/changelog.toplevel
+	gzip -9v debian/tmp/usr/share/doc/gnupg/*
+	ln -s changelog.g10.gz debian/tmp/usr/share/doc/gnupg/changelog.gz
+	install -m 644 debian/copyright debian/tmp/usr/share/doc/gnupg/
 	dpkg-shlibdeps g10/gpg
 	dpkg-gencontrol -isp
 	chown -R root.root debian/tmp