[m-rev.] patch: Update Debian packaging information for a ROTD build

Paul Bone paul at bone.id.au
Sun Nov 18 16:39:19 AEDT 2018
Previous message: [m-rev.] ROTD packaging branch
Next message: [m-rev.] patch: Update the README.Debian with more info about grades
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update Debian packaging information for a ROTD build

This changes the package names and versions so that they'll build the
most recent ROTD 2018-11-14.

The package names begin with mercury-rotd rather than mercury and they
conflict with the mercury equivilents so that users cannot attempt to
install an ROTD and a stable version at the same time.

debian/changelog:
debian/control:
debian/copyright:
    Update meta-data.

debian/mercury-*.{install,dirs} -> debian/mercury-rotd-*.{install,dirs}:
    Rename package file lists.

debian/patches/copyright-in-readme:
debian/patches/dont-install-in-files:
debian/patches/fix-install-location:
debian/patches/realclean:
    Remove old patches.

debian/patches/remove-paths:
debian/patches/version:
    Update patches with new version numbers.

debian/patches/series:
    Update patch series.

debian/rules:
    Build the asm_fast grades.

    Remove a old work-around.
---
 debian/changelog                              |   6 +
 debian/control                                | 164 ++++++++++--------
 debian/copyright                              |   4 +-
 debian/mercury-llc-dev.install                |   4 -
 debian/mercury-llc.install                    |   2 -
 debian/mercury-llcpar-dev.install             |   4 -
 debian/mercury-llcpar.install                 |   2 -
 debian/mercury-llctrail-dev.install           |   4 -
 debian/mercury-llctrail.install               |   2 -
 ...vel.install => mercury-rotd-devel.install} |   0
 ...rcury-docs.docs => mercury-rotd-docs.docs} |   2 -
 ...rcury-docs.info => mercury-rotd-docs.info} |   0
 ...docs.install => mercury-rotd-docs.install} |   0
 ...xamples => mercury-rotd-examples.examples} |   0
 ...ev.install => mercury-rotd-gc-dev.install} |   0
 ...ury-gc.install => mercury-rotd-gc.install} |   0
 ...v.install => mercury-rotd-hlc-dev.install} |   0
 ...y-hlc.install => mercury-rotd-hlc.install} |   0
 ...nstall => mercury-rotd-hlcpar-dev.install} |   0
 ...ar.install => mercury-rotd-hlcpar.install} |   0
 ...tall => mercury-rotd-hlctrail-dev.install} |   0
 ....install => mercury-rotd-hlctrail.install} |   0
 debian/mercury-rotd-llc-dev.install           |   4 +
 debian/mercury-rotd-llc.install               |   2 +
 debian/mercury-rotd-llcpar-dev.install        |   4 +
 debian/mercury-rotd-llcpar.install            |   2 +
 debian/mercury-rotd-llctrail-dev.install      |   4 +
 debian/mercury-rotd-llctrail.install          |   2 +
 ...stall => mercury-rotd-maintainers.install} |   0
 ...ages => mercury-rotd-maintainers.manpages} |   0
 ...s.examples => mercury-rotd-tools.examples} |   0
 ...ols.install => mercury-rotd-tools.install} |   0
 ...s.manpages => mercury-rotd-tools.manpages} |   0
 debian/patches/copyright-in-readme            |  17 --
 debian/patches/dont-install-in-files          |  14 --
 debian/patches/fix-install-location           | 108 ------------
 debian/patches/realclean                      |  33 ----
 debian/patches/remove-paths                   |  10 +-
 debian/patches/series                         |   4 +-
 debian/patches/version                        |  12 +-
 debian/rules                                  |   3 +-
 41 files changed, 130 insertions(+), 283 deletions(-)
 delete mode 100644 debian/mercury-llc-dev.install
 delete mode 100644 debian/mercury-llc.install
 delete mode 100644 debian/mercury-llcpar-dev.install
 delete mode 100644 debian/mercury-llcpar.install
 delete mode 100644 debian/mercury-llctrail-dev.install
 delete mode 100644 debian/mercury-llctrail.install
 rename debian/{mercury-devel.install => mercury-rotd-devel.install} (100%)
 rename debian/{mercury-docs.docs => mercury-rotd-docs.docs} (90%)
 rename debian/{mercury-docs.info => mercury-rotd-docs.info} (100%)
 rename debian/{mercury-docs.install => mercury-rotd-docs.install} (100%)
 rename debian/{mercury-examples.examples => mercury-rotd-examples.examples} (100%)
 rename debian/{mercury-gc-dev.install => mercury-rotd-gc-dev.install} (100%)
 rename debian/{mercury-gc.install => mercury-rotd-gc.install} (100%)
 rename debian/{mercury-hlc-dev.install => mercury-rotd-hlc-dev.install} (100%)
 rename debian/{mercury-hlc.install => mercury-rotd-hlc.install} (100%)
 rename debian/{mercury-hlcpar-dev.install => mercury-rotd-hlcpar-dev.install} (100%)
 rename debian/{mercury-hlcpar.install => mercury-rotd-hlcpar.install} (100%)
 rename debian/{mercury-hlctrail-dev.install => mercury-rotd-hlctrail-dev.install} (100%)
 rename debian/{mercury-hlctrail.install => mercury-rotd-hlctrail.install} (100%)
 create mode 100644 debian/mercury-rotd-llc-dev.install
 create mode 100644 debian/mercury-rotd-llc.install
 create mode 100644 debian/mercury-rotd-llcpar-dev.install
 create mode 100644 debian/mercury-rotd-llcpar.install
 create mode 100644 debian/mercury-rotd-llctrail-dev.install
 create mode 100644 debian/mercury-rotd-llctrail.install
 rename debian/{mercury-maintainers.install => mercury-rotd-maintainers.install} (100%)
 rename debian/{mercury-maintainers.manpages => mercury-rotd-maintainers.manpages} (100%)
 rename debian/{mercury-tools.examples => mercury-rotd-tools.examples} (100%)
 rename debian/{mercury-tools.install => mercury-rotd-tools.install} (100%)
 rename debian/{mercury-tools.manpages => mercury-rotd-tools.manpages} (100%)
 delete mode 100644 debian/patches/copyright-in-readme
 delete mode 100644 debian/patches/dont-install-in-files
 delete mode 100644 debian/patches/fix-install-location
 delete mode 100644 debian/patches/realclean

