merge of '3c8e3d68719358813ee74a6de4f4a724fd827bd0'

     and '9069334d89f0643dbe7a56f63eb0ba9aabaf2a6a'

16 files changed, 85 insertions, 48 deletions

diff --git a/packages/conserver/conserver.inc b/packages/conserver/conserver.inc
index 579def2fab..ff8314fc6e 100644
--- a/packages/conserver/conserver.inc
+++ b/packages/conserver/conserver.inc
@@ -5,27 +5,31 @@ SECTION = "console/network"
 LICENSE = "BSD"
 
 SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz \
-	   file://conserver.init \
-	   file://conserver.default"
+           file://conserver.init \
+           file://conserver.default"
 
 inherit autotools update-rc.d
 
-# Settings for the initscript
-INITSCRIPT_NAME    = "conserver"
-INITSCRIPT_PARAMS  = "defaults 98 2"
-
 # Stop install being called with -s so it doesn't try and run the host strip command
-EXTRA_OEMAKE=" INSTALL_PROGRAM=install"
+EXTRA_OEMAKE = " INSTALL_PROGRAM=install"
+
+# Include the init script and default settings in the package
+do_install_append () {
+        install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
+        install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
+        install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
+}
 
 # Include the examples in the documentation package
 FILES_${PN}-doc += "${datadir}/examples/conserver"
 
+# Make sure .debug files end up in the correct place
+FILES_${PN} = "${sysconfdir} ${bindir}/* ${libdir}/${PN}/* ${sbindir}/*"
+FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/${PN}/.debug"
+
 # Indicate that the default file is a configuation file
 CONFFILES_${PN} = "${sysconfdir}/default/conserver"
 
-# Include the init script and default settings in the package
-do_install_append () {
-	install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
-	install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
-	install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
-}
+# Settings for the initscript
+INITSCRIPT_NAME = "conserver"
+INITSCRIPT_PARAMS = "defaults 98 2"
diff --git a/packages/conserver/conserver_8.1.14.bb b/packages/conserver/conserver_8.1.14.bb
index 59a1041a43..884d196681 100644
--- a/packages/conserver/conserver_8.1.14.bb
+++ b/packages/conserver/conserver_8.1.14.bb
@@ -1,2 +1,3 @@
+PR = "r3"
+
 require conserver.inc
-PR="r2"
diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb
index d720a2182c..3aa11df94b 100644
--- a/packages/conserver/conserver_8.1.2.bb
+++ b/packages/conserver/conserver_8.1.2.bb
@@ -1,2 +1,3 @@
+PR = "r4"
+
 require conserver.inc
-PR="r3"
diff --git a/packages/gawk/gawk_3.1.4.bb b/packages/gawk/gawk_3.1.4.bb
index bf93f7e201..5af890eec8 100644
--- a/packages/gawk/gawk_3.1.4.bb
+++ b/packages/gawk/gawk_3.1.4.bb
@@ -1,29 +1,27 @@
-LICENSE = "GPL"
-SECTION = "interpreters"
 DESCRIPTION = "A program that you can use to select particular records in a \
 file and perform operations upon them."
-PR = "r2"
-PACKAGES += "gawk-common pgawk"
-FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
-FILES_gawk-common += "${datadir}/awk ${libexecdir}/awk"
-FILES_pgawk = "${bindir}/pgawk*"
+SECTION = "interpreters"
+LICENSE = "GPL"
 RDEPENDS_gawk += "gawk-common"
 RDEPENDS_pgawk += "gawk-common"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
 
