3 files changed, 107 insertions, 3 deletions
diff --git a/encap/tools/bcfg2-python-apt/Makefile b/encap/tools/bcfg2-python-apt/Makefile
index bd8d09857..2fa3a66d6 100644
--- a/encap/tools/bcfg2-python-apt/Makefile
+++ b/encap/tools/bcfg2-python-apt/Makefile
@@ -12,18 +12,23 @@ export EPKG
 MKENCAP = ${BASEDIR}/bin/mkencap
 export MKENCAP
 
-APTMAJOR := $(shell apt-get --version | head -1 | cut -c 7)
+DISTRO := $(shell cat /etc/issue | head -1)
 
-ifeq ($(APTMAJOR),5)
+ifeq ($(DISTRO),Debian GNU/Linux 3.1 \n \l)
 PYTHON-APT = bcfg2-python-apt-0.5.10
 endif
 
-ifeq ($(APTMAJOR),6)
+ifeq ($(DISTRO),Debian GNU/Linux testing/unstable \n \l)
 PYTHON-APT = bcfg2-python-apt-0.6.19
 endif
 
+ifeq ($(DISTRO),Ubuntu 6.06.1 LTS \n \l)
+PYTHON-APT = bcfg2-python-apt-0.6.16.2ubuntu8
+endif
+
 .ep.installed : # Clean, compile and install an encap package
 	@printf "***** START .ep.installed for |$*| ***** \n"
+	( apt-get install libapt-pkg-dev || true )
 	( ${EPKG} -q -r ${ENCAPDIR}/$* || true )
 	( rm -rf ${ENCAPDIR}/$* || true )
 	( ${MKENCAP} -m /usr/local/bin/m4 -b -DUP $*.ep || true ) > $*.log 2>&1
diff --git a/encap/tools/bcfg2-python-apt/README b/encap/tools/bcfg2-python-apt/README
index 5b2a06e83..d95e472f2 100644
--- a/encap/tools/bcfg2-python-apt/README
+++ b/encap/tools/bcfg2-python-apt/README
@@ -3,3 +3,9 @@ Before building this, make sure that you have these libraries installed:
  * /usr/lib/libapt-inst* (Part of the "apt-utils" package on Debian)
 
 You also must have the "libapt-pkg-dev" package installed.
+
+To see if your Debian variant is supported, do "grep ifeq Makefile" and see if
+any of those strings match "cat /etc/issue".
+
+It should be pretty trivial to add new Debian platforms; if you have any
+issues, mail the bcfg2-dev list or open a ticket.
diff --git a/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.6.16.2ubuntu8.ep
new file mode 100644
index 000000000..4a2f11428
--- /dev/null
+++ b/encap/tools/bcfg2-python-apt/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<!-- $Id:$ -->
+
+<encap_profile
+	profile_ver="1.0"
+	pkgspec="bcfg2-python-apt-0.6.16.2ubuntu8"
+>
+
+<environment
+        variable="CC"
+        value="gcc"
+        type="set"
+/>
+
+<environment
+        variable="PATH"
+PLATFORM_IF_MATCH(solaris)
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin:"
+PLATFORM_ELSE
+        value="/usr/local/lib/bcfg2/bin:/usr/local/bin:"
+PLATFORM_ENDIF
+        type="prepend"
+/>
+
+PLATFORM_IF_MATCH(linux)
+PLATFORM_ELSE
+<environment
+        variable="MAKE"
+        value="gmake"
+        type="set"
+/>
+PLATFORM_ENDIF
+
+<environment
+        variable="LDFLAGS"
+PLATFORM_IF_MATCH(linux)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-rpath,/usr/local/lib/bcfg2/lib"
+PLATFORM_ELSE_IF_MATCH(aix)
+        value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE_IF_MATCH(solaris)
+        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+PLATFORM_ELSE
+PLATFORM_ENDIF
+        type="set"
+/>
+
+<environment
+        variable="CPPFLAGS"
+        value="-I/usr/local/lib/bcfg2/include"
+        type="set"
+/>
+
+<source
+url="http://www.pobox.com/users/dclark/mirror/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz
+     http://archive.ubuntu.com/ubuntu/pool/main/p/python-apt/python-apt_0.6.16.2ubuntu8.tar.gz"
+subdir="python-apt-0.6.16.2ubuntu8"
+>
+
+<configure>
+/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+-I/usr/local/lib/bcfg2/include \
+-L/usr/local/lib/bcfg2/lib \
+-L/usr/local/lib/bcfg2/lib/python2.4/site-packages
+</configure>
+
+<build>
+/usr/local/lib/bcfg2/bin/python setup.py build \
+--build-base=${builddir}/build
+</build>
+
+<install>
+/usr/local/lib/bcfg2/bin/python setup.py install \
+--prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
+</install> 
+
+<clean>
+/usr/local/lib/bcfg2/bin/python setup.py clean --all
+</clean>
+
+</source>
+
+<prepackage type="set">
+mkdir var 2>/dev/null || exit 0
+mkdir var/encap 2>/dev/null || exit 0
+touch var/encap/${ENCAP_PKGNAME}
+</prepackage>
+
+<encapinfo>
+description python-apt - python interface to libapt-pkg
+</encapinfo>
+
+</encap_profile>