diff --git a/debian/changelog b/debian/changelog
index b5918e2..fd506dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mercury-rotd (20181114-1) mercury-stretch; urgency=low
+
+  * Update Mercury to rotd-2018-11-14
+
+ -- Paul Bone <paul at bone.id.au>  Fri, 16 Nov 2018 23:08:52 +1100
+
 mercury (14.01.1-3) mercury-sid; urgency=low
 
   * Seperate the remove-paths patch from the version patch
diff --git a/debian/control b/debian/control
index 125fbe4..edd7fab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mercury
+Source: mercury-rotd
 Section: devel
 Priority: optional
 Maintainer: Paul Bone <paul at bone.id.au>
@@ -7,13 +7,14 @@ Build-Depends: debhelper (>=9.20160114), autoconf, automake, flex, bison,
 Standards-Version: 3.9.7
 Homepage: http://mercurylang.org
 
-Package: mercury-tools
+Package: mercury-rotd-tools
 Architecture: i386 amd64
 Depends: ${misc:Depends}, ${shlibs:Depends}, perl, gcc
-Recommends: mercury-gc-dev,
-  mercury-hlc-dev | mercury-hlcpar-dev | mercury-hlctrail-dev |
-  mercury-llc-dev | mercury-llcpar-dev | mercury-llctrail-dev
-Suggests: mercury-docs, mercury-examples, mercury-devel
+Recommends: mercury-rotd-gc-dev,
+  mercury-rotd-hlc-dev | mercury-rotd-hlcpar-dev | mercury-rotd-hlctrail-dev |
+  mercury-rotd-llc-dev | mercury-rotd-llcpar-dev | mercury-rotd-llctrail-dev
+Suggests: mercury-rotd-docs, mercury-rotd-examples, mercury-rotd-devel
+Conflicts: mercury-tools
 Description: Mercury programming language tools
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -27,12 +28,12 @@ Description: Mercury programming language tools
  .
  This package contains the compiler, debugging and profiling tools.
 
-Package: mercury-recommended
+Package: mercury-rotd-recommended
 Architecture: any
-Depends: ${misc:Depends}, mercury-tools,
-  mercury-hlc-dev, mercury-hlcpar-dev,
-  mercury-llc-dev, mercury-llcpar-dev,
-  mercury-devel, mercury-docs
+Depends: ${misc:Depends}, mercury-rotd-tools,
+  mercury-rotd-hlc-dev, mercury-rotd-hlcpar-dev,
+  mercury-rotd-llc-dev, mercury-rotd-llcpar-dev,
+  mercury-rotd-devel, mercury-rotd-docs
 Description: Mercury programming language tools
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -47,10 +48,11 @@ Description: Mercury programming language tools
  This meta-package depends on packages for a reasonable Mercury development
  environment.
 
-Package: mercury-gc
+Package: mercury-rotd-gc
 Architecture: i386 amd64
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: mercury-gc
 Description: Mercury programming language garbage collector
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -65,11 +67,12 @@ Description: Mercury programming language garbage collector
  This package contains the Mercury fork of the Boehm-Demers-Weiser garbage
  collector required to run Mercury programs.
 
-Package: mercury-gc-dev
+Package: mercury-rotd-gc-dev
 Architecture: i386 amd64
 Section: libdevel
-Depends: ${misc:Depends}, mercury-gc (= 14.01.1-3)
-Recommends: mercury-tools
+Depends: ${misc:Depends}, mercury-rotd-gc (= 20181114-1)
+Recommends: mercury-rotd-tools
+Conflicts: mercury-gc-dev
 Description: Mercury programming language garbage collector
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -85,10 +88,11 @@ Description: Mercury programming language garbage collector
  fork of the Boehm-Demers-Weiser garbage collector required to run Mercury
  programs.  It also contains a number of grade-agnostic development files.
 
-Package: mercury-hlc
+Package: mercury-rotd-hlc
 Architecture: i386 amd64
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-3)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-rotd-gc (= 20181114-1)
+Conflicts: mercury-hlc
 Description: Mercury programming language runtime (hlc.gc)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -103,12 +107,13 @@ Description: Mercury programming language runtime (hlc.gc)
  This package contains dynamic libraries for Mercury programs built in the
  hlc.gc grade.
 
-Package: mercury-hlc-dev
+Package: mercury-rotd-hlc-dev
 Architecture: i386 amd64
 Section: libdevel
