Commit patch from Adrien Cunin for 404main.

404main

@@ -31,7 +31,7 @@ def find_main(pack):
 	global packages
 	
 	# Retrieve information about the package
-	out = subprocess.Popen('apt-cache madison ' + pack, shell=True, stdout=subprocess.PIPE).stdout.read()
+	out = subprocess.Popen('apt-cache madison ' + pack + '  | grep hardy | grep Packages | head -n 1', shell=True, stdout=subprocess.PIPE).stdout.read()
 	
 	if out.find("/main") != -1:
 		packages[pack] = True
@@ -41,12 +41,12 @@ def find_main(pack):
 			packages[pack] = False
 		
 		# Retrive package dependencies
-		deps = subprocess.Popen("apt-cache show " + pack + " | grep Depends", shell=True, stdout=subprocess.PIPE).stdout.read().split('\n')[0].replace('Depends: ', '').split(', ')
+		deps = subprocess.Popen("apt-cache show " + pack + " | grep ^Depends | head -n 1", shell=True, stdout=subprocess.PIPE).stdout.read().split('\n')[0].replace('Depends: ', '').split(', ')
 		
 		process_deps(deps)
 		
 		# Retrieve package build dependencies
-		deps1 = subprocess.Popen("apt-cache showsrc " + pack + " | grep Build-Depends", shell=True, stdout=subprocess.PIPE).stdout.readlines()
+		deps1 = subprocess.Popen("apt-cache showsrc " + pack + " | grep ^Build-Depends | head -n 1", shell=True, stdout=subprocess.PIPE).stdout.readlines()
 		deps = []
 		
 		for builddep in deps1:

debian/changelog

@@ -18,6 +18,8 @@ ubuntu-dev-tools (0.27) UNRELEASED; urgency=low
     remove it's shabang.
   * submittodebian:
      - Check if reportbug is installed and if it isn't throw an error.
+  * 404main:
+     - Filter out entries from Debian, thanks to Adrien Cunin! (LP: #194704)
   * debian/copyright.
      - Add ppaput (the executable has been removed for now -see below-,
        but there is still the module in the source package).

pbuilder-dist

@@ -5,24 +5,24 @@
 #   Siegfried-A. Gevatter <rainct@ubuntu.com>
 # License: GPLv2 or later
 #
-# This script is a wrapper to use pbuilder with many different
+# This script is a wrapper to be able to easily use pbuilder with
-# distributions / versions. (It was originally created because of
+# differentd istributions (eg, Gutsy, Hardy, Debian unstable, etc).
-# bug #255165 in Debian.)
 #
-# If you want to use this copy of the script only for a single distribution
+# You can create symlinks to a pbuilder-dist executable to get different
-# / version, rename it to 'pbuilder-dapper', 'pbuilder-feisty', 'pbuilder-gutsy', 
+# configurations. For example, a symlink called pbuilder-hardy will assume
-# or whatever it is. If you have an amd64, you can also use names like
+# that the target distribution is always Ubuntu Hardy.
-# 'pbuilder-feisty-i386', etc.
 
-# Base directory where pbuilder will put all the files it creates
+# Base directory where pbuilder will put all the files it creates.
 # This is overriden by the global variable $PBUILDFOLDER
 BASE_DIR="$HOME/pbuilder"
 
-# Enable additional components by default? (universe and multiverse in Ubuntu,
+# Change this to 0 if you don't want additional components to be used.
-# contrib and non-free in Debian.)
+# That is, 'universe' and 'multiverse' for Ubuntu chroots and 'contrib'
+# and 'non-free' for Debian.
 EXTRACOMP=1
 
-# Save the log of the last operation in a dot-file? ('.lastlog' in BASE_DIR)
+# Change this to 1 if you want the log for the last operation to be saved
+# in the base directory by default (it will be named '.lastlog').
 SAVELOG=0
 
 # Allow this script to use /var/cache/apt/archives/ when possible
@@ -31,8 +31,6 @@ then
 	SYSCACHE=1
 fi
 
-CALLDIR=`pwd`
-
 
 ################################
 
@@ -66,6 +64,7 @@ else
         help show-dist-flag
     fi
     
+    BINARCH=$ARCH ##
     DISTRIBUTION=$1
     shift 1
 fi
@@ -241,14 +240,14 @@ else
 fi
 
 sudo pbuilder $OPERATION \
---basetgz "$BASE_DIR/$FOLDERBASE-base.tgz" \
+--basetgz "$BASE_DIR/${FOLDERBASE}-base.tgz" \
 --distribution "$DISTRIBUTION" \
 --debootstrapopts --arch \
 --debootstrapopts "$BINARCH" \
 $( [ $SAVELOG = 0 ] || echo "--logfile $BASE_DIR/.lastlog" ) \
 $( [ -z $PROXY ] || echo "--http-proxy $PROXY" ) \
 $( [ -z $DEBCACHE ] || echo "--aptcache $DEBCACHE" ) \
---buildresult "$BASE_DIR/$FOLDERBASE_result" \
+--buildresult "$BASE_DIR/${FOLDERBASE}_result" \
 --mirror "$ARCHIVE" \
 --aptconfdir "$BASE_DIR/etc/$DISTRIBUTION/apt.conf/" \
 $@