Menu
▾
▴
[Gaim-commits] CVS: gaim gaim.desktop.in,NONE,1.1 .cvsignore,1.25,1.26 Makefile.am,1.63,1.64 autogen.sh,1.28,1.29 configure.ac,1.374,1.375 gaim.desktop,1.35,1.36 gaim.spec.in,1.117,1.118
|
From: Richard L. <rl...@us...> - 2006-02-08 07:44:31
|
Update of /cvsroot/gaim/gaim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9642 Modified Files: .cvsignore Makefile.am autogen.sh configure.ac gaim.desktop gaim.spec.in Added Files: gaim.desktop.in Log Message: SF Patch #1265514 This patch adds intltool integration. It works here; let me know if it breaks anything for you. --- NEW FILE: gaim.desktop.in --- [Desktop Entry] Encoding=UTF-8 _Name=Gaim Internet Messenger _GenericName=Internet Messenger _Comment=Send instant messages over multiple protocols Exec=gaim Icon=gaim.png StartupNotify=true Terminal=false Type=Application Categories=Application;Network; Index: .cvsignore =================================================================== RCS file: /cvsroot/gaim/gaim/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -p -r1.25 -r1.26 --- .cvsignore 9 Nov 2005 09:02:43 -0000 1.25 +++ .cvsignore 8 Feb 2006 07:44:22 -0000 1.26 @@ -31,3 +31,9 @@ win32-install-dir .temp-gettextize gaim.pc *.apspec +intltool-extract +intltool-extract.in +intltool-merge +intltool-merge.in +intltool-update +intltool-update.in Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/Makefile.am,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -p -r1.63 -r1.64 --- Makefile.am 3 Dec 2005 03:55:04 -0000 1.63 +++ Makefile.am 8 Feb 2006 07:44:22 -0000 1.64 @@ -4,9 +4,12 @@ EXTRA_DIST = \ gaim.pc.in \ gaim.spec.in \ gaim.apspec.in \ - gaim.desktop \ + gaim.desktop.in \ gaim-installer.nsi \ HACKING \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ PROGRAMMING_NOTES \ setup-gettext \ ChangeLog.win32 \ @@ -36,9 +39,11 @@ distcheck-hook: plugins/perl/common/Gaim # cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common appsdir = $(datadir)/applications -apps_DATA = gaim.desktop +apps_in_files = gaim.desktop.in +apps_DATA = $(apps_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ -SUBDIRS = doc intl m4macros pixmaps plugins po sounds src +SUBDIRS = doc m4macros pixmaps plugins po sounds src docs: Doxyfile if HAVE_DOXYGEN Index: autogen.sh =================================================================== RCS file: /cvsroot/gaim/gaim/autogen.sh,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -p -r1.28 -r1.29 --- autogen.sh 9 Nov 2005 08:07:19 -0000 1.28 +++ autogen.sh 8 Feb 2006 07:44:22 -0000 1.29 @@ -58,6 +58,8 @@ do fi done +libtoolize -c -f --automake +intltoolize --force --copy aclocal $ACLOCAL_FLAGS -I ./m4 || exit; autoheader || exit; automake --add-missing --copy; Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.374 retrieving revision 1.375 diff -u -d -p -r1.374 -r1.375 --- configure.ac 8 Feb 2006 05:07:43 -0000 1.374 +++ configure.ac 8 Feb 2006 07:44:22 -0000 1.375 @@ -17,6 +17,9 @@ AC_DISABLE_STATIC AM_PROG_LIBTOOL LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL +AC_PROG_INTLTOOL +GETTEXT_PACKAGE=gaim +AC_SUBST(GETTEXT_PACKAGE) # before gettexting, in case iconv matters case "$host_os" in @@ -36,8 +39,7 @@ darwin*) esac ALL_LINGUAS="am az bg bn bs ca cs da de el en_AU en_CA en_GB es et fi fr gl gu he hi hu it ja ka ko ku lt mk my_MM nb nl nn pa pl pt_BR pt ro ru sk sl sq sr sr@Latn sv ta te tr uk vi xh zh_CN zh_TW" -AM_GNU_GETTEXT_VERSION(0.10.40) -AM_GNU_GETTEXT +AM_GLIB_GNU_GETTEXT dnl we don't use autobreak on cygwin!! dnl AC_CYGWIN @@ -1689,7 +1691,6 @@ AC_OUTPUT([Makefile gaim.apspec doc/Makefile doc/gaim.1 - intl/Makefile m4macros/Makefile pixmaps/Makefile pixmaps/smileys/Makefile Index: gaim.desktop =================================================================== RCS file: /cvsroot/gaim/gaim/gaim.desktop,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -p -r1.35 -r1.36 --- gaim.desktop 30 Oct 2005 17:23:15 -0000 1.35 +++ gaim.desktop 8 Feb 2006 07:44:22 -0000 1.36 @@ -1,80 +1,11 @@ [Desktop Entry] Encoding=UTF-8 -Categories=Application;Network; +Name=Gaim Internet Messenger +GenericName=Internet Messenger +Comment=Send instant messages over multiple protocols Exec=gaim Icon=gaim.png StartupNotify=true Terminal=false Type=Application - -Name=Gaim Internet Messenger -Name[ca]=Missatger d'Internet Gaim -Name[cs]=Gaim Internet Messenger -Name[da]=Gaim - internet beskeder -Name[de]=Gaim Internet Messenger -Name[es]=Gaim - cliente de mensajerÃa de Internet -Name[fr]=Gaim Messagerie Internet -Name[hu]=Gaim azonnali üzenetküldÅ -Name[it]=Gaim Internet Messenger -Name[ja]=Gaim ã¤ã³ã¿ã¼ãããã»ã¡ãã»ã³ã¸ã£ã¼ -Name[ko]=ê²ì ë©ì ì -Name[nb]=Gaim lynmeldingsklient -Name[nl]=Gaim - Expresberichten -Name[pl]=Komunikator Internetowy Gaim -Name[pt_BR]=Mensageiro via Internet Gaim -Name[pt]=Mensageiro Internet Gaim -Name[ro]=Mesagerul Gaim -Name[ru]=Gaim - ÐºÐ»Ð¸ÐµÐ½Ñ Ð¾Ð±Ð¼ÐµÐ½Ð° мгновеннÑми ÑообÑениÑми -Name[sl]=Gaim - spletni sel -Name[sq]=Lajmësjellësi Internet Gaim -Name[sv]=Gaim Internet Messenger -Name[zh_CN]=Gaim äºèç½é讯ç¨åº -Name[zh_TW]=Gaim 網路å³æé - -GenericName=Internet Messenger -GenericName[ca]=Missatger d'Internet -GenericName[cs]=Internet Messenger -GenericName[da]=Internet beskeder -GenericName[de]=Internet Messenger -GenericName[es]=Cliente de mensajerÃa de Internet -GenericName[fr]=Messagerie internet -GenericName[hu]=Azonnali üzenetküldÅ -GenericName[it]=Internet Messenger -GenericName[ja]=ã¤ã³ã¿ã¼ãããã»ã¡ãã»ã³ã¸ã£ã¼ -GenericName[ko]=ë©ì ì -GenericName[nb]=Lynmeldingsklient -GenericName[nl]=Expresberichten -GenericName[pl]=Komunikator Internetowy -GenericName[pt_BR]=Mensageiro via Internet -GenericName[pt]=Mensageiro Internet -GenericName[ro]=Client de mesagerie -GenericName[ru]=ÐÐ»Ð¸ÐµÐ½Ñ Ð¾Ð±Ð¼ÐµÐ½Ð° мгновеннÑми ÑообÑениÑми -GenericName[sl]=Spletni sel -GenericName[sq]=Lajmësjellës Internet -GenericName[sv]=Meddelandeklient -GenericName[zh_CN]=äºèç½é讯ç¨åº -GenericName[zh_TW]=網路å³æé - -Comment=Send instant messages over multiple protocols -Comment[ca]=Envieu missatges instantanis en múltiples protocols -Comment[cs]=PosÃlat instant message různými protokoly -Comment[da]=Send beskeder over flere protokoller -Comment[de]=Multi-Protokoll Instant Messenger Client -Comment[es]=Cliente de mensajerÃa instantánea multiprotocolo -Comment[fr]=Envoie des messages instantanés en utilisant divers protocoles -Comment[hu]=Azonnali üzenetküldés többféle protokoll használatával -Comment[it]=Client multiprotocollo per messaggi immediati -Comment[ja]=è¤æ°ã®ãããã³ã«ãä»ãã¦ã¤ã³ã¹ã¿ã³ãã»ã¡ãã»ã¼ã¸ãéä¿¡ãã¾ã -Comment[ko]=ë¤ì¤ íë¡í ì½ ë©ì ì -Comment[nb]=Send lynmeldinger over flere protokoller -Comment[nl]=Multi-protocol programma voor expresberichten -Comment[pl]=Komunikator internetowy obsÅugujÄ cy kilka protokoÅów -Comment[pt_BR]=Mande mensagens instantâneas por múltiplos protocolos -Comment[pt]=Envie mensagens instantâneas sobre vários protocolos -Comment[ro]=TrimiteÅ£i mesaje instant în orice reÅ£ea -Comment[ru]=Ðбмен мгновеннÑми ÑообÑениÑми Ñ Ð¸ÑполÑзованием множеÑÑва пÑоÑоколов -Comment[sl]=PoÅ¡iljajte neposredna sporoÄila prek razliÄnih protokolovs -Comment[sq]=Dërgoni mesazhe të atypëratyshëm protokollesh të ndryshëm -Comment[sv]=Sänder snabbmeddelande över mÃ¥nga protokoll -Comment[zh_CN]=éè¿å¤ç§åè®®åéå³æ¶æ¶æ¯ -Comment[zh_TW]=ééå¤ç¨®éè¨åå®ç¼éå³æè¨æ¯ +Categories=Application;Network; Index: gaim.spec.in =================================================================== RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -p -r1.117 -r1.118 --- gaim.spec.in 23 Jan 2006 02:10:32 -0000 1.117 +++ gaim.spec.in 8 Feb 2006 07:44:22 -0000 1.118 @@ -145,6 +145,11 @@ and plugins. %setup -q -n %{name}-@VERSION@ %build +libtoolize -c -f --automake +intltoolize --force --copy +aclocal $ACLOCAL_FLAGS +automake -a -c -f +autoconf CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \ --bindir=%{_bindir} \ --datadir=%{_datadir} \ |