Browse Source

Update pbuilder configuration and aliases.

Emmanuel Bouthenot 13 years ago
parent
commit
0a41969773
2 changed files with 18 additions and 18 deletions
  1. 12 13
      .pbuilderrc
  2. 6 5
      .zsh.d/os.d/Debian.zsh

+ 12 - 13
.pbuilderrc

@@ -1,27 +1,26 @@
 #!/bin/sh
 
-DIST=${DIST:-sid}
-DISTRIBUTION=${DIST}
+MIRRORSITE="ftp://ftp.fr.debian.org/debian"
+COMPONENTS="main contrib non-free"
 
 BASEPATH="/var/cache/pbuilder/${DIST}.cow"
-
 #BINDMOUNTS="/var/cache/apt/archives"
 
-MIRRORSITE="http://ftp.fr.debian.org/debian"
-COMPONENTS="main contrib non-free"
-HOOKDIR="${HOME}/.pbuilder/hooks.d/"
+DISTRIBUTION=$(echo ${DIST}|cut -d- -f1)
+if echo ${DIST} | grep -q 'bpo' ; then
+    #OTHERMIRROR="deb http://security.debian.org/ lenny/updates main | deb http://www.backports.org/debian lenny-backports main"
+    EXTRAPACKAGES="${EXTRAPACKAGES} debian-backports-keyring lintian"
+elif echo ${DIST} | grep -q '^experimental' ; then
+    EXTRAPACKAGES="${EXTRAPACKAGES} lintian"
+    PBUILDERSATISFYDEPENDSCMD=/usr/lib/pbuilder/pbuilder-satisfydepends-experimental
+fi
 
 REMOVEPACKAGES=""
 
-if [ "${DIST}" = "stable-bpo" ]; then
-	DISTRIBUTION=stable
-	EXTRAPACKAGES="${EXTRAPACKAGES} debian-backports-keyring lintian"
-	# OTHERMIRROR="deb http://security.debian.org/ lenny/updates main | deb http://www.backports.org/debian lenny-backports main"
-fi
-
+HOOKDIR="${HOME}/.pbuilder/hooks.d/"
 BUILDRESULT="${HOME}/tmp/pbuilder"
 
 if [ ! -d "${BUILDRESULT}" ]; then
-	mkdir -p "${BUILDRESULT}"
+    mkdir -p "${BUILDRESULT}"
 fi
 

+ 6 - 5
.zsh.d/os.d/Debian.zsh

@@ -29,11 +29,12 @@ cow-dist () {
     return $?
 }
 
-alias cow-sid32="cow-dist sid32"
-alias cow-stable32="cow-dist stable32"
-alias cow-sid64="cow-dist sid64"
-alias cow-stable64="cow-dist stable64"
-alias cow-stable-bpo="cow-dist stable-bpo"
+alias cow-sid32="cow-dist sid-32"
+alias cow-stable32="cow-dist stable-32"
+alias cow-exp64="cow-dist experimental-64"
+alias cow-sid64="cow-dist sid-64"
+alias cow-stable64="cow-dist stable-64"
+alias cow-stablebpo="cow-dist stable-bpo-64"
 
 # tools
 apt-rbdepends () {