fix deb; fix apps.pronom

richardlehane · Sep 23, 2016 · 3bce4e5 · 3bce4e5
1 parent 1a7d8bb
commit 3bce4e5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # Change Log
+## v1.6.5 (2016-09-xx)
+### Fixed
+- roy inspect priorities command now includes "orphan" fmts in graphs
+- debbuilder.sh fix: debian packages were copying roy data to wrong directory
+- update PRONOM urls from apps. to www.
+
 ## v1.6.4 (2016-09-05)
 ### Added
 - roy inspect FMT command now inspects sets e.g. roy inspect @pdfa

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [Siegfried](http://www.itforarchivists.com/siegfried) is a signature-based file format identification tool, implementing:
 
-  - the National Archives UK's [PRONOM](http://apps.nationalarchives.gov.uk/pronom) file format signatures
+  - the National Archives UK's [PRONOM](http://www.nationalarchives.gov.uk/pronom) file format signatures
   - freedesktop.org's [MIME-info](https://freedesktop.org/wiki/Software/shared-mime-info/) file format signatures
   - the Library of Congress's [FDD](http://www.digitalpreservation.gov/formats/fdd/descriptions.shtml) file format signatures (*beta*).
 

diff --git a/config/pronom.go b/config/pronom.go
@@ -47,7 +47,7 @@ var pronom = struct {
 }{
 	name:             "pronom",
 	reports:          "pronom",
-	harvestURL:       "http://apps.nationalarchives.gov.uk/pronom/",
+	harvestURL:       "http://www.nationalarchives.gov.uk/pronom/",
 	harvestTimeout:   120 * time.Second,
 	harvestTransport: &http.Transport{Proxy: http.ProxyFromEnvironment},
 	zip:              "x-fmt/263",

diff --git a/debbuilder.sh b/debbuilder.sh
@@ -8,12 +8,12 @@ export SFDIR
 # setup dirs
 mkdir -p $SFDIR/DEBIAN
 mkdir -p $SFDIR/usr/bin
-mkdir -p $SFDIR/usr/share
+mkdir -p $SFDIR/usr/share/siegfried
 
 # copy binaries and assets
 cp $HOME/gopath/bin/sf $SFDIR/usr/bin/sf
 cp $HOME/gopath/bin/roy $SFDIR/usr/bin/roy
-cp -R $HOME/gopath/src/github.com/richardlehane/siegfried/cmd/roy/data/. $SFDIR/usr/share
+cp -R $HOME/gopath/src/github.com/richardlehane/siegfried/cmd/roy/data/. $SFDIR/usr/share/siegfried
 
 # write control file
 SIZE=$(du -s "${SFDIR}/usr" | cut -f1)

diff --git a/pkg/loc/mappings/loc.go b/pkg/loc/mappings/loc.go
@@ -85,6 +85,8 @@ func (f FDD) PUIDs() []string {
 	for _, l := range f.Links {
 		if strings.HasPrefix(l, "http://apps.nationalarchives.gov.uk/pronom/") {
 			puids = append(puids, strings.TrimPrefix(l, "http://apps.nationalarchives.gov.uk/pronom/"))
+		} else if strings.HasPrefix(l, "http://www.nationalarchives.gov.uk/pronom/") {
+			puids = append(puids, strings.TrimPrefix(l, "http://www.nationalarchives.gov.uk/pronom/"))
 		}
 	}
 	return puids