Fix zip-name specification in packages

maintain_catalog.py

@@ -25,6 +25,7 @@ parser.add_argument("--no-update",
 parser.add_argument("dir", help="Catalog directory")
 args = parser.parse_args()
 
+CATALOG_VERSION = 4
 includePaths = []
 packages = {}
 
@@ -184,8 +185,7 @@ else:
 catalogNode = sgprops.Node("catalog")
 sgprops.copy(config.getChild("template"), catalogNode)
 
-# version 3 catalog
+catalogNode.getChild("catalog-version", create = True).value = CATALOG_VERSION
-catalogNode.getChild("catalog-version", create = True).value = 3
 mirrorUrls = list(m.value for m in config.getChildren("mirror"))
 
 packagesToGenerate = []

package.py

@@ -199,8 +199,12 @@ class PackageData:
         self._node.getChild("revision", create = True).value = int(self._revision)
         self._node.getChild("scm-revision", create = True).value = self.scmRevision
 
+        baseName = os.path.basename(self.path)
+        self._node.getChild("dir", create = True).value = baseName
+        zipName = baseName + ".zip"
+
         for m in mirrorUrls:
-            self._node.addChild("url").value = m + "/" + self.id + ".zip"
+            self._node.addChild("url").value = m + "/" + zipName
 
         for t in self._thumbnails:
             self._node.addChild("thumbnail-path").value = t