Revision 07e7dc60c6d454ea53b2d205797d1d823fef5567
markdoliner at pidgin.im
markdoliner at pidgin.im
Sat Mar 24 21:29:28 EDT 2007
o -----------------------------------------------------------------
| Revision: 07e7dc60c6d454ea53b2d205797d1d823fef5567
| Ancestor: b89ffb6324b24179cbd7845476ec61e55361350d
| Author: markdoliner at pidgin.im
| Date: 2007-03-25T01:28:40
| Branch: im.pidgin.pidgin
|
| Renamed entries:
| doc/gaims_funniest_home_convos.txt to doc/funniest_home_convos.txt
| gaim.apspec.in to pidgin.apspec.in
| pidgin/plugins/gaimrc.c to pidgin/plugins/pidginrc.c
| Modified files:
| Makefile.am configure.ac pidgin/plugins/Makefile.am
| pidgin.apspec.in po/POTFILES.in
|
| ChangeLog:
|
| Change some stuff from gaim to pidgin
|
| ============================================================
| --- Makefile.am 40dc54e02a0a41b8d9199dba80cce6099ae2869d
| +++ Makefile.am 7646ef24953f33749ecbbe2310ee1e5667ee60e0
| @@ -10,16 +10,16 @@ EXTRA_DIST = \
| README.SVN \
| README.dbus \
| README.mingw \
| + config.h.mingw \
| gaim.pc.in \
| gaim-uninstalled.pc.in \
| - gaim.apspec.in \
| gaim.service.in \
| - pidgin.spec.in \
| - pidgin.desktop.in \
| intltool-extract.in \
| intltool-merge.in \
| intltool-update.in \
| - config.h.mingw \
| + pidgin.apspec.in \
| + pidgin.spec.in \
| + pidgin.desktop.in \
| po/Makefile.mingw
|
| noinst_HEADERS = config.h
| ============================================================
| --- configure.ac c517e4b2580e69d4a47001ecb44a83d1cb61f25f
| +++ configure.ac 34f4945b51b230e5f96bfca99bc4776d05579c9e
| @@ -1895,12 +1895,12 @@ AC_OUTPUT([Makefile
|
| AC_OUTPUT([Makefile
| Doxyfile
| - gaim.apspec
| gaim.service
| doc/Makefile
| doc/pidgin.1
| doc/finch.1
| m4macros/Makefile
| + pidgin.apspec
| pidgin/Makefile
| pidgin/pidgin.pc
| pidgin/pidgin-uninstalled.pc
| ============================================================
| --- pidgin/plugins/Makefile.am 5efc78abe4ea4ac290464a9c594ada5fdae9667f
| +++ pidgin/plugins/Makefile.am d6bb1738d28105aaf9aceacb7261bc6b7c4f4883
| @@ -28,11 +28,11 @@ extplacement_la_LDFLAGS = -module -a
|
| convcolors_la_LDFLAGS = -module -avoid-version
| extplacement_la_LDFLAGS = -module -avoid-version
| -gaimrc_la_LDFLAGS = -module -avoid-version
| history_la_LDFLAGS = -module -avoid-version
| iconaway_la_LDFLAGS = -module -avoid-version
| markerline_la_LDFLAGS = -module -avoid-version
| notify_la_LDFLAGS = -module -avoid-version
| +pidginrc_la_LDFLAGS = -module -avoid-version
| relnot_la_LDFLAGS = -module -avoid-version
| spellchk_la_LDFLAGS = -module -avoid-version
| timestamp_la_LDFLAGS = -module -avoid-version
| @@ -44,11 +44,11 @@ plugin_LTLIBRARIES = \
| plugin_LTLIBRARIES = \
| convcolors.la \
| extplacement.la \
| - gaimrc.la \
| history.la \
| iconaway.la \
| markerline.la \
| notify.la \
| + pidginrc.la \
| relnot.la \
| spellchk.la \
| timestamp.la \
| @@ -57,11 +57,11 @@ extplacement_la_SOURCES = extplaceme
|
| convcolors_la_SOURCES = convcolors.c
| extplacement_la_SOURCES = extplacement.c
| -gaimrc_la_SOURCES = gaimrc.c
| history_la_SOURCES = history.c
| iconaway_la_SOURCES = iconaway.c
| markerline_la_SOURCES = markerline.c
| notify_la_SOURCES = notify.c
| +pidginrc_la_SOURCES = pidginrc.c
| relnot_la_SOURCES = relnot.c
| spellchk_la_SOURCES = spellchk.c
| timestamp_la_SOURCES = timestamp.c
| @@ -70,11 +70,11 @@ extplacement_la_LIBADD = $(GTK_LIBS
|
| convcolors_la_LIBADD = $(GTK_LIBS)
| extplacement_la_LIBADD = $(GTK_LIBS)
| -gaimrc_la_LIBADD = $(GTK_LIBS)
| history_la_LIBADD = $(GTK_LIBS)
| iconaway_la_LIBADD = $(GTK_LIBS)
| markerline_la_LIBADD = $(GTK_LIBS)
| notify_la_LIBADD = $(GTK_LIBS)
| +pidginrc_la_LIBADD = $(GTK_LIBS)
| relnot_la_LIBADD = $(GLIB_LIBS)
| spellchk_la_LIBADD = $(GTK_LIBS)
| timestamp_la_LIBADD = $(GTK_LIBS)
| ============================================================
| --- gaim.apspec.in 14d2f3d28104dd34a4298330ac436a8b105ca604
| +++ pidgin.apspec.in 35cc78d87b8711314097aea3cb25f0a544ced082
| @@ -1,11 +1,11 @@
| # -*-shell-script-*-
|
| [Meta]
| -RootName: @gaim.sourceforge.net/gaim:$SOFTWAREVERSION
| -DisplayName: Gaim Internet Messenger
| -ShortName: gaim
| -Maintainer: The Gaim Developers
| -URL: http://gaim.sourceforge.net/
| +RootName: @pidgin.im/pidgin:$SOFTWAREVERSION
| +DisplayName: Pidgin Internet Messenger
| +ShortName: Pidgin
| +Maintainer: The Pidgin Developers
| +URL: http://pidgin.im/
| Packager: Tim Ringenbach <marv_sf at users.sourceforge.net>
| Summary: A GTK+ based multiprotocol instant messaging client
| SoftwareVersion: @VERSION@
| @@ -13,16 +13,16 @@ PackageVersion: 1
| PackageVersion: 1
|
| [Description]
| -Gaim allows you to talk to anyone using a variety of messaging protocols,
| +Pidgin allows you to talk to anyone using a variety of messaging protocols,
| including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, Jabber,
| Gadu-Gadu, and Zephyr. These protocols are implemented using a
| modular, easy to use design. To use a protocol, just add an account using the
| account editor.
|
| -Gaim supports many common features of other clients, as well as many unique
| +Pidgin supports many common features of other clients, as well as many unique
| features, such as perl scripting, TCL scripting and C plugins.
|
| -Gaim is NOT affiliated with or endorsed by America Online, Inc., Microsoft
| +Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft
| Corporation, Yahoo! Inc., or ICQ Inc.
|
| [BuildPrepare]
| @@ -50,19 +50,19 @@ installExe ./bin/*
| [Install]
| # Put your installation script here
| installExe ./bin/*
| -installLib ./lib/libgaim-remote.so.0.0.0
| +installLib ./lib/libpurple-remote.so.0.0.0
| # do the plugins
| -copyFiles ./lib/gaim "$PREFIX/lib"
| -installMan 1 ./man/man1/gaim.1
| -installDesktop "Networking/Instant Messaging" ./share/applications/gaim.desktop
| +copyFiles ./lib/pidgin "$PREFIX/lib"
| +installMan 1 ./man/man1/pidgin.1
| +installDesktop "Networking/Instant Messaging" ./share/applications/pidgin.desktop
| installLocale ./share/locale
| copyFiles ./share/pixmaps "$PREFIX/share"
| copyFiles ./share/sounds "$PREFIX/share"
| -installIcon ./share/pixmaps/gaim.png
| +installIcon ./share/pixmaps/pidgin.png
| # install and fix the .pc file
| # move this to the -devel package when I make one
| -# copyFile ./lib/pkgconfig/gaim.pc "$PREFIX/lib/pkgconfig/gaim.pc"
| -# safeSed "$PREFIX/lib/pkgconfig/gaim.pc" "s|prefix=/usr/local|prefix=$PREFIX|"
| +# copyFile ./lib/pkgconfig/pidgin.pc "$PREFIX/lib/pkgconfig/pidgin.pc"
| +# safeSed "$PREFIX/lib/pkgconfig/pidgin.pc" "s|prefix=/usr/local|prefix=$PREFIX|"
|
| [Uninstall]
| # Usually just the following line is enough to uninstall everything
| ============================================================
| --- po/POTFILES.in 7f4e5eb5abbfff30b594a20e6f42536fd437c9d2
| +++ po/POTFILES.in 31446df52ee4a9e8765995a16f09a805aa946443
| @@ -181,7 +181,6 @@ pidgin/plugins/gaiminc.c
| pidgin/plugins/convcolors.c
| pidgin/plugins/extplacement.c
| pidgin/plugins/gaiminc.c
| -pidgin/plugins/gaimrc.c
| pidgin/plugins/gestures/gestures.c
| pidgin/plugins/gevolution/add_buddy_dialog.c
| pidgin/plugins/gevolution/assoc-buddy.c
| @@ -196,6 +195,7 @@ pidgin/plugins/notify.c
| pidgin/plugins/markerline.c
| pidgin/plugins/musicmessaging/musicmessaging.c
| pidgin/plugins/notify.c
| +pidgin/plugins/pidginrc.c
| pidgin/plugins/raw.c
| pidgin/plugins/relnot.c
| pidgin/plugins/spellchk.c
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 07e7dc60c6d454ea53b2d205797d1d823fef5567
More information about the Commits
mailing list