From b1d1da66e7eeb916cacc5a35b64c934ce89bfb02 Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Mon, 18 Jun 2012 15:18:07 +0200
Subject: [PATCH] Added Ubuntu 6.10, 7.04 and 7.10

---
 schema.sql  |  5 ++++-
 util/deb.sh | 26 ++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/schema.sql b/schema.sql
index d488724..30932c1 100644
--- a/schema.sql
+++ b/schema.sql
@@ -57,7 +57,10 @@ INSERT INTO systems (id, name, release, short, relorder) VALUES
   (2, 'Ubuntu',     '4.10', 'ubuntu-warty', 0),
   (3, 'Ubuntu',     '5.04', 'ubuntu-hoary', 1),
   (4, 'Ubuntu',     '5.10', 'ubuntu-breezy', 2),
-  (5, 'Ubuntu',     '6.06', 'ubuntu-dapper', 3);
+  (5, 'Ubuntu',     '6.06', 'ubuntu-dapper', 3),
+  (6, 'Ubuntu',     '6.10', 'ubuntu-edgy', 4),
+  (7, 'Ubuntu',     '7.04', 'ubuntu-feisty', 5),
+  (8, 'Ubuntu',     '7.10', 'ubuntu-gutsy', 6);
 
 
 -- Removes any path components and compression extensions from the filename.
diff --git a/util/deb.sh b/util/deb.sh
index 5330042..0cacc7b 100755
--- a/util/deb.sh
+++ b/util/deb.sh
@@ -16,7 +16,7 @@ checkpkg() {
   FILE=$6
   echo "===> $NAME-$VERSION"
   FN="$TMP/$NAME-$VERSION.deb"
-  $CURL "$REPO/$FILE" -o "$FN" || return
+  $CURL "$REPO$FILE" -o "$FN" || return
 
   # Get the date from the last modification time of the debian-binary file
   # inside the .deb. Preferably, the date we store in the database indicates
@@ -50,14 +50,14 @@ syncrepo() {
   PFN="$TMP/Packages"
   printf "" >"$PFN"
   if [ "$CONTENTSURL" != "-" ]; then
-    $CURL "$REPO/$CONTENTSURL" -o "$CFN.gz" || return 1
+    $CURL "$REPO$CONTENTSURL" -o "$CFN.gz" || return 1
     gunzip "$CFN.gz"
   fi
 
   for CMP in $COMPONENTS; do
     echo "MANDIFF-COMPONENT: $CMP" >>"$PFN"
     TFN="$TMP/Packages-$CMP.bz2"
-    $CURL "$REPO/dists/$DISTRO/$CMP/binary-i386/Packages.bz2" -o "$TFN" || return 1
+    $CURL "${REPO}dists/$DISTRO/$CMP/binary-i386/Packages.bz2" -o "$TFN" || return 1
     bzcat "$TFN" >>"$PFN"
     rm "$TFN"
   done
@@ -144,7 +144,25 @@ ubuntu_dapper() {
   syncrepo 5 "http://old-releases.ubuntu.com/ubuntu/" "dapper-security" "main multiverse restricted universe"
 }
 
-ubuntu_dapper
+ubuntu_edgy() {
+  syncrepo 6 "http://old-releases.ubuntu.com/ubuntu/" "edgy" "main multiverse restricted universe"
+  syncrepo 6 "http://old-releases.ubuntu.com/ubuntu/" "edgy-updates" "main multiverse restricted universe" "dists/edgy/Contents-i386.gz"
+  syncrepo 6 "http://old-releases.ubuntu.com/ubuntu/" "edgy-security" "main multiverse restricted universe" "dists/edgy/Contents-i386.gz"
+}
+
+ubuntu_feisty() {
+  syncrepo 7 "http://old-releases.ubuntu.com/ubuntu/" "feisty" "main multiverse restricted universe"
+  syncrepo 7 "http://old-releases.ubuntu.com/ubuntu/" "feisty-updates" "main multiverse restricted universe"
+  syncrepo 7 "http://old-releases.ubuntu.com/ubuntu/" "feisty-security" "main multiverse restricted universe"
+}
+
+ubuntu_gutsy() {
+  syncrepo 8 "http://old-releases.ubuntu.com/ubuntu/" "gutsy" "main multiverse restricted universe"
+  syncrepo 8 "http://old-releases.ubuntu.com/ubuntu/" "gutsy-updates" "main multiverse restricted universe"
+  syncrepo 8 "http://old-releases.ubuntu.com/ubuntu/" "gutsy-security" "main multiverse restricted universe"
+}
+
+ubuntu_gutsy
 
 rm -rf "$TMP"