From 84d7c28c9f3500d75d9ef71a0214259e8c9eea40 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 02:29:21 +0000
Subject: make: Add version 3.81 for both make and make-native.

---
 packages/make/files/.mtn2git_empty |  0
 packages/make/files/SCCS.patch     | 16 ++++++++++++++++
 packages/make/make-3.80/SCCS.patch | 16 ----------------
 packages/make/make-native_3.80.bb  | 15 ++++++++++-----
 packages/make/make-native_3.81.bb  | 14 ++++++++++++++
 packages/make/make.inc             | 11 +++++++++++
 packages/make/make_3.80.bb         | 10 ++--------
 packages/make/make_3.81.bb         |  3 +++
 8 files changed, 56 insertions(+), 29 deletions(-)
 create mode 100644 packages/make/files/.mtn2git_empty
 create mode 100644 packages/make/files/SCCS.patch
 delete mode 100644 packages/make/make-3.80/SCCS.patch
 create mode 100644 packages/make/make-native_3.81.bb
 create mode 100644 packages/make/make.inc
 create mode 100644 packages/make/make_3.81.bb

diff --git a/packages/make/files/.mtn2git_empty b/packages/make/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/make/files/SCCS.patch b/packages/make/files/SCCS.patch
new file mode 100644
index 0000000000..c998e118ed
--- /dev/null
+++ b/packages/make/files/SCCS.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- make-3.80/configure.in~SCCS
++++ make-3.80/configure.in
+@@ -264,7 +264,7 @@
+            [Define this if the SCCS 'get' command understands the '-G<file>' option.]);;
+   esac
+ fi
+-rm -f s.conftest conftoast
++rm -f s.conftest conftoast SCCS/*s.conftest
+ 
+ # Check the system to see if it provides GNU glob.  If not, use our
+ # local version.
diff --git a/packages/make/make-3.80/SCCS.patch b/packages/make/make-3.80/SCCS.patch
deleted file mode 100644
index c998e118ed..0000000000
--- a/packages/make/make-3.80/SCCS.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- make-3.80/configure.in~SCCS
-+++ make-3.80/configure.in
-@@ -264,7 +264,7 @@
-            [Define this if the SCCS 'get' command understands the '-G<file>' option.]);;
-   esac
- fi
--rm -f s.conftest conftoast
-+rm -f s.conftest conftoast SCCS/*s.conftest
- 
- # Check the system to see if it provides GNU glob.  If not, use our
- # local version.
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
-- 
cgit v1.2.3


From 1d545ebf6ef93aa20d71c8527f2e9783729839dc Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 02:43:53 +0000
Subject: libpng 1.2.12: Disable the use of x86 assembler code. When building
 for i586 or i686 it attempts to use the assembler code but does not link it
 in, so either the assembly code needs to be disabled or the makefiles patch
 to link in the assembly code. Closes #1326.

---
 packages/libpng/1.2.12/.mtn2git_empty        | 0
 packages/libpng/libpng-1.2.12/.mtn2git_empty | 0
 packages/libpng/libpng_1.2.12.bb             | 1 +
 3 files changed, 1 insertion(+)
 create mode 100644 packages/libpng/1.2.12/.mtn2git_empty
 create mode 100644 packages/libpng/libpng-1.2.12/.mtn2git_empty

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
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
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.*//'
-- 
cgit v1.2.3


From d83bf8f3d177e3e626c6c6f545b32e802cdcaacf Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 02:55:03 +0000
Subject: conserver: Remove spurious .debug directories from the main packages.

---
 packages/conserver/conserver.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/conserver/conserver.inc b/packages/conserver/conserver.inc
index 579def2fab..4787d4df48 100644
--- a/packages/conserver/conserver.inc
+++ b/packages/conserver/conserver.inc
@@ -3,6 +3,7 @@ consoles and logs all data to a central host."
 HOMEPAGE = "http://www.conserver.com/"
 SECTION = "console/network"
 LICENSE = "BSD"
+PR = "r1"
 
 SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz \
 	   file://conserver.init \
@@ -29,3 +30,6 @@ do_install_append () {
 	install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
 	install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
 }
+
+FILES_${PN} = "${sysconfdir} ${bindir}/* ${libdir}/${PN}/* ${sbindir}/*"
+FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/${PN}/.debug"
-- 
cgit v1.2.3


