[m-rev.] packaging diff: Seperate the remove-paths patch from the version patch

[Paul Bone]

Seperate the remove-paths patch from the version patch

Debian packages can contain a series of patches.  We use one patch to
adjust the version number that gets compiled into Mercury, and had
conflated it with another patch (now seperate) to remove some paths from
the README.md file.

debian/patches/remove-paths:
debian/patches/series:
    Add new patch.

debian/patches/version:
    Update existing patch.
---
 debian/patches/remove-paths | 20 ++++++++++++++++++++
 debian/patches/series       |  1 +
 debian/patches/version      | 32 ++++++++++----------------------
 3 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 debian/patches/remove-paths

diff --git a/debian/patches/remove-paths b/debian/patches/remove-paths
new file mode 100644
index 0000000..55f1fec
--- /dev/null
+++ b/debian/patches/remove-paths
@@ -0,0 +1,20 @@
+Remove mentions of filepaths that are incorrect for the debian package of
+Mercury.
+
+--- a/README
++++ b/README
+@@ -82,12 +82,8 @@
+ 
+ The documentation sources are in the `doc' subdirectory.  The installation
+ process will install INFO, HTML, and DVI versions in the locations specified
+-in the file Mmake.common - by default these locations are
+-/usr/local/mercury-14.01.1/info,
+-/usr/local/mercury-14.01.1/lib/mercury/html,
+-and /usr/local/mercury-14.01.1/lib/mercury/doc respectively.
+-The installation process will also install Unix-style man pages -
+-by default they will be installed in /usr/local/mercury-14.01.1/man/man1.
++in the file Mmake.common.
++The installation process will also install Unix-style man pages.
+ The files RELEASE_NOTES, NEWS, HISTORY, LIMITATIONS, and BUGS
+ also contain useful information.  If you're interested in looking
+ at the source code, the file compiler/notes/compiler_design.html is
diff --git a/debian/patches/series b/debian/patches/series
index ed1056d..9926f02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # You must remove unused comment lines for the released package.
 copyright-in-readme
 realclean
+remove-paths
 version
diff --git a/debian/patches/version b/debian/patches/version
index 7640767..7a85b58 100644
--- a/debian/patches/version
+++ b/debian/patches/version
@@ -1,3 +1,13 @@
+Update version number
+--- a/README
++++ b/README
+@@ -1,5 +1,5 @@
+ This directory contains the source distribution for the University of Melbourne
+-Mercury compiler, version 14.01.1.
++Mercury compiler, version 14.01.1-2.
+ 
+ 	The Mercury implementation is free software.
+ 	It is:
 --- a/VERSION
 +++ b/VERSION
 @@ -7,7 +7,7 @@
@@ -9,25 +19,3 @@
  
  # We use the following general scheme for version numbers:
  #
---- a/README
-+++ b/README
-@@ -1,5 +1,5 @@
- This directory contains the source distribution for the University of Melbourne
--Mercury compiler, version 14.01.1.
-+Mercury compiler, version 14.01.1-2.
- 
- 	The Mercury implementation is free software.
- 	It is:
-@@ -82,12 +82,7 @@
- 
- The documentation sources are in the `doc' subdirectory.  The installation
- process will install INFO, HTML, and DVI versions in the locations specified
--in the file Mmake.common - by default these locations are
--/usr/local/mercury-14.01.1/info,
--/usr/local/mercury-14.01.1/lib/mercury/html,
--and /usr/local/mercury-14.01.1/lib/mercury/doc respectively.
- The installation process will also install Unix-style man pages -
--by default they will be installed in /usr/local/mercury-14.01.1/man/man1.
- The files RELEASE_NOTES, NEWS, HISTORY, LIMITATIONS, and BUGS
- also contain useful information.  If you're interested in looking
- at the source code, the file compiler/notes/compiler_design.html is
-- 
2.17.1