diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-06-21 09:44:36 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-06-21 09:44:36 +0000 |
| commit | 78283dac6429a6adaf8d76ed323030150f583eb3 (patch) | |
| tree | 7812e77efb9f5bd9cc4ebb49b381887627188707 | |
| parent | 0936b30ae6510cd0e47f2cae42025691fbb78e9e (diff) | |
| parent | 5f92d8f70b873ea097153af602986ab7e8dd8399 (diff) | |
merge of 'c49be42499a8281e021296da447021b3145791d0'
and 'd1eed5f4580f0335a30026b7fe1b92390e3312dd'
| -rw-r--r-- | packages/gaim/pidgin_2.0.2.bb (renamed from packages/gaim/pidgin_2.0.1.bb) | 2 | ||||
| -rw-r--r-- | packages/irssi/irssi_svn.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-lib/files/ruutf8.patch (renamed from packages/xorg-lib/libx11/ruutf8.patch) | 0 |
3 files changed, 3 insertions, 1 deletions
diff --git a/packages/gaim/pidgin_2.0.1.bb b/packages/gaim/pidgin_2.0.2.bb index 99bc3a34e9..e0f865722e 100644 --- a/packages/gaim/pidgin_2.0.1.bb +++ b/packages/gaim/pidgin_2.0.2.bb @@ -6,4 +6,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://pidgin.desktop-set-icon.patch;patch=1 \ " -PR = "r4" +PR = "r0" diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb index 3f4662017f..7d09f116e5 100644 --- a/packages/irssi/irssi_svn.bb +++ b/packages/irssi/irssi_svn.bb @@ -6,6 +6,8 @@ DEPENDS += "ncurses glib-2.0" PV = "0.8.10+svn${SRCDATE}" PR = "r3" +DEFAULT_PREFERENCE = "-1" + PACKAGES += "${PN}-common" FILES_${PN} = "${bindir}/irssi" FILES_${PN}-common = "${datadir}/irssi ${sysconfdir}" diff --git a/packages/xorg-lib/libx11/ruutf8.patch b/packages/xorg-lib/files/ruutf8.patch index 0822b30cb8..0822b30cb8 100644 --- a/packages/xorg-lib/libx11/ruutf8.patch +++ b/packages/xorg-lib/files/ruutf8.patch |