-Depends: ${misc:Depends}, mercury-gc-dev (= 14.01.1-3),
-  mercury-hlc (= 14.01.1-3)
-Recommends: mercury-tools (= 14.01.1-3)
+Depends: ${misc:Depends}, mercury-rotd-gc-dev (= 20181114-1),
+  mercury-rotd-hlc (= 20181114-1)
+Recommends: mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-hlc-dev
 Description: Mercury programming language development files (hlc.gc)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -123,10 +128,11 @@ Description: Mercury programming language development files (hlc.gc)
  This package contains header files, interface files and static libraries for
  the hlc.gc grade.
 
-Package: mercury-hlcpar
+Package: mercury-rotd-hlcpar
 Architecture: i386 amd64
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-3)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-rotd-gc (= 20181114-1)
+Conflicts: mercury-hlcpar
 Description: Mercury programming language runtime (hlc.par.gc)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -141,12 +147,13 @@ Description: Mercury programming language runtime (hlc.par.gc)
  This package contains dynamic libraries for Mercury programs built in the
  hlc.par.gc grade.
 
-Package: mercury-hlcpar-dev
+Package: mercury-rotd-hlcpar-dev
 Architecture: i386 amd64
 Section: libdevel
 Depends: ${misc:Depends}, libhwloc-dev, 
-  mercury-gc-dev (= 14.01.1-3), mercury-hlcpar (= 14.01.1-3)
-Recommends: mercury-tools (= 14.01.1-3)
+  mercury-rotd-gc-dev (= 20181114-1), mercury-rotd-hlcpar (= 20181114-1)
+Recommends: mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-hlcpar-dev
 Description: Mercury programming language development files (hlc.par.gc)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -161,10 +168,11 @@ Description: Mercury programming language development files (hlc.par.gc)
  This package contains header files, interface files and static libraries for
  the hlc.par.gc grade.
 
-Package: mercury-hlctrail
+Package: mercury-rotd-hlctrail
 Architecture: i386 amd64
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-3)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-rotd-gc (= 20181114-1)
+Conflicts: mercury-hlctrail
 Description: Mercury programming language runtime (hlc.gc.trseg)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -179,12 +187,13 @@ Description: Mercury programming language runtime (hlc.gc.trseg)
  This package contains dynamic libraries for Mercury programs built in the
  hlc.gc.trseg grade.
 
-Package: mercury-hlctrail-dev
+Package: mercury-rotd-hlctrail-dev
 Architecture: i386 amd64
 Section: libdevel
-Depends: ${misc:Depends}, mercury-gc-dev (= 14.01.1-3),
-  mercury-hlctrail (= 14.01.1-3)
-Recommends: mercury-tools (= 14.01.1-3)
+Depends: ${misc:Depends}, mercury-rotd-gc-dev (= 20181114-1),
+  mercury-rotd-hlctrail (= 20181114-1)
+Recommends: mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-hlctrail-dev
 Description: Mercury programming language development files (hlc.gc.trseg)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -199,11 +208,12 @@ Description: Mercury programming language development files (hlc.gc.trseg)
  This package contains header files, interface files and static libraries for
  the hlc.gc.trseg grade.
 
-Package: mercury-llc
+Package: mercury-rotd-llc
 Architecture: i386 amd64
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-3)
-Description: Mercury programming language runtime (reg.gc)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-rotd-gc (= 20181114-1)
+Conflicts: mercury-llc
+Description: Mercury programming language runtime (asm_fast.gc)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
  and error detection features.
@@ -215,15 +225,16 @@ Description: Mercury programming language runtime (reg.gc)
  trade-offs.
  .
  This package contains dynamic libraries for Mercury programs built in the
- reg.gc grade.
+ asm_fast.gc grade.
 
-Package: mercury-llc-dev
+Package: mercury-rotd-llc-dev
 Architecture: i386 amd64
 Section: libdevel
-Depends: ${misc:Depends}, mercury-gc-dev (= 14.01.1-3),
-  mercury-llc (= 14.01.1-3)
-Recommends: mercury-tools (= 14.01.1-3)
-Description: Mercury programming language development files (reg.gc)
+Depends: ${misc:Depends}, mercury-rotd-gc-dev (= 20181114-1),
+  mercury-rotd-llc (= 20181114-1)
+Recommends: mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-llc-dev
+Description: Mercury programming language development files (asm_fast.gc)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
  and error detection features.
@@ -235,13 +246,14 @@ Description: Mercury programming language development files (reg.gc)
  trade-offs.
  .
  This package contains header files, interface files and static libraries for
- the reg.gc grade.
+ the asm_fast.gc grade.
 
-Package: mercury-llcpar
+Package: mercury-rotd-llcpar
 Architecture: i386 amd64
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-3)
-Description: Mercury programming language runtime (reg.par.gc.stseg)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-rotd-gc (= 20181114-1)
+Conflicts: mercury-llcpar
+Description: Mercury programming language runtime (asm_fast.par.gc.stseg)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
  and error detection features.
@@ -253,15 +265,16 @@ Description: Mercury programming language runtime (reg.par.gc.stseg)
  trade-offs.
  .
  This package contains dynamic libraries for Mercury programs built in the
- reg.par.gc.stseg grade.
+ asm_fast.par.gc.stseg grade.
 
