diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-20 12:33:50 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-20 12:33:50 +0000 |
commit | 5a50ff1bc37805a4e5dc16e941acba802ca499a3 (patch) | |
tree | a86a100b1571efd0a2da71384f4cb9eca2cacb77 /packages | |
parent | 707a24c9fa7436af33d3c90e5d6d8efc0b1db99f (diff) | |
parent | f8a2614f796127c1e4d8ad7398f4d4cf401d11af (diff) |
merge of 'ca6fbf391be11c49f263e75d6b8ab2d4fd9211d6'
and 'ff2abfa528baed226e80118e78794712e9f9395f'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/dbus/dbus-1.2.1/.mtn2git_empty (renamed from packages/dbus/dbus-1.1.20/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-1.2.1/cross.patch (renamed from packages/dbus/dbus-1.1.20/cross.patch) | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-1.2.1/dbus-1.init (renamed from packages/dbus/dbus-1.1.20/dbus-1.init) | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch (renamed from packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch) | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-1.2.1/fix-install-daemon.patch (renamed from packages/dbus/dbus-1.1.20/fix-install-daemon.patch) | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-1.2.1/tmpdir.patch (renamed from packages/dbus/dbus-1.1.20/tmpdir.patch) | 0 | ||||
-rw-r--r-- | packages/dbus/dbus-native_1.2.1.bb (renamed from packages/dbus/dbus-native_1.1.20.bb) | 0 | ||||
-rw-r--r-- | packages/dbus/dbus_1.1.20.bb | 5 | ||||
-rw-r--r-- | packages/dbus/dbus_1.2.1.bb | 5 |
9 files changed, 5 insertions, 5 deletions
diff --git a/packages/dbus/dbus-1.1.20/.mtn2git_empty b/packages/dbus/dbus-1.2.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dbus/dbus-1.1.20/.mtn2git_empty +++ b/packages/dbus/dbus-1.2.1/.mtn2git_empty diff --git a/packages/dbus/dbus-1.1.20/cross.patch b/packages/dbus/dbus-1.2.1/cross.patch index 268a3ae3de..268a3ae3de 100644 --- a/packages/dbus/dbus-1.1.20/cross.patch +++ b/packages/dbus/dbus-1.2.1/cross.patch diff --git a/packages/dbus/dbus-1.1.20/dbus-1.init b/packages/dbus/dbus-1.2.1/dbus-1.init index 0725083c69..0725083c69 100644 --- a/packages/dbus/dbus-1.1.20/dbus-1.init +++ b/packages/dbus/dbus-1.2.1/dbus-1.init diff --git a/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch b/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch index 20c8d1b501..20c8d1b501 100644 --- a/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch +++ b/packages/dbus/dbus-1.2.1/fix-dbus-launch-x11.patch diff --git a/packages/dbus/dbus-1.1.20/fix-install-daemon.patch b/packages/dbus/dbus-1.2.1/fix-install-daemon.patch index c31786357d..c31786357d 100644 --- a/packages/dbus/dbus-1.1.20/fix-install-daemon.patch +++ b/packages/dbus/dbus-1.2.1/fix-install-daemon.patch diff --git a/packages/dbus/dbus-1.1.20/tmpdir.patch b/packages/dbus/dbus-1.2.1/tmpdir.patch index 838b903f0a..838b903f0a 100644 --- a/packages/dbus/dbus-1.1.20/tmpdir.patch +++ b/packages/dbus/dbus-1.2.1/tmpdir.patch diff --git a/packages/dbus/dbus-native_1.1.20.bb b/packages/dbus/dbus-native_1.2.1.bb index c97a6c6420..c97a6c6420 100644 --- a/packages/dbus/dbus-native_1.1.20.bb +++ b/packages/dbus/dbus-native_1.2.1.bb diff --git a/packages/dbus/dbus_1.1.20.bb b/packages/dbus/dbus_1.1.20.bb deleted file mode 100644 index c951fc79ec..0000000000 --- a/packages/dbus/dbus_1.1.20.bb +++ /dev/null @@ -1,5 +0,0 @@ -include dbus.inc - -PR = "r1" - -SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1" diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb new file mode 100644 index 0000000000..ffbdbdd7bf --- /dev/null +++ b/packages/dbus/dbus_1.2.1.bb @@ -0,0 +1,5 @@ +include dbus.inc + +PR = "r0" + +#SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1" |