From 3331ba73ef138361a88431626db11e7a3c80a58a Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 02:56:22 +0000
Subject: conserver: Fix up the PR's which I needed to bump them in the main
 .bb files, not in the .inc file like I did in the last commit.

---
 packages/conserver/conserver.inc       | 1 -
 packages/conserver/conserver_8.1.14.bb | 2 +-
 packages/conserver/conserver_8.1.2.bb  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/conserver/conserver.inc b/packages/conserver/conserver.inc
index 4787d4df48..a12dab5f9d 100644
--- a/packages/conserver/conserver.inc
+++ b/packages/conserver/conserver.inc
@@ -3,7 +3,6 @@ consoles and logs all data to a central host."
 HOMEPAGE = "http://www.conserver.com/"
 SECTION = "console/network"
 LICENSE = "BSD"
-PR = "r1"
 
 SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz \
 	   file://conserver.init \
diff --git a/packages/conserver/conserver_8.1.14.bb b/packages/conserver/conserver_8.1.14.bb
index 59a1041a43..37d33431b6 100644
--- a/packages/conserver/conserver_8.1.14.bb
+++ b/packages/conserver/conserver_8.1.14.bb
@@ -1,2 +1,2 @@
 require conserver.inc
-PR="r2"
+PR = "r3"
diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb
index d720a2182c..443add1be6 100644
--- a/packages/conserver/conserver_8.1.2.bb
+++ b/packages/conserver/conserver_8.1.2.bb
@@ -1,2 +1,2 @@
 require conserver.inc
-PR="r3"
+PR = "r4"
-- 
cgit v1.2.3


From 0fae41734192470283bfda8ccf507c5fcc5a9015 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 03:02:05 +0000
Subject: conserver: Run sanitize.py over all the files.

---
 packages/conserver/conserver.inc       | 33 +++++++++++++++++----------------
 packages/conserver/conserver_8.1.14.bb |  3 ++-
 packages/conserver/conserver_8.1.2.bb  |  3 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/conserver/conserver.inc b/packages/conserver/conserver.inc
index a12dab5f9d..ff8314fc6e 100644
--- a/packages/conserver/conserver.inc
+++ b/packages/conserver/conserver.inc
@@ -5,30 +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"
-
-# Include the examples in the documentation package
-FILES_${PN}-doc += "${datadir}/examples/conserver"
-
-# Indicate that the default file is a configuation file
-CONFFILES_${PN} = "${sysconfdir}/default/conserver"
+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
+        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"
+
+# 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 37d33431b6..884d196681 100644
--- a/packages/conserver/conserver_8.1.14.bb
+++ b/packages/conserver/conserver_8.1.14.bb
@@ -1,2 +1,3 @@
-require conserver.inc
 PR = "r3"
+
+require conserver.inc
diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb
index 443add1be6..3aa11df94b 100644
--- a/packages/conserver/conserver_8.1.2.bb
+++ b/packages/conserver/conserver_8.1.2.bb
@@ -1,2 +1,3 @@
-require conserver.inc
 PR = "r4"
+
+require conserver.inc
-- 
cgit v1.2.3


From c4e70d60a71bd8b06a2f0ff90fc527613c858afc Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 03:10:51 +0000
Subject: site i586-linux: Add required entry for sudo.

---
 site/i586-linux | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/site/i586-linux b/site/i586-linux
index f78dbbfe04..1be379c993 100644
--- a/site/i586-linux
+++ b/site/i586-linux
@@ -124,6 +124,9 @@ php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_
 # xffm
 jm_cv_func_working_readdir=yes
 
+#sudo
+sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
+
 # ipsec-tools
 ac_cv_va_copy=${ac_cv_va_copy=no}
 ac_cv___va_copy=${ac_cv___va_copy=yes}
-- 
cgit v1.2.3


From d89a1abf8213fc786482d37e17a6a0561822b8b5 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 04:09:05 +0000
Subject: gawk 3.1.4: Remove spurious .debug directories from the main
 packages.

---
 packages/gawk/gawk_3.1.4.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/gawk/gawk_3.1.4.bb b/packages/gawk/gawk_3.1.4.bb