-Package: mercury-llcpar-dev
+Package: mercury-rotd-llcpar-dev
 Architecture: i386 amd64
 Section: libdevel
 Depends: ${misc:Depends}, libhwloc-dev,
-  mercury-gc-dev (= 14.01.1-3), mercury-llcpar (= 14.01.1-3)
-Recommends: mercury-tools (= 14.01.1-3)
-Description: Mercury programming language dev files (reg.par.gc.stseg)
+  mercury-rotd-gc-dev (= 20181114-1), mercury-rotd-llcpar (= 20181114-1)
+Recommends: mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-llcpar-dev
+Description: Mercury programming language dev files (asm_fast.par.gc.stseg)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
  and error detection features.
@@ -273,13 +286,14 @@ Description: Mercury programming language dev files (reg.par.gc.stseg)
  trade-offs.
  .
  This package contains header files, interface files and static libraries for
- the reg.par.gc.stseg grade.
+ the asm_fast.par.gc.stseg grade.
 
-Package: mercury-llctrail
+Package: mercury-rotd-llctrail
 Architecture: i386 amd64
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-3)
-Description: Mercury programming language runtime (reg.gc.trseg)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-rotd-gc (= 20181114-1)
+Conflicts: mercury-llctrail
+Description: Mercury programming language runtime (asm_fast.gc.trseg)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
  and error detection features.
@@ -291,15 +305,16 @@ Description: Mercury programming language runtime (reg.gc.trseg)
  trade-offs.
  .
  This package contains dynamic libraries for Mercury programs built in the
- reg.gc.trseg grade.
+ asm_fast.gc.trseg grade.
 
-Package: mercury-llctrail-dev
+Package: mercury-rotd-llctrail-dev
 Architecture: i386 amd64
 Section: libdevel
-Depends: ${misc:Depends}, mercury-gc-dev (= 14.01.1-3),
-  mercury-llctrail (= 14.01.1-3)
-Recommends: mercury-tools (= 14.01.1-3)
-Description: Mercury programming language development files (reg.gc.trseg)
+Depends: ${misc:Depends}, mercury-rotd-gc-dev (= 20181114-1),
+  mercury-rotd-llctrail (= 20181114-1)
+Recommends: mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-llctrail-dev
+Description: Mercury programming language development files (asm_fast.gc.trseg)
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
  and error detection features.
@@ -311,14 +326,15 @@ Description: Mercury programming language development files (reg.gc.trseg)
  trade-offs.
  .
  This package contains header files, interface files and static libraries for
- the reg.gc.trseg grade.
+ the asm_fast.gc.trseg grade.
 
-Package: mercury-devel
+Package: mercury-rotd-devel
 Architecture: i386 amd64
 Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-3),
-  mercury-gc-dev (= 14.01.1-3), libreadline-dev
-Recommends: mercury-tools (= 14.01.1-3)
+Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-rotd-gc (= 20181114-1),
+  mercury-rotd-gc-dev (= 20181114-1), libreadline-dev
+Recommends: mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-devel
 Description: Mercury programming language debugging and profiling grades
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -331,14 +347,15 @@ Description: Mercury programming language debugging and profiling grades
  trade-offs.
  .
  This package contains header files and libraries (shared and dynamic) for
- Mercury programs using the: reg.gc.decldebug.stseg,
- reg.gc.profdeep.stseg, reg.gc.memprof.stseg and
- reg.gc.prof.stseg grades.
+ Mercury programs using the: asm_fast.gc.decldebug.stseg,
+ asm_fast.gc.profdeep.stseg, asm_fast.gc.memprof.stseg and
+ asm_fast.gc.prof.stseg grades.
 
-Package: mercury-docs
+Package: mercury-rotd-docs
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Conflicts: mercury-docs
 Description: Mercury programming language documentation
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -352,10 +369,11 @@ Description: Mercury programming language documentation
  .
  This package contains the documentation.
 
-Package: mercury-examples
+Package: mercury-rotd-examples
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Conflicts: mercury-examples
 Description: Mercury programming language examples and extras
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
@@ -371,10 +389,10 @@ Description: Mercury programming language examples and extras
  install their source code in /usr/share/doc/mercury/, it will not attempt to
  build or install these programs and libraries..
 
-Package: mercury-maintainers
+Package: mercury-rotd-maintainers
 Architecture: i386 amd64
-Depends: ${misc:Depends}, ${shlibs:Depends}, make, mercury-tools (= 14.01.1-3)
-Conflicts: mmake
+Depends: ${misc:Depends}, ${shlibs:Depends}, make, mercury-rotd-tools (= 20181114-1)
+Conflicts: mercury-maintainers, mmake
 Description: Mercury programming language maintainers' tools 
  Mercury is a logic/functional programming language which combines the clarity
  and expressiveness of declarative programming with advanced static analysis