-inherit autotools
+inherit autotools update-alternatives
 
 do_configure_prepend () {
-	grep -E '^AC_DEFUN' m4/*.m4|grep -E '\(\[?(AM|AC)_'|xargs rm -f
-}
-
-pkg_postinst_${PN} () {
-	update-alternatives --install ${bindir}/awk awk gawk 100
+        grep -E '^AC_DEFUN' m4/*.m4|grep -E '\(\[?(AM|AC)_'|xargs rm -f
 }
 
+PACKAGES += "gawk-common pgawk"
 
-pkg_prerm_${PN} () {
-	update-alternatives --remove awk gawk
-}
+FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
+FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
+FILES_pgawk = "${bindir}/pgawk*"
+FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
 
+ALTERNATIVE_NAME = "awk"
+ALTERNATIVE_PATH = "gawk"
+ALTERNATIVE_LINK = "${bindir}/awk"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/packages/libpng/1.2.12/.mtn2git_empty b/packages/libpng/1.2.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libpng/1.2.12/.mtn2git_empty
diff --git a/packages/libpng/libpng-1.2.12/.mtn2git_empty b/packages/libpng/libpng-1.2.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libpng/libpng-1.2.12/.mtn2git_empty
diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb
index 24117cb0ef..66b691b617 100644
--- a/packages/libpng/libpng_1.2.12.bb
+++ b/packages/libpng/libpng_1.2.12.bb
@@ -24,6 +24,7 @@ S = "${WORKDIR}/libpng-${PV}"
 inherit pkgconfig binconfig pkgconfig
 
 EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
+CFLAGS += "-DPNG_NO_ASSEMBLER_CODE"
 
 do_compile() {
 	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
diff --git a/packages/libxml/libxml2_2.6.22.bb b/packages/libxml/libxml2_2.6.22.bb
index 92f3dca661..f74d33bcc4 100644
--- a/packages/libxml/libxml2_2.6.22.bb
+++ b/packages/libxml/libxml2_2.6.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GNOME XML library"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \
 		   file://no-testapi.patch;patch=1"
@@ -22,7 +22,7 @@ python populate_packages_prepend () {
 		bb.data.setVar('PKG_libxml2', 'libxml2', d)
 }
 
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN}-utils += "${bindir}"
+FILES_${PN}-utils += "${bindir}/*"
diff --git a/packages/make/files/.mtn2git_empty b/packages/make/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/make/files/.mtn2git_empty
diff --git a/packages/make/make-3.80/SCCS.patch b/packages/make/files/SCCS.patch
index c998e118ed..c998e118ed 100644
--- a/packages/make/make-3.80/SCCS.patch
+++ b/packages/make/files/SCCS.patch
diff --git a/packages/make/make-native_3.80.bb b/packages/make/make-native_3.80.bb
index e930740d5b..509558c405 100644
--- a/packages/make/make-native_3.80.bb
+++ b/packages/make/make-native_3.80.bb
@@ -1,9 +1,14 @@
-require make_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/make-${PV}"
+PR = "r0"
+
 S = "${WORKDIR}/make-${PV}"
 
+inherit native
+
 do_stage() {
-	install -d ${STAGING_BINDIR}
-	install -m 755 make ${STAGING_BINDIR}
+        install -d ${STAGING_BINDIR}
+        install -m 755 make ${STAGING_BINDIR}
 }
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/make-${PV}"
+
+require make_${PV}.bb
diff --git a/packages/make/make-native_3.81.bb b/packages/make/make-native_3.81.bb
new file mode 100644
index 0000000000..509558c405
--- /dev/null
+++ b/packages/make/make-native_3.81.bb
@@ -0,0 +1,14 @@
+PR = "r0"
+
+S = "${WORKDIR}/make-${PV}"
+
+inherit native
+
+do_stage() {
+        install -d ${STAGING_BINDIR}
+        install -m 755 make ${STAGING_BINDIR}
+}
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/make-${PV}"
+
+require make_${PV}.bb
diff --git a/packages/make/make.inc b/packages/make/make.inc
new file mode 100644
index 0000000000..31223cbbf1
--- /dev/null
+++ b/packages/make/make.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "GNU Make examines the timestamps on a set of \
+interdependent files, and, if necessary, issues commands \
+to bring them up-to-date."
+HOMEPAGE = "http://www.gnu.org/software/make/"
+SECTION = "devel"
+LICENSE = "GPL"
+
+SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
+           file://SCCS.patch;patch=1"
+
+inherit autotools
diff --git a/packages/make/make_3.80.bb b/packages/make/make_3.80.bb
index 565b460f10..797d26b3be 100644
--- a/packages/make/make_3.80.bb
+++ b/packages/make/make_3.80.bb
@@ -1,9 +1,3 @@
-SECTION = "devel"
-DESCRIPTION = "GNU Make examines the timestamps on a set of \
-interdependent files, and, if necessary, issues commands \
-to bring them up-to-date."
-LICENSE = "GPL"
-SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \
-	   file://SCCS.patch;patch=1"
+PR = "r0"
 
-inherit autotools
+require make.inc
diff --git a/packages/make/make_3.81.bb b/packages/make/make_3.81.bb
new file mode 100644
index 0000000000..797d26b3be
--- /dev/null
+++ b/packages/make/make_3.81.bb
@@ -0,0 +1,3 @@
+PR = "r0"
+
+require make.inc
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 6ddc24477d..06e173a5c4 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "virtual/db libpcre postfix-native"
 LICENSE = "IPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
 	   file://${FILESDIR}/makedefs.patch;patch=1 \
@@ -73,3 +73,8 @@ pkg_postinst () {
 pkg_postrm () {
 	update-alternatives --remove sendmail ${sbindir}/sendmail 
 }
+
+# Exclude .debug directories from the main package
+FILES_${PN} = "${sysconfdir} ${localstatedir} ${bindir}/* ${sbindir}/* \
+               ${libexecdir}/postfix/*"
+FILES_${PN}-dbg += "${libexecdir}/postfix/.debug"