Merge commit '84f0e3128b1ac1d2299e0a3ebb7117c775dfe16f'

4 files changed, 129 insertions, 2 deletions

diff --git a/meta/conf/checksums.ini b/meta/conf/checksums.ini
index daf64cfd0..f45e5560d 100644
--- a/meta/conf/checksums.ini
+++ b/meta/conf/checksums.ini
@@ -702,6 +702,10 @@ sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13
 md5=1ef201f29283179c8e5ab618529cac78
 sha256=744d8f3a8206fbc45a5558d92163d5ef7e5e0cc0700283bb6a617fb1201629f9
 
+[http://archive.apache.org/dist/tomcat/tomcat-4/v4.1.37/src/apache-tomcat-4.1.37-src.tar.gz]
+md5=fe50177a25a084ad1abf4a201d08c2a6
+sha256=65e4cc9d3ea4a7f30044bfd6c660c772adb75ac152d775342deb6049a0d19d74
+
 [ftp://ftp.buici.com/pub/apex/apex-1.4.11.tar.gz]
 md5=7259a49d93b1853b1b3435753893ab7c
 sha256=bce6638d95fa8d32b109176a7cef6aa71e40c130068fac71b0df369d1a36c82c
@@ -946,6 +950,10 @@ sha256=e25caa0e9639ea54dd7c4f21e8146ac9859a61fa126f397edf874b5fdc147430
 md5=4510391e6b3edaa4cffb3ced87c9560c
 sha256=b26a3499672b0eddcbd87c8e61dfb60ae74d9ee0cc181a5d924fb73db62a25ec
 
+[ftp://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2]
+md5=1498208ab1c8393dcbd9afb7d06df6d5
+sha256=c38ac9fe53d9492b0a0a02a8e691cd2c96d7f4cc13aedeedc6d08613b77e640f
+
 [ftp://ftp.gnu.org/gnu/automake/automake-1.10.tar.bz2]
 md5=0e2e0f757f9e1e89b66033905860fded
 sha256=2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697
@@ -1310,6 +1318,10 @@ sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
 md5=5a6228512bcce7d9fabe8fc2d66269bf
 sha256=5cd1a5aeace83a9305f7221e9ec95127b5a26870c619fd00ae48f1962d59f48b
 
+[ftp://ftp.debian.org/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
+md5=62edc09c9908107e69391c87f4f3fd40
+sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/b/blktool/blktool_4.orig.tar.gz]
 md5=62edc09c9908107e69391c87f4f3fd40
 sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
@@ -1594,6 +1606,14 @@ sha256=f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
 md5=badb4563a02d4188b478df31fa1b657d
 sha256=5c4594f71eab62e24d12c67ae6a6aead306c537cf71e946c4e9fbebbe9786243
 
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-0.98.tar.bz2]
+md5=8b8907c8b925761c9410bcadb9705346
+sha256=cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188
+
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.3/cacao-0.99.3.tar.bz2]
+md5=db93ab31c6d1b7f1e213771bb81bde58
+sha256=1ea5bd257f755ffcae2c7a1935c37147c7392478922410e0870361eea08b6c27
+
 [http://cairographics.org/releases/cairo-1.2.2.tar.gz]
 md5=2460487b1257a5583c889b1b9d2033ec
 sha256=9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02
@@ -1806,6 +1826,18 @@ sha256=6a068f70f908ee4de0ba4d7e1d5127b12ad548da371494c668966d1ff98e05a2
 md5=cf5aaaf07fe43567fa605b33165355d7
 sha256=4f2824c42062dea269e489c1acb2769c015bf78cdaa929ee75441d412f10a03b
 
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.93.tar.gz]
+md5=ffa9e9cac31c5acbf0ea9eff9efa923d
+sha256=df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945
+
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.96.1.tar.gz]
+md5=a2ffb40f13fc76c2dda8f8311b30add9
+sha256=ee464d20ef9df2196e238302d5d06954cb96a11e73c4c44c6ef376859de2a078
+
+[ftp://ftp.gnu.org/gnu/classpath/classpath-0.97.2.tar.gz]
+md5=6a35347901ace03c31cc49751b338f31
+sha256=001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
+
 [http://downloads.sourceforge.net/sylpheed-claws/claws-mail-2.7.2.tar.bz2]
 md5=079f167fba6e17ae2c688a0dae858b0f
 sha256=a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5
@@ -2182,6 +2214,10 @@ sha256=4be82f4ef8f4657f997a44b3daddba3f95dbb6518487509767d803dd72bf529e
 md5=c552b9bc4b69e4c602644abc21b7661e
 sha256=6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
 
+[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.4.tar.gz]
+md5=2e643910a09f44b000a0d76038637999
+sha256=ab3c24d8028a5792e62e8e3b40a9733b10b21327dc4c578e34b092a1793afbb8
+
 [http://freedesktop.org/software/dbus/releases/dbus-glib-0.71.tar.gz]
 md5=4e1e7348b26ee8b6485452113f4221cc
 sha256=b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7
@@ -2418,6 +2454,10 @@ sha256=cc2c86cbd0ec020a4486ac9d195e6a848a0d11a280c3194e095719f60c9751a9
 md5=ab066a97c226066485ad20e5ad5ce424
 sha256=54f3e9ac2bd9f622b28ab0d5149e9bc13d62d8826be085c32abc929bc30dda6a
 
+[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.46.tar.gz]
+md5=79ec740d1a10ee75f13efa4ff36d0250
+sha256=9888d96d7d91e518c96a034dc863f8f7d961acd9334a1acde849c6022e540212
+
 [ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.13.tar.gz]
 md5=af785716b207a7a562551851298a3b1a
 sha256=f74e9485f1e1f7484be432f4979415afbd9d8c20d0bdf6eab42eb2931b9b5d97
@@ -2506,6 +2546,22 @@ sha256=c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
 md5=1c1c5177aea9a23b45b9b3f5b3241819
 sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
+md5=c7545bb05e0c2fc59174f0dc455c6519
+sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
+
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.34.tar.gz]
+md5=b51824f1c34be88e8581d96fc418d224
+sha256=2c505a14157fe591bd540b9a0dca11f5d842e3b6c34a23dbbbd9eafcc9fa33fa
+
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.35.tar.gz]
+md5=d31301cc2756dc9b0254b6aac03c376e
+sha256=236f1c173fe378b1306db797dc31f1884208ceac3ab81ad52f69e01f7bf61277
+
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.39.tar.gz]
+md5=32a2f67223feb2d70233eb3f41e73311
+sha256=fe3c72d861f2a3791f31ea33043d25e29e9a4e3d6a3833b151237a62c5c703f9
+
 [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz]
 md5=1829b2b261e0e0d07566066769b5b28b
 sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b
@@ -2530,6 +2586,10 @@ sha256=6b5a71790120977a96d5a468ed69987107c5079f14b0a4081f460b3b14fbf952
 md5=c3c60c83f6df30021e11da50a699dec9
 sha256=2382f315fda4241a0043bac1dfc669f006d8e93e87fa382b263b1672972f4077
 
+[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip]
+md5=f7b84d912e61dfdd77b7173065845250
+sha256=a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
+
 [http://enlightenment.freedesktop.org/files/ecore-0.9.9.037.tar.gz]
 md5=ec6d00a39ca6648f12f58f8d4f2208cc
 sha256=2c31372ccfc9b411edc73785450c5212dc4a2fe286de9f49f38a02dd24895aea
@@ -2822,6 +2882,10 @@ sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 md5=3654bbbf01deeb0d804df194e1b1a2b3
 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
+md5=c324eb1e157edad17d98b1b2c8b99e25
+sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.9.4.tar.gz]
 md5=c324eb1e157edad17d98b1b2c8b99e25
 sha256=8c55b1640c726bd421b68a1119f20b002eb29d95ae58d480a1d5d7d8afba1e81
@@ -2838,6 +2902,10 @@ sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 md5=2aaf871471a9ec037763c5dc7c193c57
 sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575
 
+[http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.95.tar.gz]
+md5=92a70f9e56223b653bce0f58f90cf950
+sha256=ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54
+
 [http://ftp3.ie.freebsd.org/pub/gentoo/distfiles/fbgetty-0.1.698.tar.gz]
 md5=1705bc0f8f1e03fe50d324ba84ac4e56
 sha256=332cbffa7c489b39a7d13d12d581c27dfc57ba098041431a6845b44785cf2d35
@@ -3498,6 +3566,10 @@ sha256=63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913
 md5=b594ff4ea4fbef4ba9220887de713dfe
 sha256=3444179840638cb8664e8e53604900c4521d29d57785a5091202ee4937d8d0fd
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2]
+md5=4a21ac777d4b5617283ce488b808da7b
+sha256=7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
+
 [ftp://ftp.gnu.org/gnu/gcc/gcc-4.0.0/gcc-4.0.0.tar.bz2]
 md5=55ee7df1b29f719138ec063c57b89db6
 sha256=38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc
@@ -5598,6 +5670,10 @@ sha256=ef6b1c8def236f16ea914eccbb050c84ee314c0028b03c560ed20ff96776f74c
 md5=641ec45fe377529c7fd914f77b11b44f
 sha256=9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834
 
+[http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2]
+md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a
+sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab
+
 [http://ftp.debian.org/debian/pool/main/i/iceweasel/iceweasel_3.0.1-1.diff.gz]
 md5=7124ea3c13369ff27bcff0080aca678f
 sha256=1d70e21e1c20e8d88bf3d2590de75c3e65b12da335097716adc58712cea41dad
@@ -7870,6 +7946,10 @@ sha256=e69f4cc9baee9be87400371cbdca1cb03428394c624640e64397089d090dbf0d
 md5=c779f84c4add124e704e6ea3ccc4039c
 sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.4/libsoup-2.4.1.tar.bz2]
+md5=d0fc91ccb9da401e9e40d2f4612bdac9
+sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
+
 [http://www.libspf2.org/spf/libspf2-1.0.4.tar.gz]
 md5=5fe69ba13bf35d505b733247032a8a64
 sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1
@@ -8538,6 +8618,10 @@ sha256=e08067d89e306fad7f4be56821998c073fc457d9444a18f6eb55dc7c0710a9d5
 md5=dea74646b7e5c621fef7174df83c34b1
 sha256=a6c85d85f912e1c321723084389d63dee7660b81b8292452b190ea7190dd73bc
 
+[http://www.lua.org/ftp/lua-5.1.4.tar.gz]
+md5=d0870f2de55d59c1c8419f36e8fac150
+sha256=b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a
+
 [http://luaforge.net/frs/download.php/989/lua-gtk2-0.3.tar.gz]
 md5=a2788c45d60ef8ce30168811d7e72334
 sha256=b3dd85e34b22cf757eafb6ef15c5505d5ec5e71803caef4b69ddc7fd5d46fabe
@@ -8626,6 +8710,10 @@ sha256=d7ee2e668455f9a092418e5475f32676eb0b37c54ae38a7fcdf2d14e0fb80c91
 md5=be2790a34349ab452dddbcfe4c95606a
 sha256=c1c67839d4af290aecd8f7743312aacc0a39ae99757f0910918531ef9a63e14f
 
+[ftp://ftp.gnu.org/gnu/m4/m4-1.4.12.tar.gz]
+md5=0499a958a561781b125c740f18061ea8
+sha256=47e8f9a33ba06fa6710b42d6f6ded41f45027f6f4039b0a3ed887c5116bc2173
+
 [ftp://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz]
 md5=8d1d64dbecf1494690a0f3ba8db4482a
 sha256=a116c52d314c8e3365756cb1e14c6b460d6bd28769121f92373a362497359d88
@@ -9594,6 +9682,10 @@ sha256=e4c0875794a74ac627b7b74b6098e75c8413bd156856dc434a49c4c112a68af2
 md5=7df692e3186109cc00db6825b777201e
 sha256=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
 
+[http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2]
+md5=670931f67b2e4ac46c6e0cd15418f2fa
+sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e
+
 [ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.2.29.tgz]
 md5=6c4c72a1336aa45b463e738034c078d6
 sha256=82ed5a27d2b340826b2e10625e687627ccefc883a426314952e4a253d5a6af29
@@ -10082,6 +10174,10 @@ sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
 md5=5f09df47a16e83462384b44b75310539
 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
 
+[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/pax-utils-0.1.19.tar.bz2]
+md5=98f6b9fe17a740a8cc577255422c6103
+sha256=3918628e9f2508708a1a28f5ed4cb39d07cbd5711747bbb3ddf63816d056c11e
+
 [http://the.earth.li/pub/e3/pbltool-0.2.c]
 md5=c8fd507f831d2b017dfecf60bc55e28a
 sha256=2a1e31d4ae859e530895882273fad0170374a2d5b838bb4558303e59236e9cb6
@@ -10178,6 +10274,10 @@ sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996
 md5=e6029fafcee029edcfa2ceed7a005333
 sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
 
+[http://us2.php.net/distributions/php-5.2.6.tar.bz2]
+md5=7380ffecebd95c6edb317ef861229ebd
+sha256=1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
+
 [http://efault.net/npat/hacks/picocom/dist/picocom-1.3.tar.gz]
 md5=21865bf2891222082afc44afdd80aeaa
 sha256=ed3e0190a1940cf08a167429aa3fd25b3ae7313fdf126f851a9abccc89845ee6
@@ -11046,6 +11146,10 @@ sha256=06b32d6f8fe7065b4c2c8142a244374e1be963757125bac20ba016b92231b5bf
 md5=5f8dd5a041ca7c700b16620228f922aa
 sha256=de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8
 
+[http://download.savannah.gnu.org/releases/quilt/quilt-0.47.tar.gz]
+md5=d33d2442bd34387260b1c1db3e623af0
+sha256=100a6a7d5012d36590e607ebc87535f62318cfe7368f4cd44cacb94a2cf938a2
+
 [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz]
 md5=142b10ab27e837c3c4603cf9a7e9343b
 sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1
@@ -11286,6 +11390,10 @@ sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c
 md5=3fbb02294a8ca33d4684055adba5ed6f
 sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 
+[ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p286.tar.gz]
+md5=797ea136fe43e4286c9362ee4516674e
+sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
+
 [http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-4.8.tar.bz2]
 md5=b8f69ee5a4a2cd195892107be3a3cb29
 sha256=de644640cf71a6ce72f27ac6489b65434105fc6c94538c471925a15e2259b796
@@ -11826,10 +11934,18 @@ sha256=0ad86c4b26cd687122b158bf848f0a07d7cd644033d15c4f43b6d643bd74cd81
 md5=b4f631268d811189cfca1d5259cb5dd8
 sha256=af0b4ca361435e54316ddf715737b5b94c737c41e3c0b0e6d66ee8a8938f4500
 
+[http://www.sqlite.org/sqlite-3.5.4.tar.gz]
+md5=f17da840eed792e896c3408d0ce97718
+sha256=47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f
+
 [http://www.sqlite.org/sqlite-3.5.6.tar.gz]
 md5=903c9e935c538af392364a9172a3d98d
 sha256=1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
 
+[http://www.sqlite.org/sqlite-3.6.7.tar.gz]
+md5=5223d1f459b608ed8c2c54f8847f8e1a
+sha256=55464820daf6d0559ac6355e9c873b6f111f48a18a9751261a86c650291a65de
+
 [http://downloads.sourceforge.net/squashfs/squashfs2.0-r2.tar.gz]
 md5=0b7fcaab8e634ae2385984885c731082
 sha256=353b768294783959219f1203e76c128fb4c75fa37f3a3bb139603c5db55c6974
@@ -11954,6 +12070,10 @@ sha256=8f2275d9667909d3418213522d5d4ef3312c158190429062f79da6b982b9ce6b
 md5=157d31c9dc02aa22b5f27323e5a203fc
 sha256=c31d3bbee984c7971d2b24cddc279d8ad65edff8216778d617484c147ba3ae3d
 
+[http://swfdec.freedesktop.org/download/swfdec/0.7/swfdec-0.7.4.tar.gz]
+md5=08fcda4a46454bfc66b97fba2d385f8c
+sha256=4345da2a4790125bd7205bd10a3326bf94e36f97229850b99ec9e8f050a9ab4a
+
 [http://downloads.sourceforge.net/swig/swig-1.3.29.tar.gz]
 md5=44c6f6d8d724cf7fa4a5109e6f63c9b1
 sha256=68b1b032cdc6297f068ef8c3c09abdd46a08512e17705d477cc0bf7b80a550e8
@@ -13282,6 +13402,10 @@ sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
 md5=c0e88fc3483d90a7fea6a399298d90ea
 sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
 
+[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.1.tar.bz2]
+md5=033f14f7c4e30d1f4edbb22d5ef86883
+sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2]
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 47e3167ed..d799ba2d1 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r2"
+PR = "r3"
 
 do_stage() {
 	oe_runmake install
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 68c8a842e..2efcf46b2 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -12,7 +12,7 @@ SRC_URI = "\
   file://99_dbus \
 "
 
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig gettext
 
 INITSCRIPT_NAME = "dbus-1"
 INITSCRIPT_PARAMS = "start 02 5 2 . stop 20 0 1 6 ."
diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index 25ab98b9f..b170e7b34 100644
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -1,4 +1,7 @@
 include dbus.inc
 
+PR = "r1"
+
+inherit update-rc.d
 
 SRC_URI += "file://fix-install-daemon.patch;patch=1 "