diff options
| author | Treeve Jelbert | 2009-01-03 17:21:28 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2009-01-03 17:21:28 +0100 |
| commit | 39fd3579fbbedd234abe5675e4ac6d678d9fac6b (patch) | |
| tree | eae4ba1dfbccef762ecc62c1d9007f164ed71a4e | |
| parent | f381fc285269004f3c36126ce75ce683ef133284 (diff) | |
| parent | 0da9646efe9f094fcf28ea4cec0a63d080fa5635 (diff) | |
Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire
| -rwxr-xr-x | chat-libs/ptlib/CONFLICTS | 1 | ||||
| -rw-r--r-- | chat-libs/ptlib/HISTORY | 3 | ||||
| -rwxr-xr-x | chat-libs/pwlib/CONFLICTS | 1 | ||||
| -rw-r--r-- | chat-libs/pwlib/HISTORY | 3 | ||||
| -rwxr-xr-x | gnome2-libs/profile-gnome2-desktop/DEPENDS | 2 | ||||
| -rw-r--r-- | gnome2-libs/profile-gnome2-desktop/HISTORY | 3 |
6 files changed, 12 insertions, 1 deletions
diff --git a/chat-libs/ptlib/CONFLICTS b/chat-libs/ptlib/CONFLICTS new file mode 100755 index 0000000000..4dee3ad9bc --- /dev/null +++ b/chat-libs/ptlib/CONFLICTS @@ -0,0 +1 @@ +conflicts pwlib diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY index a1ca252b35..96fc350b24 100644 --- a/chat-libs/ptlib/HISTORY +++ b/chat-libs/ptlib/HISTORY @@ -1,3 +1,6 @@ +2009-01-03 George Sherwood <gsherwood@sourcemage.org> + * CONFLICTS: Added conflicts pwlib. Bug 15002. + 2008-11-39 George Sherwood <gsherwood@sourcemage.org> * BUILD: Added --disable-odbc to fix Bug #14924 diff --git a/chat-libs/pwlib/CONFLICTS b/chat-libs/pwlib/CONFLICTS new file mode 100755 index 0000000000..4366174fcd --- /dev/null +++ b/chat-libs/pwlib/CONFLICTS @@ -0,0 +1 @@ +conflicts ptlib diff --git a/chat-libs/pwlib/HISTORY b/chat-libs/pwlib/HISTORY index 476b836b11..49ce7cc638 100644 --- a/chat-libs/pwlib/HISTORY +++ b/chat-libs/pwlib/HISTORY @@ -1,3 +1,6 @@ +2008-01-03 George Sherwood <gsherwood@sourcemage.org> + * CONFLICTS: Added conflicts ptlib. Bug #15002 + 2007-10-03 Arwed v. Merkatz <v.merkatz@gmx.net> * PRE_BUILD: fix plugins/configure.in to not fail if alsa is disabled, bug #14029 diff --git a/gnome2-libs/profile-gnome2-desktop/DEPENDS b/gnome2-libs/profile-gnome2-desktop/DEPENDS index 4c0fe4ce0b..aaf6e56238 100755 --- a/gnome2-libs/profile-gnome2-desktop/DEPENDS +++ b/gnome2-libs/profile-gnome2-desktop/DEPENDS @@ -61,7 +61,7 @@ depends gvfs && depends bug-buddy2 && depends alacarte && depends deskbar-applet && -depends pwlib && +depends ptlib && depends opal && depends ekiga && depends eog2 && diff --git a/gnome2-libs/profile-gnome2-desktop/HISTORY b/gnome2-libs/profile-gnome2-desktop/HISTORY index 2319541f3f..d975e4523c 100644 --- a/gnome2-libs/profile-gnome2-desktop/HISTORY +++ b/gnome2-libs/profile-gnome2-desktop/HISTORY @@ -1,3 +1,6 @@ +2009-01-03 George Sherwood <gsherwood@sourcemage.org> + * DEPENDS: ekiga now depends on ptlib vice pwlib + 2007-05-20 Arwed v. Merkatz <v.merkatz@gmx.net> * DEPENDS: changed evolution2 to evolution, gedit2 to gedit |