Move stuff from calp/util to hnh/util.

This is the first (major) step in splitting the generally useful items
into its own library.

9 files changed, 18 insertions, 18 deletions

diff --git a/module/calp/entry-points/benchmark.scm b/module/calp/entry-points/benchmark.scm
index 152a398c..5db9b9df 100644
--- a/module/calp/entry-points/benchmark.scm
+++ b/module/calp/entry-points/benchmark.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points benchmark)
-  :use-module (calp util)
+  :use-module (hnh util)
 
   :use-module (ice-9 getopt-long)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module ((srfi srfi-41) :select (stream->list))
 
   :use-module ((vcomponent util instance methods) :select (get-event-set))
diff --git a/module/calp/entry-points/convert.scm b/module/calp/entry-points/convert.scm
index f05b1e7b..3f602b07 100644
--- a/module/calp/entry-points/convert.scm
+++ b/module/calp/entry-points/convert.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points convert)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (sxml simple)
   )
diff --git a/module/calp/entry-points/html.scm b/module/calp/entry-points/html.scm
index 45e71947..adac302f 100644
--- a/module/calp/entry-points/html.scm
+++ b/module/calp/entry-points/html.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points html)
   :export (main)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp util time)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module (datetime)
   :use-module (ice-9 getopt-long)
   :use-module ((ice-9 regex) :select (string-match regexp-substitute))
diff --git a/module/calp/entry-points/ical.scm b/module/calp/entry-points/ical.scm
index 0ac01b17..938b0b35 100644
--- a/module/calp/entry-points/ical.scm
+++ b/module/calp/entry-points/ical.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points ical)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (vcomponent formats ical output)
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
diff --git a/module/calp/entry-points/import.scm b/module/calp/entry-points/import.scm
index 69c5b687..441ff527 100644
--- a/module/calp/entry-points/import.scm
+++ b/module/calp/entry-points/import.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points import)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (ice-9 rdelim)
   :use-module (srfi srfi-1)
diff --git a/module/calp/entry-points/server.scm b/module/calp/entry-points/server.scm
index 8885f38d..c9ff339a 100644
--- a/module/calp/entry-points/server.scm
+++ b/module/calp/entry-points/server.scm
@@ -1,6 +1,6 @@
 (define-module (calp entry-points server)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (calp util config)
 
   :use-module (srfi srfi-1)
diff --git a/module/calp/entry-points/terminal.scm b/module/calp/entry-points/terminal.scm
index 5aaa1f2d..b0be318c 100644
--- a/module/calp/entry-points/terminal.scm
+++ b/module/calp/entry-points/terminal.scm
@@ -5,7 +5,7 @@
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   :use-module (vulgar)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   )
 
 (define options
diff --git a/module/calp/entry-points/text.scm b/module/calp/entry-points/text.scm
index 6da524ae..0a5744b3 100644
--- a/module/calp/entry-points/text.scm
+++ b/module/calp/entry-points/text.scm
@@ -2,8 +2,8 @@
   :export (main)
   :use-module (text flow)
   :use-module (ice-9 getopt-long)
-  :use-module (calp util io)
-  :use-module (calp util options)
+  :use-module (hnh util io)
+  :use-module (hnh util options)
   )
 
 
diff --git a/module/calp/entry-points/tidsrapport.scm b/module/calp/entry-points/tidsrapport.scm
index abdd7aa2..5ff43cf7 100644
--- a/module/calp/entry-points/tidsrapport.scm
+++ b/module/calp/entry-points/tidsrapport.scm
@@ -39,8 +39,8 @@
 
 (define-module (calp entry-points tidsrapport)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   )
@@ -52,7 +52,7 @@
              (datetime)
              (vcomponent util instance)
              (vcomponent util instance methods)
-             (calp util)
+             (hnh util)
              (ice-9 regex)
              (ice-9 popen)
              )