diff --git a/debian/copyright b/debian/copyright
index 9d35e49..9edc125 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 1993-2012 The University of Melbourne
-           2013-2014 The Mercury Team
+           2013-2018 The Mercury Team
 License: GPL-2
 
 Files: runtime/*
@@ -13,7 +13,7 @@ Files: runtime/*
        trace/*
        robdd/*
 Copyright: 1993-2012 The University of Melbourne
-           2013-2014 The Mercury Team
+           2013-2018 The Mercury Team
            1995, 2001-2004 Peter Schachte
 License: LGPL-2
 
diff --git a/debian/mercury-llc-dev.install b/debian/mercury-llc-dev.install
deleted file mode 100644
index f391553..0000000
--- a/debian/mercury-llc-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/mercury/ints/reg.gc
-usr/lib/mercury/lib/reg.gc/*.a
-usr/lib/mercury/lib/reg.gc/inc
-usr/lib/mercury/modules/reg.gc
diff --git a/debian/mercury-llc.install b/debian/mercury-llc.install
deleted file mode 100644
index 8972b9c..0000000
--- a/debian/mercury-llc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/mercury/lib/reg.gc/libmer_rt.so
-usr/lib/mercury/lib/reg.gc/libmer_std.so
diff --git a/debian/mercury-llcpar-dev.install b/debian/mercury-llcpar-dev.install
deleted file mode 100644
index f872464..0000000
--- a/debian/mercury-llcpar-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/mercury/ints/reg.par.gc.stseg
-usr/lib/mercury/lib/reg.par.gc.stseg/*.a
-usr/lib/mercury/lib/reg.par.gc.stseg/inc
-usr/lib/mercury/modules/reg.par.gc.stseg
diff --git a/debian/mercury-llcpar.install b/debian/mercury-llcpar.install
deleted file mode 100644
index 04a047b..0000000
--- a/debian/mercury-llcpar.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/mercury/lib/reg.par.gc.stseg/libmer_rt.so
-usr/lib/mercury/lib/reg.par.gc.stseg/libmer_std.so
diff --git a/debian/mercury-llctrail-dev.install b/debian/mercury-llctrail-dev.install
deleted file mode 100644
index 9a019f4..0000000
--- a/debian/mercury-llctrail-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/mercury/ints/reg.gc.trseg
-usr/lib/mercury/lib/reg.gc.trseg/*.a
-usr/lib/mercury/lib/reg.gc.trseg/inc
-usr/lib/mercury/modules/reg.gc.trseg
diff --git a/debian/mercury-llctrail.install b/debian/mercury-llctrail.install
deleted file mode 100644
index 5ef3333..0000000
--- a/debian/mercury-llctrail.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/mercury/lib/reg.gc.trseg/libmer_rt.so
-usr/lib/mercury/lib/reg.gc.trseg/libmer_std.so
diff --git a/debian/mercury-devel.install b/debian/mercury-rotd-devel.install
similarity index 100%
rename from debian/mercury-devel.install
rename to debian/mercury-rotd-devel.install
diff --git a/debian/mercury-docs.docs b/debian/mercury-rotd-docs.docs
similarity index 90%
rename from debian/mercury-docs.docs
rename to debian/mercury-rotd-docs.docs
index 7e9df6b..d4da8f6 100644
--- a/debian/mercury-docs.docs
+++ b/debian/mercury-rotd-docs.docs
@@ -10,10 +10,8 @@ README
 README.bootstrap
 README.clang
 README.CSharp
-README.DotNet
 README.Erlang
 README.Java
-README.lcc
 README.Linux*
 README.ssdebug
 README.ThreadScope
diff --git a/debian/mercury-docs.info b/debian/mercury-rotd-docs.info
similarity index 100%
rename from debian/mercury-docs.info
rename to debian/mercury-rotd-docs.info
diff --git a/debian/mercury-docs.install b/debian/mercury-rotd-docs.install
similarity index 100%
rename from debian/mercury-docs.install
rename to debian/mercury-rotd-docs.install
diff --git a/debian/mercury-examples.examples b/debian/mercury-rotd-examples.examples
similarity index 100%
rename from debian/mercury-examples.examples
rename to debian/mercury-rotd-examples.examples
diff --git a/debian/mercury-gc-dev.install b/debian/mercury-rotd-gc-dev.install
similarity index 100%
rename from debian/mercury-gc-dev.install
rename to debian/mercury-rotd-gc-dev.install
diff --git a/debian/mercury-gc.install b/debian/mercury-rotd-gc.install
similarity index 100%
rename from debian/mercury-gc.install
rename to debian/mercury-rotd-gc.install
diff --git a/debian/mercury-hlc-dev.install b/debian/mercury-rotd-hlc-dev.install
similarity index 100%
rename from debian/mercury-hlc-dev.install
rename to debian/mercury-rotd-hlc-dev.install
diff --git a/debian/mercury-hlc.install b/debian/mercury-rotd-hlc.install
similarity index 100%
rename from debian/mercury-hlc.install
rename to debian/mercury-rotd-hlc.install
diff --git a/debian/mercury-hlcpar-dev.install b/debian/mercury-rotd-hlcpar-dev.install
similarity index 100%
rename from debian/mercury-hlcpar-dev.install
rename to debian/mercury-rotd-hlcpar-dev.install
diff --git a/debian/mercury-hlcpar.install b/debian/mercury-rotd-hlcpar.install
similarity index 100%
rename from debian/mercury-hlcpar.install
rename to debian/mercury-rotd-hlcpar.install
diff --git a/debian/mercury-hlctrail-dev.install b/debian/mercury-rotd-hlctrail-dev.install
similarity index 100%
rename from debian/mercury-hlctrail-dev.install
rename to debian/mercury-rotd-hlctrail-dev.install
diff --git a/debian/mercury-hlctrail.install b/debian/mercury-rotd-hlctrail.install
similarity index 100%
rename from debian/mercury-hlctrail.install
rename to debian/mercury-rotd-hlctrail.install
diff --git a/debian/mercury-rotd-llc-dev.install b/debian/mercury-rotd-llc-dev.install
new file mode 100644
index 0000000..178a703
--- /dev/null
+++ b/debian/mercury-rotd-llc-dev.install
@@ -0,0 +1,4 @@
+usr/lib/mercury/ints/asm_fast.gc
+usr/lib/mercury/lib/asm_fast.gc/*.a
+usr/lib/mercury/lib/asm_fast.gc/inc
+usr/lib/mercury/modules/asm_fast.gc
diff --git a/debian/mercury-rotd-llc.install b/debian/mercury-rotd-llc.install
new file mode 100644
index 0000000..f8f4b1f
--- /dev/null
+++ b/debian/mercury-rotd-llc.install
@@ -0,0 +1,2 @@
+usr/lib/mercury/lib/asm_fast.gc/libmer_rt.so
+usr/lib/mercury/lib/asm_fast.gc/libmer_std.so
diff --git a/debian/mercury-rotd-llcpar-dev.install b/debian/mercury-rotd-llcpar-dev.install
new file mode 100644
index 0000000..55d6740
--- /dev/null
+++ b/debian/mercury-rotd-llcpar-dev.install
@@ -0,0 +1,4 @@
+usr/lib/mercury/ints/asm_fast.par.gc.stseg
+usr/lib/mercury/lib/asm_fast.par.gc.stseg/*.a
+usr/lib/mercury/lib/asm_fast.par.gc.stseg/inc
+usr/lib/mercury/modules/asm_fast.par.gc.stseg
diff --git a/debian/mercury-rotd-llcpar.install b/debian/mercury-rotd-llcpar.install
new file mode 100644
index 0000000..6d60d1e
--- /dev/null
+++ b/debian/mercury-rotd-llcpar.install
@@ -0,0 +1,2 @@
+usr/lib/mercury/lib/asm_fast.par.gc.stseg/libmer_rt.so
+usr/lib/mercury/lib/asm_fast.par.gc.stseg/libmer_std.so
diff --git a/debian/mercury-rotd-llctrail-dev.install b/debian/mercury-rotd-llctrail-dev.install
new file mode 100644
index 0000000..6322347
--- /dev/null
+++ b/debian/mercury-rotd-llctrail-dev.install
@@ -0,0 +1,4 @@
+usr/lib/mercury/ints/asm_fast.gc.trseg
+usr/lib/mercury/lib/asm_fast.gc.trseg/*.a
+usr/lib/mercury/lib/asm_fast.gc.trseg/inc
+usr/lib/mercury/modules/asm_fast.gc.trseg
diff --git a/debian/mercury-rotd-llctrail.install b/debian/mercury-rotd-llctrail.install
new file mode 100644
index 0000000..23404e2
--- /dev/null
+++ b/debian/mercury-rotd-llctrail.install
@@ -0,0 +1,2 @@
+usr/lib/mercury/lib/asm_fast.gc.trseg/libmer_rt.so
+usr/lib/mercury/lib/asm_fast.gc.trseg/libmer_std.so
diff --git a/debian/mercury-maintainers.install b/debian/mercury-rotd-maintainers.install
similarity index 100%
rename from debian/mercury-maintainers.install
rename to debian/mercury-rotd-maintainers.install
diff --git a/debian/mercury-maintainers.manpages b/debian/mercury-rotd-maintainers.manpages
similarity index 100%
rename from debian/mercury-maintainers.manpages
rename to debian/mercury-rotd-maintainers.manpages
diff --git a/debian/mercury-tools.examples b/debian/mercury-rotd-tools.examples
similarity index 100%
rename from debian/mercury-tools.examples
rename to debian/mercury-rotd-tools.examples
diff --git a/debian/mercury-tools.install b/debian/mercury-rotd-tools.install
similarity index 100%
rename from debian/mercury-tools.install
rename to debian/mercury-rotd-tools.install
diff --git a/debian/mercury-tools.manpages b/debian/mercury-rotd-tools.manpages
similarity index 100%
rename from debian/mercury-tools.manpages
rename to debian/mercury-rotd-tools.manpages
diff --git a/debian/patches/copyright-in-readme b/debian/patches/copyright-in-readme
deleted file mode 100644
index 6f072e3..0000000
--- a/debian/patches/copyright-in-readme
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Correct the Copyright notice in README
-
---- a/README
-+++ b/README
-@@ -2,7 +2,10 @@
- Mercury compiler, version 14.01.1.
- 
- 	The Mercury implementation is free software.
--	It is Copyright (C) 1993-2013 The University of Melbourne.
-+	It is:
-+
-+	Copyright (C) 1993-2012 The University of Melbourne,
-+	Copyright (C) 2013-2014 The Mercury Team.
- 
- 	The compiler and tools are distributed under the terms of the GNU
- 	General Public License.  See the file COPYING for copying permission.
diff --git a/debian/patches/dont-install-in-files b/debian/patches/dont-install-in-files
deleted file mode 100644
index c27a64b..0000000
--- a/debian/patches/dont-install-in-files
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Don't install the mercury.info.in file.
-
---- a/doc/Mmakefile
-+++ b/doc/Mmakefile
-@@ -384,7 +384,7 @@
- 
- .PHONY: install_info
- install_info: $(INFOPAGES) install_dirs
--	-cp *.info* $(INSTALL_INFO_DIR)
-+	-cp *.info *.info-* $(INSTALL_INFO_DIR)
- 	# Update the .../info/dir file.
- 	-if [ -x "$(INSTALL_INFO)" ]; then				\
- 		$(INSTALL_INFO) $(INSTALL_INFO_DIR)/mercury.info;	\
diff --git a/debian/patches/fix-install-location b/debian/patches/fix-install-location
deleted file mode 100644
index 376380a..0000000
--- a/debian/patches/fix-install-location
+++ /dev/null
@@ -1,108 +0,0 @@
-
-Make mmake honnor the autoconf man, info and doc dir variables.
-
-Index: mercury-14.01.1/scripts/Mmake.vars.in
-===================================================================
---- mercury-14.01.1.orig/scripts/Mmake.vars.in
-+++ mercury-14.01.1/scripts/Mmake.vars.in
-@@ -37,7 +37,7 @@ EXTRA_INIT_DIRS =
- MERCURY_EXTRA_INIT_DIRS	=
- endif
- 
--# Set the directory search path. 
-+# Set the directory search path.
- # (See the GNU Make manual for documentation about VPATH and GPATH.)
- # We need to substitute all spaces with colons for the VPATH to work.
- # Getting a space to be recognised as the first argument of the subst
-@@ -193,7 +193,7 @@ EXTRA_MCSFLAGS	= $(EXTRA_MCFLAGS)
- #
- 
- # FIX_PATH_FOR_<foo> should be set to a script which converts path names
--# from Unix/Cygwin format into a format suitable for the <foo> command.  
-+# from Unix/Cygwin format into a format suitable for the <foo> command.
- # If <foo> is a Unix/Cygwin command that expects Unix-style path names,
- # FIX_PATH_FOR_<foo> should be set to "echo".
- # If <foo> is a Windows command that expects Windows-style path names,
-@@ -225,7 +225,7 @@ MERC_DLL_DIR    = $(MERCURY_STDLIB_DIR)/
- # ILASM is the Microsoft IL assembler, which turns IL assembly code
- # into bytecode.
- # XXX we should also support the Portable.NET version of ILASM,
--# which has a different command-line interface. 
-+# which has a different command-line interface.
- # (Is there a Mono ILASM too?  What about Rotor?)
- ILASM		= @ILASM@
- ALL_ILASMFLAGS= $(ILASMFLAGS) $(EXTRA_ILASMFLAGS) \
-@@ -235,11 +235,11 @@ EXTRA_ILASMFLAGS =
- LIB_ILASMFLAGS= $(patsubst %,-I %,$(EXTRA_C_INCL_DIRS))
- 
- # MS_AL is the Microsoft assembly linker, which creates assemblies.
--MS_AL		= @MS_AL@ 
-+MS_AL		= @MS_AL@
- 
- # CSC is the command line version of C# compiler
- # XXX we should also support the Portable.NET and Mono C# compilers,
--# which have a different command-line interface. 
-+# which have a different command-line interface.
- # (What about Rotor?)
- 
- FIX_PATH_FOR_CSC = @CYGPATH@
-@@ -263,7 +263,7 @@ ALL_JAVACFLAGS	= $(JAVACFLAGS) $(EXTRA_J
- JAVACFLAGS	= @JAVAC_FLAGS_FOR_HEAP_SIZE@
- EXTRA_JAVACFLAGS =
- # XXX Should we set LIB_JAVACFLAGS?
--LIB_JAVACFLAGS	= 
-+LIB_JAVACFLAGS	=
- 
- # JAVA_INTERPRETER is the command line Java interpreter;
- # it should be able to run Java bytecode files.
-@@ -381,8 +381,8 @@ EXT_FOR_PIC_OBJECTS	= @EXT_FOR_PIC_OBJEC
- EXT_FOR_SHARED_LIB	= @EXT_FOR_SHARED_LIB@
- 
- # lists of targets that depend on $(ALL_MLOBJS) and $(ALL_MLPICOBJS)
--MLOBJS_DEPS = 
--MLPICOBJS_DEPS = 
-+MLOBJS_DEPS =
-+MLPICOBJS_DEPS =
- 
- #-----------------------------------------------------------------------------#
- 
-@@ -682,25 +682,29 @@ else
-     DESTDIR_AND_SLASH=$(DESTDIR)/
- endif
- 
-+# Weirdness between Mmake and autoconf
-+prefix=@prefix@
-+PACKAGE=mercury-$(VERSION)
-+
- INSTALL_PREFIX		= $(DESTDIR_AND_SLASH)@prefix@
- INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
- INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
--INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
--INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
--INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
--INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
-+INSTALL_INFO_DIR	= $(DESTDIR_AND_SLASH)@infodir@
-+INSTALL_DVI_DIR		= $(DESTDIR_AND_SLASH)@docdir@
-+INSTALL_TEXT_DIR	= $(DESTDIR_AND_SLASH)@docdir@
-+INSTALL_PS_DIR		= $(DESTDIR_AND_SLASH)@docdir@
-+INSTALL_PDF_DIR		= $(DESTDIR_AND_SLASH)@docdir@
-+INSTALL_MAN_DIR		= $(DESTDIR_AND_SLASH)@mandir@
-+INSTALL_HTML_DIR	= $(DESTDIR_AND_SLASH)@docdir@
-+INSTALL_MDB_DOC_DIR	= $(DESTDIR_AND_SLASH)@docdir@
- INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
- INSTALL_CGI_DIR		= $(DESTDIR_AND_SLASH)@CGIDIR@
- 
- FINAL_INSTALL_PREFIX	= @prefix@
- FINAL_INSTALL_BINDIR 	= $(FINAL_INSTALL_PREFIX)/bin
- FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_INFO_DIR	= $(FINAL_INSTALL_PREFIX)/info
--FINAL_INSTALL_MAN_DIR	= $(FINAL_INSTALL_PREFIX)/man
-+FINAL_INSTALL_INFO_DIR	= @infodir@
-+FINAL_INSTALL_MAN_DIR	= @mandir@
- FINAL_INSTALL_ELISP_DIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury/elisp
- FINAL_INSTALL_CGI_DIR	= @CGIDIR@
- 
diff --git a/debian/patches/realclean b/debian/patches/realclean
deleted file mode 100644
index e8cac1d..0000000
--- a/debian/patches/realclean
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix "make realclean"
---- a/Mmakefile
-+++ b/Mmakefile
-@@ -796,10 +796,11 @@
- .PHONY: clean_tests
- clean_tests:
- 	+if test -d tests; then \
--		(cd tests; $(MMAKE) clean) \
-+		(cd tests; $(SUBDIR_MMAKE) clean) \
- 	fi
- 
- realclean: realclean_subdirs realclean_local realclean_tests
-+	+cd scripts; $(SUBDIR_MMAKE) realclean
- 
- .PHONY: realclean_local
- realclean_local: realclean_config realclean_docs
-@@ -812,7 +813,6 @@
- 		if [ "$$dir" = scripts ]; then continue; fi; \
- 		(cd $$dir; $(SUBDIR_MMAKE) realclean) \
- 	done
--	+cd scripts; $(SUBDIR_MMAKE) realclean
- 
- .PHONY: realclean_docs
- realclean_docs:
-@@ -825,7 +825,7 @@
- .PHONY: realclean_tests
- realclean_tests:
- 	+if test -d tests; then \
--		(cd tests; $(MMAKE) realclean) \
-+		(cd tests; $(SUBDIR_MMAKE) realclean) \
- 	fi
- 
- #-----------------------------------------------------------------------------#
diff --git a/debian/patches/remove-paths b/debian/patches/remove-paths
index 55f1fec..b8a2ba8 100644
--- a/debian/patches/remove-paths
+++ b/debian/patches/remove-paths
@@ -3,16 +3,16 @@ Mercury.
 
 --- a/README
 +++ b/README
-@@ -82,12 +82,8 @@
+@@ -22,12 +22,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.
+-/usr/local/mercury-rotd-2018-11-14/info,
+-/usr/local/mercury-rotd-2018-11-14/lib/mercury/html,
+-and /usr/local/mercury-rotd-2018-11-14/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.
+-by default they will be installed in /usr/local/mercury-rotd-2018-11-14/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
diff --git a/debian/patches/series b/debian/patches/series
index 9926f02..904e48c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 # You must remove unused comment lines for the released package.
-copyright-in-readme
-realclean
-remove-paths
 version
+remove-paths
diff --git a/debian/patches/version b/debian/patches/version
index 598b9bd..870bcad 100644
--- a/debian/patches/version
+++ b/debian/patches/version
@@ -3,19 +3,19 @@ Update version number
 +++ 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-3.
+-Mercury compiler, version rotd-2018-11-14.
++Mercury compiler, version 20181114-1.
+ 
+ See the file LICENSE for copyright and licensing information.
  
- 	The Mercury implementation is free software.
- 	It is:
 --- a/VERSION
 +++ b/VERSION
 @@ -7,7 +7,7 @@
  #
  # Please assign version numbers according to the scheme explained below.
  
--VERSION=14.01.1
-+VERSION=14.01.1-3
+-VERSION=rotd-2018-11-14
++VERSION=20181114-1
  
  # We use the following general scheme for version numbers:
  #
diff --git a/debian/rules b/debian/rules
index a81221c..6775cf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,10 +23,9 @@ bootstrap : autoreconf
 
 override_dh_auto_configure: autoreconf bootstrap
 	PATH=$$PATH:/tmp/mer-boot/bin dh_auto_configure -- \
-		 --enable-libgrades=hlc.gc,hlc.gc.par,reg.gc,reg.par.gc.stseg,reg.gc.decldebug.stseg,reg.gc.trseg,reg.gc.profdeep.stseg,hlc.gc.trseg,reg.gc.memprof.stseg,reg.gc.prof.stseg
+		 --enable-libgrades=hlc.gc,hlc.gc.par,asm_fast.gc,asm_fast.par.gc.stseg,asm_fast.gc.decldebug.stseg,asm_fast.gc.trseg,asm_fast.gc.profdeep.stseg,hlc.gc.trseg,asm_fast.gc.memprof.stseg,asm_fast.gc.prof.stseg
 
 override_dh_auto_clean:
-	find . -name .gitignore -o -name .cvsignore | xargs rm
 	chmod a-x samples extras benchmarks
 	if [ -x scripts/mmake ]; then dh_auto_clean; fi
 
-- 
2.17.1
Previous message: [m-rev.] ROTD packaging branch
Next message: [m-rev.] patch: Update the README.Debian with more info about grades
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the reviews mailing list