[m-rev.] packaging jessie4 diff: backport to jessie

[Paul Bone]

backport to jessie

debian/control:
debian/mercury-llc-dev.install:
debian/mercury-llc.install:
debian/mercury-llcpar-dev.install:
debian/mercury-llcpar.install:
debian/mercury-llctrail-dev.install:
debian/mercury-llctrail.install:
debian/rules:
debian_conf/reprepro/distributions:
debian_conf/reprepro/incoming:
    As above.
---
 debian/control                      | 34 ++++++++++++++---------------
 debian/mercury-llc-dev.install      |  8 +++----
 debian/mercury-llc.install          |  4 ++--
 debian/mercury-llcpar-dev.install   |  8 +++----
 debian/mercury-llcpar.install       |  4 ++--
 debian/mercury-llctrail-dev.install |  8 +++----
 debian/mercury-llctrail.install     |  4 ++--
 debian/rules                        |  6 ++---
 8 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index ee30da3..9309c99 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: mercury
 Section: devel
 Priority: optional
 Maintainer: Paul Bone <paul at bone.id.au>
-Build-Depends: debhelper (>=9.20160114), autoconf, automake, flex, bison,
+Build-Depends: debhelper (>=9.20160114), autoconf, automake, gcc-4.8, flex, bison,
   libreadline-dev, texinfo, texi2html, libhwloc-dev, pkg-config
 Standards-Version: 3.9.7
 Homepage: http://mercurylang.org
 
 Package: mercury-tools
 Architecture: i386 amd64
-Depends: ${misc:Depends}, ${shlibs:Depends}, perl, gcc
+Depends: ${misc:Depends}, ${shlibs:Depends}, perl, gcc-4.8
 Recommends: mercury-gc-dev,
   mercury-hlc-dev | mercury-hlcpar-dev | mercury-hlctrail-dev |
   mercury-llc-dev | mercury-llcpar-dev | mercury-llctrail-dev
@@ -203,7 +203,7 @@ Package: mercury-llc
 Architecture: i386 amd64
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-4)
-Description: Mercury programming language runtime (reg.gc)
+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,7 +215,7 @@ 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
 Architecture: i386 amd64
@@ -223,7 +223,7 @@ Section: libdevel
 Depends: ${misc:Depends}, mercury-gc-dev (= 14.01.1-4),
   mercury-llc (= 14.01.1-4)
 Recommends: mercury-tools (= 14.01.1-4)
-Description: Mercury programming language development files (reg.gc)
+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 +235,13 @@ 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
 Architecture: i386 amd64
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-4)
-Description: Mercury programming language runtime (reg.par.gc.stseg)
+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,7 +253,7 @@ 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
 Architecture: i386 amd64
@@ -261,7 +261,7 @@ Section: libdevel
 Depends: ${misc:Depends}, libhwloc-dev,
   mercury-gc-dev (= 14.01.1-4), mercury-llcpar (= 14.01.1-4)
 Recommends: mercury-tools (= 14.01.1-4)
-Description: Mercury programming language dev files (reg.par.gc.stseg)
+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 +273,13 @@ 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
 Architecture: i386 amd64
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}, mercury-gc (= 14.01.1-4)
-Description: Mercury programming language runtime (reg.gc.trseg)
+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,7 +291,7 @@ 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
 Architecture: i386 amd64
@@ -299,7 +299,7 @@ Section: libdevel
 Depends: ${misc:Depends}, mercury-gc-dev (= 14.01.1-4),
   mercury-llctrail (= 14.01.1-4)
 Recommends: mercury-tools (= 14.01.1-4)
-Description: Mercury programming language development files (reg.gc.trseg)
+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,7 +311,7 @@ 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
 Architecture: i386 amd64
@@ -331,9 +331,9 @@ 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
 Architecture: all
diff --git a/debian/mercury-llc-dev.install b/debian/mercury-llc-dev.install
index f391553..178a703 100644
--- a/debian/mercury-llc-dev.install
+++ b/debian/mercury-llc-dev.install
@@ -1,4 +1,4 @@
-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
+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-llc.install b/debian/mercury-llc.install
index 8972b9c..f8f4b1f 100644
--- a/debian/mercury-llc.install
+++ b/debian/mercury-llc.install
@@ -1,2 +1,2 @@
-usr/lib/mercury/lib/reg.gc/libmer_rt.so
-usr/lib/mercury/lib/reg.gc/libmer_std.so
+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-llcpar-dev.install b/debian/mercury-llcpar-dev.install
index f872464..55d6740 100644
--- a/debian/mercury-llcpar-dev.install
+++ b/debian/mercury-llcpar-dev.install
@@ -1,4 +1,4 @@
-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
+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-llcpar.install b/debian/mercury-llcpar.install
index 04a047b..6d60d1e 100644
--- a/debian/mercury-llcpar.install
+++ b/debian/mercury-llcpar.install
@@ -1,2 +1,2 @@
-usr/lib/mercury/lib/reg.par.gc.stseg/libmer_rt.so
-usr/lib/mercury/lib/reg.par.gc.stseg/libmer_std.so
+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-llctrail-dev.install b/debian/mercury-llctrail-dev.install
index 9a019f4..6322347 100644
--- a/debian/mercury-llctrail-dev.install
+++ b/debian/mercury-llctrail-dev.install
@@ -1,4 +1,4 @@
-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
+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-llctrail.install b/debian/mercury-llctrail.install
index 5ef3333..23404e2 100644
--- a/debian/mercury-llctrail.install
+++ b/debian/mercury-llctrail.install
@@ -1,2 +1,2 @@
-usr/lib/mercury/lib/reg.gc.trseg/libmer_rt.so
-usr/lib/mercury/lib/reg.gc.trseg/libmer_std.so
+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/rules b/debian/rules
index a81221c..1131ba2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,15 +15,15 @@ autoreconf:
 
 .PHONY: bootstrap
 bootstrap : autoreconf
-	DEFAULT_GRADE=hlc.gc.pregen \
+	CC=gcc-4.8 DEFAULT_GRADE=hlc.gc.pregen \
 	   ./configure --prefix /tmp//mer-boot \
 		--enable-libgrades=hlc.gc.pregen
 	make install
 	make realclean
 
 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
+	PATH=$$PATH:/tmp/mer-boot/bin CC=gcc-4.8 dh_auto_configure -- \
+		 --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
-- 
2.17.1