Add jessie support

Makefile

@@ -35,4 +35,12 @@ chroots:
 		mkdir /var/cache/pbuilder/wheezy-amd64; \
 		cowbuilder --create --basepath /var/cache/pbuilder/wheezy-amd64/base.cow --distribution wheezy --debootstrapopts --arch --debootstrapopts amd64 --othermirror "deb http://deb.entrouvert.org/ wheezy-eobuilder main"; \
 	fi
+	if [ ! -d /var/cache/pbuilder/jessie-i386 ]; then \
+		mkdir /var/cache/pbuilder/jessie-i386; \
+		cowbuilder --create --basepath /var/cache/pbuilder/jessie-i386/base.cow --distribution jessie --debootstrapopts --arch --debootstrapopts i386 --othermirror "deb http://deb.entrouvert.org/ jessie-eobuilder main"; \
+	fi
+	if [ ! -d /var/cache/pbuilder/jessie-amd64 ]; then \
+		mkdir /var/cache/pbuilder/jessie-amd64; \
+		cowbuilder --create --basepath /var/cache/pbuilder/jessie-amd64/base.cow --distribution jessie --debootstrapopts --arch --debootstrapopts amd64 --othermirror "deb http://deb.entrouvert.org/ jessie-eobuilder main"; \
+	fi
 

dput.cf

@@ -8,6 +8,11 @@ method = scp
 fqdn = deb.entrouvert.org
 incoming = /var/vhosts/deb.entrouvert.org/incoming/wheezy-eobuilder
 
+[jessie-eobuilder]
+method = scp
+fqdn = deb.entrouvert.org
+incoming = /var/vhosts/deb.entrouvert.org/incoming/jessie-eobuilder
+
 [wheezy-legacy]
 method = scp
 fqdn = deb.entrouvert.org

eobuilder/cmdline.py

@@ -25,7 +25,7 @@ class MultipleOption(Option):
 
 def parse_cmdline():
     parser = OptionParser(option_class=MultipleOption,
-            usage='usage: %prog [OPTIONS] -d [wheezy,squeeze|wheezy|squeeze] GIT_REPOSITORY_NAME')
+            usage='usage: %prog [OPTIONS] -d [jessie,wheezy|jessie|wheezy|squeeze] GIT_REPOSITORY_NAME')
     parser.add_option("-a", "--architectures",
             action="extend", type="string",
             dest="architectures", metavar='ARCHITECTURES',
@@ -34,7 +34,7 @@ def parse_cmdline():
     parser.add_option("-d", "--distribution",
             action="extend", type="string",
             dest="distrib", metavar='DISTRIBUTIONS',
-            help="DISTRIBUTIONS: squeeze and / or wheezy")
+            help="DISTRIBUTIONS: jessie, wheezy and / or squeeze")
     parser.add_option("-f", "--force", action="store_true",
             dest="force", default=False,
             help="force a new build")
@@ -57,7 +57,7 @@ def parse_cmdline():
             action="extend", type="string",
             default=[],
             dest="repositories", metavar='DISTRIBUTION:REPOSITORY, DISTRIBUTION:REPOSITORY',
-            help="DISTRIBUTION:REPOSITORY: squeeze:squeeze-eobuilder, wheezy:wheezy-eobuilder")
+            help="DISTRIBUTION:REPOSITORY: jessie:jessie-eobuilder, wheezy:wheezy-eobuilder")
 
     (options, args) = parser.parse_args()
 

eobuilder/settings.py

@@ -7,12 +7,14 @@ EOBUILDER_TMP = "/var/tmp/eobuilder"
 REPOSITORY_URL = "deb.entrouvert.org"
 GIT_REPOSITORY_URL = "git+ssh://git@repos.entrouvert.org"
 DEBIAN_VERSIONS = {
+    "jessie": "80",
     "wheezy": "70",
     "squeeze": "60",
     "lenny": "50"
 }
 
 DEFAULT_UNSTABLE_REPOSITORIES = {
+        "jessie" : "jessie-eobuilder",
         "wheezy" : "wheezy-eobuilder",
         "squeeze": "squeeze-eobuilder"
         }
@@ -20,16 +22,16 @@ DEFAULT_UNSTABLE_REPOSITORIES = {
 # Paste new tag into repositories
 # Automatically add ne tag in this repositories
 DEFAULT_TESTING_REPOSITORIES = {
+        "jessie": ["jessie-testing"],
         "wheezy": ["wheezy-testing"],
         "squeeze": ["squeeze-testing"]
         }
 # Specify the testing repository by source package name
-MANUAL_TESTING_REPOSITORIES = {
-        }
+MANUAL_TESTING_REPOSITORIES = {}
 
 # Smart Cleaning
 # Keep at least X package versions by project
-MIN_PACKAGE_VERSIONS = 5
+MIN_PACKAGE_VERSIONS = 10
 # Keep a package version during minum X days
-MIN_AGE = 30
+MIN_AGE = 60
 

pbuilderrc

@@ -13,13 +13,9 @@ PDEBUILD_PBUILDER="cowbuilder"
 DEBIAN_SUITES=($UNSTABLE_CODENAME $TESTING_CODENAME $STABLE_CODENAME $OLDSTABLE_CODENAME
     "unstable" "testing" "stable" "oldstable")
 
-# List of Ubuntu suites. Update these when needed.
-UBUNTU_SUITES=("natty" "maverick" "lucid" "karmic" "jaunty" "hardy")
-
 # Mirrors to use. Update these to your preferred mirror.
 MIRRORSITE=http://ftp.fr.debian.org/debian
 DEBIAN_MIRROR="ftp.fr.debian.org"
-UBUNTU_MIRROR="ftp.ubuntu.com"
 
 # Optionally use the changelog of a package to determine the suite to use if
 # none set.
@@ -78,12 +74,6 @@ if $(echo ${DEBIAN_SUITES[@]} | grep -q $DIST); then
     MIRRORSITE="http://$DEBIAN_MIRROR/debian/"
     COMPONENTS="main contrib non-free"
     DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/debian-archive-keyring.gpg")
-
-elif $(echo ${UBUNTU_SUITES[@]} | grep -q $DIST); then
-    # Ubuntu configuration
-    MIRRORSITE="http://$UBUNTU_MIRROR/ubuntu/"
-    COMPONENTS="main restricted universe multiverse"
-    DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg")
 else
     echo "Unknown distribution: $DIST"
     exit 1