index bf93f7e201..c860454e5f 100644
--- a/packages/gawk/gawk_3.1.4.bb
+++ b/packages/gawk/gawk_3.1.4.bb
@@ -2,11 +2,12 @@ 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"
+PR = "r3"
 PACKAGES += "gawk-common pgawk"
 FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
-FILES_gawk-common += "${datadir}/awk ${libexecdir}/awk"
+FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
 FILES_pgawk = "${bindir}/pgawk*"
+FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
 RDEPENDS_gawk += "gawk-common"
 RDEPENDS_pgawk += "gawk-common"
 
-- 
cgit v1.2.3


From b123d379836c1d5d5a55a6e7bcdf5becf4d8a2cf Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 04:11:56 +0000
Subject: gawk 3.1.4: Run sanitize.py over the recipe.

---
 packages/gawk/gawk_3.1.4.bb | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/gawk/gawk_3.1.4.bb b/packages/gawk/gawk_3.1.4.bb
index c860454e5f..9594127b08 100644
--- a/packages/gawk/gawk_3.1.4.bb
+++ b/packages/gawk/gawk_3.1.4.bb
@@ -1,30 +1,29 @@
-LICENSE = "GPL"
-SECTION = "interpreters"
 DESCRIPTION = "A program that you can use to select particular records in a \
 file and perform operations upon them."
-PR = "r3"
-PACKAGES += "gawk-common pgawk"
-FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
-FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
-FILES_pgawk = "${bindir}/pgawk*"
-FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
+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
 
 do_configure_prepend () {
-	grep -E '^AC_DEFUN' m4/*.m4|grep -E '\(\[?(AM|AC)_'|xargs rm -f
+        grep -E '^AC_DEFUN' m4/*.m4|grep -E '\(\[?(AM|AC)_'|xargs rm -f
 }
 
-pkg_postinst_${PN} () {
-	update-alternatives --install ${bindir}/awk awk gawk 100
-}
+PACKAGES += "gawk-common pgawk"
 
+FILES_${PN} = "${bindir}/gawk* ${bindir}/igawk"
+FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
+FILES_pgawk = "${bindir}/pgawk*"
+FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
 
+pkg_postinst_${PN} () {
+        update-alternatives --install ${bindir}/awk awk gawk 100
+}
 pkg_prerm_${PN} () {
-	update-alternatives --remove awk gawk
+        update-alternatives --remove awk gawk
 }
-
-- 
cgit v1.2.3


From 1631f5f16233e4a234f4629ab06d2462b1132b3f Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 04:21:58 +0000
Subject: gawk 3.1.4: Use the update-alternatives class rather than manually
 performing the update-alternatives actions.

---
 packages/gawk/gawk_3.1.4.bb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/gawk/gawk_3.1.4.bb b/packages/gawk/gawk_3.1.4.bb
index 9594127b08..5af890eec8 100644
--- a/packages/gawk/gawk_3.1.4.bb
+++ b/packages/gawk/gawk_3.1.4.bb
@@ -8,7 +8,7 @@ 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
@@ -21,9 +21,7 @@ FILES_gawk-common += "${datadir}/awk/* ${libexecdir}/awk/*"
 FILES_pgawk = "${bindir}/pgawk*"
 FILES_${PN}-dbg += "${libexecdir}/awk/.debug"
 
-pkg_postinst_${PN} () {
-        update-alternatives --install ${bindir}/awk awk gawk 100
-}
-pkg_prerm_${PN} () {
-        update-alternatives --remove awk gawk
-}
+ALTERNATIVE_NAME = "awk"
+ALTERNATIVE_PATH = "gawk"
+ALTERNATIVE_LINK = "${bindir}/awk"
+ALTERNATIVE_PRIORITY = "100"
-- 
cgit v1.2.3


From 89e89662021692a6c3e74c9ef1a1b9807a216ffe Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 04:35:40 +0000
Subject: libxml2 2.6.22: Remove spurious .debug directories from the non -dbg
 packages.

---
 packages/libxml/libxml2_2.6.22.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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}/*"
-- 
cgit v1.2.3


From a0fa35a8ea6a6ad72c8b71b571bbdddb53b66fc9 Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Sun, 10 Sep 2006 05:07:13 +0000
Subject: postfix 2.0.20: Remove spurious .debug directories from the non -dbg
 packages.

---
 packages/postfix/postfix_2.0.20.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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"
-- 
cgit v1.2.3