Cleanup PackageInfo.g w/ Max Horns format; bump version

PackageInfo.g

@@ -5,14 +5,13 @@
 SetPackageInfo( rec(
 PackageName := "fr",
 Subtitle := "Computations with functionally recursive groups",
-Version := "2.3.4",
-Date := "03/03/2016",
+Version := "2.3.5",
+Date := "13/03/2016",
 ## <#GAPDoc Label="Version">
-## <!ENTITY Version "2.3.4">
-## <!ENTITY Date "03/03/2016">
+## <!ENTITY Version "2.3.5">
+## <!ENTITY Date "13/03/2016">
 ## <#/GAPDoc>
-ArchiveURL := Concatenation("https://github.com/gap-packages/fr/releases/download/v",~.Version,"/fr-",~.Version),
-ArchiveFormats := ".tar.gz",
+
 Persons := [
   rec(
     LastName      := "Bartholdi",
@@ -35,15 +34,25 @@ Status := "deposited",
 CommunicatedBy := "Götz Pfeiffer (NUI Galway)",
 #AcceptDate := "",
 
-README_URL := "http://gap-packages.github.io/fr/README.fr",
-PackageInfoURL := "http://gap-packages.github.io/fr/PackageInfo.g",
-AbstractHTML := "The <span class=\"pkgname\">FR</span> package allows \
+SourceRepository := rec(
+    Type := "git",
+    URL := Concatenation( "https://github.com/gap-packages/", ~.PackageName ),
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://gap-packages.github.io/", ~.PackageName ),
+README_URL      := Concatenation( ~.PackageWWWHome, "/README.", ~.PackageName ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "/PackageInfo.g" ),
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/v", ~.Version,
+                                 "/", ~.PackageName, "-", ~.Version ),
+ArchiveFormats := ".tar.gz",
+
+AbstractHTML := "The <span class=\"pkgname\">fr</span> package allows \
    GAP to manipulate groups generated by automata, and more generally \
    functionally recursive groups",
-PackageWWWHome := "http://gap-packages.github.io/fr/",
 
 PackageDoc := rec(
-  BookName  := "FR",
+  BookName  := "fr",
   HTMLStart := "doc/chap0.html",
   PDFFile   := "doc/manual.pdf",
   SixFile   := "doc/manual.six",
@@ -59,14 +68,14 @@ Dependencies := rec(
                       ["GAPDoc",">=1.0"]],
   SuggestedOtherPackages := [["GBNP",">=0.9"],
                       ["NQ",">=2.4"],
-                      ["NQL",">=0.10"]],
+                      ["LPRES",">=0.1"]],
   # additional desired packages: graphviz, display
   ExternalConditions := []
 ),
 
 AvailabilityTest := ReturnTrue,
 
-BannerString := Concatenation("Loading FR ", String( ~.Version ), " ...\n"),
+BannerString := Concatenation("Loading ", ~.PackageName, " ", String( ~.Version ), " ...\n"),
 
 Autoload := false,
 TestFile := "tst/testall.g",