8 files changed, 16 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index b10dbbd..127199b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ interimap (0.5.1-1) UNRELEASED; urgency=medium
   * d/control: Annotate some Build-Depends with <!nocheck>.
   * d/control: Bump debhelper compatibility level to 13.
   * d/patches/Ignore-custom-lib-PATH.patch: Remove patch, applied upstream.
+  * Adapt d/*.docs, d/*.install and d/*.manpages to the current upstream
+    Makefile.
 
  -- Guilhem Moulin <guilhem@debian.org>  Wed, 01 Jul 2020 19:26:24 +0200
 
diff --git a/debian/interimap.docs b/debian/interimap.docs
index d2febd0..bc0d414 100644
--- a/debian/interimap.docs
+++ b/debian/interimap.docs
@@ -1,4 +1,5 @@
-README
-doc/getting-started.md
-doc/multi-account.md
-interimap.sample
+share/doc/interimap/README
+share/doc/interimap/getting-started.md
+share/doc/interimap/multi-account.md
+share/doc/interimap/interimap.sample
+share/doc/interimap/getting-started.md
diff --git a/debian/interimap.install b/debian/interimap.install
index 4e95d07..dc47f19 100644
--- a/debian/interimap.install
+++ b/debian/interimap.install
@@ -1,3 +1,3 @@
-interimap /usr/bin
-interimap.service  usr/lib/systemd/user
-interimap@.service usr/lib/systemd/user
+bin/interimap /usr/bin
+lib/systemd/user/interimap.service  usr/lib/systemd/user
+lib/systemd/user/interimap@.service usr/lib/systemd/user
diff --git a/debian/interimap.manpages b/debian/interimap.manpages
index 52bd645..faa1e84 100644
--- a/debian/interimap.manpages
+++ b/debian/interimap.manpages
@@ -1 +1 @@
-doc/interimap.1
+share/man/man1/interimap.1
diff --git a/debian/libinterimap.install b/debian/libinterimap.install
index c79d222..c446f51 100644
--- a/debian/libinterimap.install
+++ b/debian/libinterimap.install
@@ -1 +1 @@
-lib/Net/IMAP/InterIMAP.pm /usr/share/perl5/Net/IMAP
+share/perl5/Net/IMAP/InterIMAP.pm /usr/share/perl5/Net/IMAP
diff --git a/debian/pullimap.docs b/debian/pullimap.docs
index 7a3ecbb..c368061 100644
--- a/debian/pullimap.docs
+++ b/debian/pullimap.docs
@@ -1 +1 @@
-pullimap.sample
+share/doc/pullimap/pullimap.sample
diff --git a/debian/pullimap.install b/debian/pullimap.install
index 581805d..88dbf02 100644
--- a/debian/pullimap.install
+++ b/debian/pullimap.install
@@ -1,2 +1,2 @@
-pullimap /usr/bin
-pullimap@.service usr/lib/systemd/user
+bin/pullimap /usr/bin
+lib/systemd/user/pullimap@.service usr/lib/systemd/user
diff --git a/debian/pullimap.manpages b/debian/pullimap.manpages
index 0d791aa..c620789 100644
--- a/debian/pullimap.manpages
+++ b/debian/pullimap.manpages
@@ -1 +1 @@
-doc/pullimap.1
+share/man/man1/pullimap.1