diff -Nru gnome-applets-3.5.91/ChangeLog gnome-applets-3.5.92/ChangeLog --- gnome-applets-3.5.91/ChangeLog 2012-08-30 18:37:13.000000000 +0000 +++ gnome-applets-3.5.92/ChangeLog 2012-09-20 01:11:04.000000000 +0000 @@ -1,11 +1,98 @@ +commit 658c12ba406b36f9239211d2d25e56af7ddef44d (HEAD, master) +Author: Ray Strode +Date: Wed Sep 19 17:58:15 2012 -0400 + + [release] 3.5.92 + + NEWS | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit f2a7c6548ad508c94398e10c49c962363e15d739 +Author: Ray Strode +Date: Wed Sep 19 18:27:22 2012 -0400 + + configure: add -lm dependency on mixer libs + + the mixer applet requires -lm to build. + this commit adds that dependency. + + configure.in | 1 + + 1 file changed, 1 insertion(+) + +commit 8a413573e7ec34f19e7724737183caa25dc709eb +Author: Giovanni Campagna +Date: Wed Dec 14 18:51:26 2011 +0100 + + gweather: port to the new libgweather + + libgweather API was broken to add introspection support, and to + remove the old dependency on GConf. Update accordingly. + + https://bugzilla.gnome.org/show_bug.cgi?id=678977 + + configure.in | 5 +- + gweather/Makefile.am | 10 + + gweather/gweather-applet.c | 91 ++--- + gweather/gweather-dialog.c | 185 +++------- + gweather/gweather-pref.c | 394 ++++++--------------- + gweather/gweather.h | 14 +- + gweather/main.c | 11 +- + ....gnome.applets.GWeatherApplet.gschema.xml.in.in | 29 ++ + 8 files changed, 250 insertions(+), 489 deletions(-) + +commit 82fea5ccbfed2aacc455f4f7505dca02534ca258 (origin/master, origin/HEAD) +Author: Aurimas Černius +Date: Sat Sep 15 16:24:25 2012 +0300 + + Updated Lithuanian translation + + po/lt.po | 3007 +++++++++++++++++++++++--------------------------------------- + 1 file changed, 1105 insertions(+), 1902 deletions(-) + +commit 5f8535d1093f210e3cdb9b2d693d91a4b572912d +Author: Andika Triwidada +Date: Sun Sep 9 02:53:22 2012 +0700 + + Updated Indonesian translation + + po/id.po | 2532 +++++++++++++++++++++++++------------------------------------- + 1 file changed, 1018 insertions(+), 1514 deletions(-) + +commit 8fdcb13b751828b4a9ad3221050c2bf723353c65 +Author: Piotr Drąg +Date: Mon Sep 3 22:38:09 2012 +0200 + + Updated Polish translation + + po/pl.po | 36 ++++++++++++++++++++++++++++-------- + 1 file changed, 28 insertions(+), 8 deletions(-) + +commit 2582bf532817ab092c8702d24ab635fff19b8f4f +Author: Enrico Minack +Date: Thu Aug 30 20:59:25 2012 +0200 + + [release] post-release bump to 3.5.92 + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e24754b80aff010e4562bf68f841b02b66d148e6 (tag: GNOME_APPLETS_3_5_91) +Author: Enrico Minack +Date: Thu Aug 30 20:57:36 2012 +0200 + + [release] 3.5.91 + + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) + commit 392c811c3b2fb0ca693ce8b5fd549c9a1e4057c5 Author: Enrico Minack Date: Thu Aug 30 20:34:19 2012 +0200 bump to 3.5.91 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit b2ee9e02cc757c4745720f6e965dc46284a62323 Author: Piotr Drąg @@ -13,8 +100,8 @@ Updated Polish translation - po/pl.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/pl.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 365d62e4a7e053315cceb37f66e6069caba04802 Author: Marek Černocký @@ -22,8 +109,8 @@ Updated Czech translation - po/cs.po | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + po/cs.po | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) commit 9545a27dae3d8f4ca43e678b25fba0dc181017d8 Author: Enrico Minack @@ -31,17 +118,17 @@ [release] post-release bump to 3.5.2 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit de167d4a39d9bc5587163b07c1e9a70f104d5872 +commit de167d4a39d9bc5587163b07c1e9a70f104d5872 (tag: GNOME_APPLETS_3_5_1) Author: Enrico Minack Date: Mon Apr 30 21:45:12 2012 +0200 [release] 3.5.1 - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) commit e70bc07f26c4391763806fae0fa6a92d6b709f18 Author: Yuri Myasoedov @@ -50,7 +137,7 @@ Updated Russian translation po/ru.po | 2334 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1101 insertions(+), 1233 deletions(-) + 1 file changed, 1101 insertions(+), 1233 deletions(-) commit ed886785f3949d061554b10d690b07533e75c415 Author: Marek Černocký @@ -59,7 +146,7 @@ Updated Czech translation po/cs.po | 1895 ++++++++++++++++++++++---------------------------------------- - 1 files changed, 663 insertions(+), 1232 deletions(-) + 1 file changed, 663 insertions(+), 1232 deletions(-) commit 3b2ccad46093d723afae490085c9c2e063cb62f8 Author: Mark Kwidzińsczi @@ -78,7 +165,7 @@ Updated French translation po/fr.po | 1939 ++++++++++++++++++++++---------------------------------------- - 1 files changed, 686 insertions(+), 1253 deletions(-) + 1 file changed, 686 insertions(+), 1253 deletions(-) commit 519aee662b1d5cca9826f36eb841a1cedf945b24 Author: Enrico Minack @@ -86,17 +173,17 @@ [release] post-release bump to 3.5.1 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit f93ddab90c5334911c3f11cc81f505e2daf9ed95 +commit f93ddab90c5334911c3f11cc81f505e2daf9ed95 (tag: GNOME_APPLETS_3_4_0) Author: Enrico Minack Date: Sun Apr 15 15:19:15 2012 +0200 [release] 3.4.0 - NEWS | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + NEWS | 12 ++++++++++++ + 1 file changed, 12 insertions(+) commit 9a7196a3358a14194abb66b95f78a3f55f92759d Author: Enrico Minack @@ -104,8 +191,8 @@ [release] bump to 3.4.0 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 544499761a98bdbad4562dd4df2ea9229093e7ba Author: Yaron Shahrabani @@ -114,7 +201,7 @@ Updated Hebrew translation. po/he.po | 1080 +++++++++++++++++++++++++++----------------------------------- - 1 files changed, 463 insertions(+), 617 deletions(-) + 1 file changed, 463 insertions(+), 617 deletions(-) commit ddef6f22594a42c4b687f55488b9e4d1f88f3dbd Author: Fran Diéguez @@ -123,7 +210,7 @@ Updated Galician translations po/gl.po | 2671 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 1308 insertions(+), 1363 deletions(-) + 1 file changed, 1308 insertions(+), 1363 deletions(-) commit d8e08d836e80c18c92abebca094885557805de40 Author: Gabor Kelemen @@ -132,7 +219,7 @@ Updated Hungarian translation po/hu.po | 1329 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 648 insertions(+), 681 deletions(-) + 1 file changed, 648 insertions(+), 681 deletions(-) commit 49319a1228cbb4e377cda459b5173bb16c1e9d93 Author: Daniel Mustieles @@ -141,7 +228,7 @@ Updated spanish translation po/es_ES.po | 3764 +++++++++++++++++++++++++++++------------------------------ - 1 files changed, 1879 insertions(+), 1885 deletions(-) + 1 file changed, 1879 insertions(+), 1885 deletions(-) commit 07d17c5bbe577c72461bb7fb68b3e5364cfd519f Author: Kjartan Maraas @@ -150,7 +237,7 @@ Updated Norwegian bokmål translation po/nb.po | 1886 ++++++++++++++++++++++---------------------------------------- - 1 files changed, 660 insertions(+), 1226 deletions(-) + 1 file changed, 660 insertions(+), 1226 deletions(-) commit cfd04409691401ea23b4dc05e58e7c677e1df830 Author: Rudolfs Mazurs @@ -159,7 +246,7 @@ Updated Latvian translation. po/lv.po | 2379 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1123 insertions(+), 1256 deletions(-) + 1 file changed, 1123 insertions(+), 1256 deletions(-) commit 51d3d9f28a9837fb4a868522547630b39b4c8e39 Author: Piotr Drąg @@ -168,7 +255,7 @@ Updated Polish translation po/pl.po | 1902 ++++++++++++++++++++++---------------------------------------- - 1 files changed, 667 insertions(+), 1235 deletions(-) + 1 file changed, 667 insertions(+), 1235 deletions(-) commit 0995a481c04789ef0e683b70225de47cd35f784a Author: Daniel Mustieles @@ -176,8 +263,8 @@ Updated Spanish translation - po/es.po | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) + po/es.po | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) commit 80678c592790376f850a3738c3b048678f20aa68 Author: Mario Blättermann @@ -185,8 +272,8 @@ [l10n] Updated German translation - po/de.po | 2039 +++++++++++++++++++++---------------------------------------- - 1 files changed, 702 insertions(+), 1337 deletions(-) + po/de.po | 2039 ++++++++++++++++++++++---------------------------------------- + 1 file changed, 702 insertions(+), 1337 deletions(-) commit d2888482e9d2ec491c017d7de7afe9725c5378b0 Author: Daniel Mustieles @@ -195,7 +282,7 @@ Updated Spanish translation po/es.po | 2412 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1144 insertions(+), 1268 deletions(-) + 1 file changed, 1144 insertions(+), 1268 deletions(-) commit ea7c685470543a71c2a339d5b1268409ec4e58fb Author: Daniel Nylander @@ -204,7 +291,7 @@ Updated Swedish translation po/sv.po | 2387 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 1148 insertions(+), 1239 deletions(-) + 1 file changed, 1148 insertions(+), 1239 deletions(-) commit 4f51aecab597ea920947f52826c0aefb65c58344 Author: Mattias Põldaru @@ -212,8 +299,8 @@ [l10n] Updated Estonian translation - po/et.po | 962 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 499 insertions(+), 463 deletions(-) + po/et.po | 962 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 499 insertions(+), 463 deletions(-) commit 391e28a83f240d45547d6dcb1651ae7e4626535b Author: Мирослав Николић @@ -232,7 +319,7 @@ Updated Slovenian translation po/sl.po | 2342 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 1098 insertions(+), 1244 deletions(-) + 1 file changed, 1098 insertions(+), 1244 deletions(-) commit add2a0fce5c4d49b65bc76e0b24527d8b979e557 Author: Mattias Põldaru @@ -240,8 +327,8 @@ [l10n] Updated Estonian translation - po/et.po | 659 ++++++++++---------------------------------------------------- - 1 files changed, 103 insertions(+), 556 deletions(-) + po/et.po | 659 ++++++++++----------------------------------------------------- + 1 file changed, 103 insertions(+), 556 deletions(-) commit ab1b72d6801018c12a4a802540117828e40ce26e Author: Jiro Matsuzawa @@ -250,7 +337,7 @@ Updated Japanese translation po/ja.po | 2139 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 1038 insertions(+), 1101 deletions(-) + 1 file changed, 1038 insertions(+), 1101 deletions(-) commit 80c271a1390d78a4bbbda8537c0a8d4820f0a59d Author: Yuri Kozlov @@ -258,8 +345,8 @@ Updated Russian translation of help - invest-applet/docs/ru/ru.po | 717 ++++++++++++++++++++++++++++++------------- - 1 files changed, 503 insertions(+), 214 deletions(-) + invest-applet/docs/ru/ru.po | 717 +++++++++++++++++++++++++++++++------------- + 1 file changed, 503 insertions(+), 214 deletions(-) commit df757c8bf0260be4afe423c43cba47ab0c30fafb Author: Enrico Minack @@ -267,17 +354,17 @@ [release] post-release bump to 3.3.2 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 61059c921b0302b1865e041b84e6fe7fcce8115c +commit 61059c921b0302b1865e041b84e6fe7fcce8115c (tag: GNOME_APPLETS_3_3_1) Author: Enrico Minack Date: Sun Oct 23 20:39:27 2011 +0200 [release] 3.3.1 - NEWS | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + NEWS | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) commit f7b04bb24d81bc97ddace1d0628a76d29c92f9df Author: Piotr Drąg @@ -285,8 +372,8 @@ Updated POTFILES.in - po/POTFILES.in | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + po/POTFILES.in | 2 -- + 1 file changed, 2 deletions(-) commit deac9c406690a2e89b457880b748bb92acf4a33a Author: Sergey V. Udaltsov @@ -493,7 +580,7 @@ gkb-new/xmodmap/xmodmap.us101A_x86 | 129 --- gkb-new/xmodmap/xmodmap.us_intl | 118 --- gkb-new/xmodmap/xmodmap.yu | 115 --- - 199 files changed, 0 insertions(+), 25560 deletions(-) + 199 files changed, 25560 deletions(-) commit 6bc3485becff7fe7f3a2950be365d034a4d9379a Author: Kjartan Maraas @@ -501,8 +588,8 @@ Updated Norwegian bokmål translation - po/nb.po | 394 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 196 insertions(+), 198 deletions(-) + po/nb.po | 394 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 196 insertions(+), 198 deletions(-) commit 60169697e88790aa22bf48b19177b1436da0fe82 Author: Mario Blättermann @@ -510,8 +597,8 @@ [l10n] Updated German doc translation - invest-applet/docs/de/de.po | 521 ++++++++++++++++++++----------------------- - 1 files changed, 239 insertions(+), 282 deletions(-) + invest-applet/docs/de/de.po | 521 ++++++++++++++++++++------------------------ + 1 file changed, 239 insertions(+), 282 deletions(-) commit 57a6b02b7fc63970097e6333886a2b4092a636b8 Author: Daniel Nylander @@ -519,8 +606,8 @@ Updated Swedish translation - po/sv.po | 451 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 241 insertions(+), 210 deletions(-) + po/sv.po | 451 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 241 insertions(+), 210 deletions(-) commit f597419efab28e5463fa0fcc1956e8a867289c10 Author: Enrico Minack @@ -528,8 +615,8 @@ Moved tarball compression to xz - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit f410a787609391f2c97b6d26f1be84987410436e Author: Enrico Minack @@ -537,17 +624,17 @@ [release] post-release bump to 3.3.1 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit b8456727a6e439a9ba0133fa55cd032803dbcf5e +commit b8456727a6e439a9ba0133fa55cd032803dbcf5e (tag: GNOME_APPLETS_3_2_0) Author: Enrico Minack Date: Sun Sep 25 20:51:19 2011 +0200 [release] 3.2.0 - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) commit 3ece0a89402e1e61a643f8ba22b2506848d4a1ba Author: Abdalrahim G. Fakhouri @@ -555,8 +642,8 @@ Updated Arabic translation - po/ar.po | 970 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 527 insertions(+), 443 deletions(-) + po/ar.po | 970 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 527 insertions(+), 443 deletions(-) commit e0c0913ad71df752580c82262c0a0d98350cfda3 Author: Enrico Minack @@ -564,17 +651,17 @@ [release] post-release bump to 3.2.0 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit c655f9525c1d45bfdb34dca19c0639cdbaf707e5 +commit c655f9525c1d45bfdb34dca19c0639cdbaf707e5 (tag: GNOME_APPLETS_3_1_92) Author: Enrico Minack Date: Mon Sep 19 22:28:40 2011 +0200 [release] 3.1.92 - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) commit 8bd9c1414881d00340f0d8715100b926a3ad23dd Author: Rudolfs Mazurs @@ -582,8 +669,8 @@ Updated Latvian translation. - po/lv.po | 547 +++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 310 insertions(+), 237 deletions(-) + po/lv.po | 547 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 310 insertions(+), 237 deletions(-) commit 0635112110c36faab91d81f1fe80aaf0eb1149fe Author: dmustieles @@ -591,8 +678,8 @@ Updated Spanish translation - po/es.po | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) + po/es.po | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) commit 8ba7b3815bb05780e93b2fbc587519487f941c44 Author: Piotr Drąg @@ -600,8 +687,8 @@ Updated Polish translation - po/pl.po | 403 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 205 insertions(+), 198 deletions(-) + po/pl.po | 403 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 205 insertions(+), 198 deletions(-) commit 4906d007cfabdc49247515e2298b1e322ba94db5 Author: Enrico Minack @@ -609,17 +696,17 @@ [release] post-release bump to 3.1.92 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit fc01d59722a9c69986bbf0a344b93d784ad2ce42 +commit fc01d59722a9c69986bbf0a344b93d784ad2ce42 (tag: GNOME_APPLETS_3_1_91) Author: Enrico Minack Date: Mon Sep 5 21:41:32 2011 +0200 [release] 3.1.91 - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) commit 9d52aaee6e8f6f81987a2eea9c66b1c26ea12547 Author: Enrico Minack @@ -627,9 +714,9 @@ geyes, multiload: explicitly link against libm, fixes bug 657879 - configure.in | 3 +++ - geyes/Makefile.am | 3 ++- - multiload/Makefile.am | 3 ++- + configure.in | 3 +++ + geyes/Makefile.am | 3 ++- + multiload/Makefile.am | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) commit 75403b34014266a149183c348fcaa3dee7f056c9 @@ -638,17 +725,17 @@ [release] post-release bump to 3.1.91 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit c5859e74714725a97988253987b9ba7235de8830 +commit c5859e74714725a97988253987b9ba7235de8830 (tag: GNOME_APPLETS_3_1_90) Author: Enrico Minack Date: Mon Aug 29 21:01:26 2011 +0200 [release] 3.1.90 - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) commit c167602c4d5d60b2b17fcd23457cfeb510e954dd Author: Мирослав Николић @@ -656,8 +743,8 @@ Updated Serbian translation - po/sr.po | 145 ++++++++++++++++++++++++++++++++++++++++--------------- - po/sr@latin.po | 145 ++++++++++++++++++++++++++++++++++++++++--------------- + po/sr.po | 145 +++++++++++++++++++++++++++++++++++++++++---------------- + po/sr@latin.po | 145 +++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 210 insertions(+), 80 deletions(-) commit 5eee8b19db0fccea142924f0ce0ad11e334da04e @@ -667,7 +754,7 @@ Updated Russian translation po/ru.po | 1412 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 717 insertions(+), 695 deletions(-) + 1 file changed, 717 insertions(+), 695 deletions(-) commit b00990a3c7b087934a1dcfba7161503235c7c60d Author: Enrico Minack @@ -675,17 +762,17 @@ [release] post-release bump to 3.1.90 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 067b16ead81dca791931a8385b9496327867347f +commit 067b16ead81dca791931a8385b9496327867347f (tag: GNOME_APPLETS_3_1_5) Author: Enrico Minack Date: Sun Aug 14 11:57:08 2011 +0200 [release] 3.1.5 - NEWS | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + NEWS | 10 ++++++++++ + 1 file changed, 10 insertions(+) commit 27a23a8caf0dd69025f119b5363b1c9c5278d2df Author: Bruno Brouard @@ -693,8 +780,8 @@ Updated French doc translation - invest-applet/docs/fr/fr.po | 200 ++++++++++++++++++++++--------------------- - 1 files changed, 102 insertions(+), 98 deletions(-) + invest-applet/docs/fr/fr.po | 200 ++++++++++++++++++++++---------------------- + 1 file changed, 102 insertions(+), 98 deletions(-) commit 6430d7f06ed1562d19dbf916de46ff53a256e416 Author: Bruno Brouard @@ -702,8 +789,8 @@ Updated French translation - po/fr.po | 423 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 215 insertions(+), 208 deletions(-) + po/fr.po | 423 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 215 insertions(+), 208 deletions(-) commit a84b8177882cf6cb200e1376e338a0ed2c6c9ca6 Author: Enrico Minack @@ -711,17 +798,17 @@ [release] post-release bump to 3.1.5 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 997bb793a4042ce9c062ca5af362439dce0e2a1a +commit 997bb793a4042ce9c062ca5af362439dce0e2a1a (tag: GNOME_APPLETS_3_1_4) Author: Enrico Minack Date: Mon Jul 25 21:24:22 2011 +0200 [release] 3.1.4 - NEWS | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) + NEWS | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) commit 38eff025377c73b0e0a169bc6c125d395fe930d0 Author: Enrico Minack @@ -729,8 +816,8 @@ mixer applet: call gnome-control-center for settings, bug #654814 - mixer/applet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + mixer/applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 99d963a479470f8e68b18e6003274ca7d96313fd Author: Enrico Minack @@ -740,8 +827,8 @@ - this is the libgweather default value which is used anyways when no weather data are available - gweather/gweather-applet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gweather/gweather-applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit dcefc366d2addb416fe1f60ebf252c6bf90ce4bc Author: Matej Urbančič @@ -749,8 +836,8 @@ Updated Slovenian translation - po/sl.po | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + po/sl.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit 34ad9b83d399527941ec006547d82963f2428627 Author: Daniel Mustieles @@ -758,8 +845,8 @@ Updated Spanish translation - po/es.po | 127 ++++++++++++++++++++++++++++++++++++++++++++++---------------- - 1 files changed, 94 insertions(+), 33 deletions(-) + po/es.po | 127 ++++++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 94 insertions(+), 33 deletions(-) commit 0506e7ad6a307ff2eefbf9639c6bf4f797d0cad9 Author: Mario Blättermann @@ -767,8 +854,8 @@ [l10n] Updated German translation - po/de.po | 163 +++++++++++++++++++++++++++++++++++++++++++------------------ - 1 files changed, 115 insertions(+), 48 deletions(-) + po/de.po | 163 ++++++++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 115 insertions(+), 48 deletions(-) commit 86cc00e67f74de846633bb47bab7c11f5a7a0278 Author: Yaron Shahrabani @@ -776,8 +863,8 @@ Updated Hebrew translation. - po/he.po | 482 +++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 274 insertions(+), 208 deletions(-) + po/he.po | 482 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 274 insertions(+), 208 deletions(-) commit 0adf37ea4920df76dab731445c77810a07c5b5a1 Author: Matej Urbančič @@ -785,8 +872,8 @@ Updated Slovenian translation - po/sl.po | 158 ++++++++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 102 insertions(+), 56 deletions(-) + po/sl.po | 158 +++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 102 insertions(+), 56 deletions(-) commit 7ba16b493b06a6ba0561decce6d95e998e8b0381 Author: Marek Černocký @@ -794,8 +881,8 @@ Updated Czech translation - po/cs.po | 122 ++++++++++++++++++++++++++++++++++++++++++++++---------------- - 1 files changed, 91 insertions(+), 31 deletions(-) + po/cs.po | 122 +++++++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 91 insertions(+), 31 deletions(-) commit bc1169f981551fa96417a03fea08ea2b8099907a Author: Enrico Minack @@ -805,12 +892,12 @@ - indices like the NASDAQ can automatically be expanded to its contained stocks - stocks can be arranged into groups and sub-groups, allowing tree organization - invest-applet/data/prefs-dialog.ui | 59 ++++++- - invest-applet/invest/__init__.py | 34 +++- - invest-applet/invest/applet.py | 9 + - invest-applet/invest/preferences.py | 184 ++++++++++++++---- - invest-applet/invest/quotes.py | 361 ++++++++++++++++++++++++++--------- - invest-applet/invest/widgets.py | 35 +++- + invest-applet/data/prefs-dialog.ui | 59 +++++- + invest-applet/invest/__init__.py | 34 +++- + invest-applet/invest/applet.py | 9 + + invest-applet/invest/preferences.py | 184 ++++++++++++++---- + invest-applet/invest/quotes.py | 361 +++++++++++++++++++++++++++--------- + invest-applet/invest/widgets.py | 35 +++- 6 files changed, 534 insertions(+), 148 deletions(-) commit 6d9748d737a70e5e1e2ccd4bd6df725eead725b5 @@ -819,8 +906,8 @@ invest applet: widget shows scroll bars when it gets too large - invest-applet/invest/applet.py | 113 +++++++++++++++++++++++++++------------- - 1 files changed, 76 insertions(+), 37 deletions(-) + invest-applet/invest/applet.py | 113 +++++++++++++++++++++++++++-------------- + 1 file changed, 76 insertions(+), 37 deletions(-) commit 88d376dc07299e7f7b786a9b71f03bfac5842628 Author: Daniel Mustieles @@ -828,8 +915,8 @@ Updated Spanish translation - po/es.po | 68 +++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 37 insertions(+), 31 deletions(-) + po/es.po | 68 +++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 37 insertions(+), 31 deletions(-) commit 01c4e2af262cb988437aca4ad6ba54a2feecdcec Author: Marek Černocký @@ -837,8 +924,8 @@ Updated Czech translation - po/cs.po | 114 +++++++++++++++----------------------------------------------- - 1 files changed, 27 insertions(+), 87 deletions(-) + po/cs.po | 114 +++++++++++++++------------------------------------------------ + 1 file changed, 27 insertions(+), 87 deletions(-) commit a9a1ef5112888488e4ce52eceb8117e68da416be Author: Enrico Minack @@ -846,8 +933,8 @@ invest applet: minor string change in preferences window - invest-applet/data/prefs-dialog.ui | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + invest-applet/data/prefs-dialog.ui | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) commit 14d572be06f696c71c0ef1b1ebb32c6b77c5dd33 Author: Мирослав Николић @@ -865,8 +952,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 205 ++++++++++++++++++++++--------------------- - 1 files changed, 106 insertions(+), 99 deletions(-) + invest-applet/docs/es/es.po | 205 +++++++++++++++++++++++--------------------- + 1 file changed, 106 insertions(+), 99 deletions(-) commit ba8252b67809ab11d8a82d8fb7a984af6be85fff Author: Enrico Minack @@ -874,8 +961,8 @@ invest-applet: updated (c) of about and doc to 2011 - invest-applet/docs/C/invest-applet.xml | 5 +++-- - invest-applet/invest/about.py | 2 +- + invest-applet/docs/C/invest-applet.xml | 5 +++-- + invest-applet/invest/about.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) commit 4dbf4a27b70f45a34c1c535769d9229ea867034e @@ -884,17 +971,17 @@ [release] post-release bump to 3.1.4 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 8f5d67f19718d0c3e95d47e74da521ef36256a1b +commit 8f5d67f19718d0c3e95d47e74da521ef36256a1b (tag: GNOME_APPLETS_3_1_3) Author: Enrico Minack Date: Sun Jul 3 11:31:44 2011 +0200 [release] 3.1.3 - NEWS | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + NEWS | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) commit 9be66818e7b75df4db86b88154c7df47afda9a79 Author: Enrico Minack @@ -903,8 +990,8 @@ invest-applet: ignore unknown stocks, fixes part of bug #608842 - see https://bugzilla.gnome.org/show_bug.cgi?id=608842#c5 - invest-applet/invest/quotes.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + invest-applet/invest/quotes.py | 5 +++++ + 1 file changed, 5 insertions(+) commit 65212e8cd3a101e69fc9f7877450ab5198af9681 Author: Enrico Minack @@ -914,8 +1001,8 @@ - this allows to show most recently retrieved quotes on next start up in case the system is offline by that time - invest-applet/invest/__init__.py | 2 + - invest-applet/invest/quotes.py | 53 ++++++++++++++++++++++++++++---------- + invest-applet/invest/__init__.py | 2 ++ + invest-applet/invest/quotes.py | 53 +++++++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 14 deletions(-) commit ba7a46d5ceba4e6f85942e9a693d60c931b8fddc @@ -924,31 +1011,31 @@ Remove last traces of gswitchit since the applet was removed in 2.29.5. - Makefile.am | 1 - - configure.in | 2 - - gswitchit/.indent.pro | 2 - - gswitchit/Makefile.am | 1 - - gswitchit/help/C/gswitchit.xml | 217 ----------------- - gswitchit/help/C/legal.xml | 76 ------ - gswitchit/help/Makefile.am | 9 - - gswitchit/help/ca/ca.po | 286 ----------------------- - gswitchit/help/cs/cs.po | 470 ------------------------------------- - gswitchit/help/da/da.po | 480 -------------------------------------- - gswitchit/help/de/de.po | 486 -------------------------------------- - gswitchit/help/el/el.po | 489 -------------------------------------- - gswitchit/help/en_GB/en_GB.po | 241 ------------------- - gswitchit/help/es/es.po | 488 -------------------------------------- - gswitchit/help/eu/eu.po | 244 ------------------- - gswitchit/help/fi/fi.po | 286 ----------------------- - gswitchit/help/fr/fr.po | 491 --------------------------------------- - gswitchit/help/gswitchit.omf.in | 9 - - gswitchit/help/oc/oc.po | 361 ---------------------------- - gswitchit/help/ru/ru.po | 362 ---------------------------- - gswitchit/help/sl/sl.po | 251 -------------------- - gswitchit/help/sv/sv.po | 242 ------------------- - gswitchit/help/uk/uk.po | 488 -------------------------------------- - gswitchit/help/zh_CN/zh_CN.po | 426 --------------------------------- - 24 files changed, 0 insertions(+), 6408 deletions(-) + Makefile.am | 1 - + configure.in | 2 - + gswitchit/.indent.pro | 2 - + gswitchit/Makefile.am | 1 - + gswitchit/help/C/gswitchit.xml | 217 ------------------ + gswitchit/help/C/legal.xml | 76 ------- + gswitchit/help/Makefile.am | 9 - + gswitchit/help/ca/ca.po | 286 ----------------------- + gswitchit/help/cs/cs.po | 470 -------------------------------------- + gswitchit/help/da/da.po | 480 --------------------------------------- + gswitchit/help/de/de.po | 486 --------------------------------------- + gswitchit/help/el/el.po | 489 --------------------------------------- + gswitchit/help/en_GB/en_GB.po | 241 -------------------- + gswitchit/help/es/es.po | 488 --------------------------------------- + gswitchit/help/eu/eu.po | 244 -------------------- + gswitchit/help/fi/fi.po | 286 ----------------------- + gswitchit/help/fr/fr.po | 491 ---------------------------------------- + gswitchit/help/gswitchit.omf.in | 9 - + gswitchit/help/oc/oc.po | 361 ----------------------------- + gswitchit/help/ru/ru.po | 362 ----------------------------- + gswitchit/help/sl/sl.po | 251 -------------------- + gswitchit/help/sv/sv.po | 242 -------------------- + gswitchit/help/uk/uk.po | 488 --------------------------------------- + gswitchit/help/zh_CN/zh_CN.po | 426 ---------------------------------- + 24 files changed, 6408 deletions(-) commit be2f99f0e4dfee124e380cd6d303bae3372c088b Author: Enrico Minack @@ -956,8 +1043,8 @@ drive mount: allow unmount without eject, see bug 604848 (Massimo Dal Zotto) - drivemount/drive-button.c | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) + drivemount/drive-button.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) commit f7cd488eae7d25c0b2be6a709bc5ebf0420cd165 Author: Enrico Minack @@ -965,8 +1052,8 @@ drive mount: does not show shadowed mounts, bug #622709 (Aleksander Morgado) - drivemount/drive-list.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + drivemount/drive-list.c | 5 +++++ + 1 file changed, 5 insertions(+) commit c67282d353dba1dbe3d3c78680c7c53239c1e3df Author: Enrico Minack @@ -975,26 +1062,26 @@ drive mounter: fixes broken "Open $VOLUME" menu option - fixes bug #652424 (Nicholas Miell) - drivemount/drive-button.c | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) + drivemount/drive-button.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) -commit b72b4b5fca307210b6151c8fe3b66d67ef70a5bd +commit b72b4b5fca307210b6151c8fe3b66d67ef70a5bd (tag: GNOME_APPLETS_3_1_2) Author: Enrico Minack Date: Sun Jun 12 12:00:01 2011 +0200 [release] post-release bump to 3.1.3 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 0e5ffb5da67e048ddf5025f247d0da1f465efe79 +commit 0e5ffb5da67e048ddf5025f247d0da1f465efe79 (tag: GNOME_APPLETS_3_1_2_) Author: Enrico Minack Date: Sun Jun 12 11:59:09 2011 +0200 [release] 3.1.2 - NEWS | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) + NEWS | 13 +++++++++++++ + 1 file changed, 13 insertions(+) commit 0fe0cda8dcec331f0351b86733efad5f47c728a7 Author: Mario Blättermann @@ -1002,8 +1089,8 @@ [l10n] Updated German translation - po/de.po | 123 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 60 insertions(+), 63 deletions(-) + po/de.po | 123 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 60 insertions(+), 63 deletions(-) commit 01be5b71db43b632c4cff0c6140efe86f5624478 Author: Gabor Kelemen @@ -1011,8 +1098,8 @@ Updated Hungarian translation by Balazs Ur - po/hu.po | 273 +++++++++++++++++++++++++------------------------------------- - 1 files changed, 110 insertions(+), 163 deletions(-) + po/hu.po | 273 +++++++++++++++++++++++++-------------------------------------- + 1 file changed, 110 insertions(+), 163 deletions(-) commit d1e7bbb79f6132648272e56004d7696dea229b9a Author: Matej Urbančič @@ -1020,8 +1107,8 @@ Updated Slovenian translation - po/sl.po | 125 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 61 insertions(+), 64 deletions(-) + po/sl.po | 125 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 61 insertions(+), 64 deletions(-) commit 2114f0ac0b4488961ef2f025c002b792118e8e24 Author: Marek Černocký @@ -1029,8 +1116,8 @@ Updated Czech translation - po/cs.po | 129 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 60 insertions(+), 69 deletions(-) + po/cs.po | 129 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 60 insertions(+), 69 deletions(-) commit 40eac4f023addf9d5c098e16942ab1e8db03d14e Author: Kjartan Maraas @@ -1038,8 +1125,8 @@ Don't explicitly set invisible_char but rely on the gtk+ default. - invest-applet/data/prefs-dialog.ui | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + invest-applet/data/prefs-dialog.ui | 1 - + 1 file changed, 1 deletion(-) commit 202c7e88a882c188efbe236e644281c49a682a8c Author: Kjartan Maraas @@ -1047,8 +1134,8 @@ Add missing #include to make translations work - cpufreq/src/cpufreq-monitor-cpuinfo.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + cpufreq/src/cpufreq-monitor-cpuinfo.c | 4 ++++ + 1 file changed, 4 insertions(+) commit 36c4576e91650685e1849c2adf5ebe6230c0cc24 Author: Daniel Mustieles @@ -1056,8 +1143,8 @@ Updated Spanish translation - po/es.po | 133 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 62 insertions(+), 71 deletions(-) + po/es.po | 133 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 62 insertions(+), 71 deletions(-) commit 766c9e1711330ec2b7109aa39ddd43b6583a30d3 Author: Enrico Minack @@ -1068,9 +1155,9 @@ - preferences dialog threw warning - added plot scale option to charts window - invest-applet/data/financialchart.ui | 703 +++++++++++++--------------------- - invest-applet/data/prefs-dialog.ui | 127 ++++--- - invest-applet/invest/chart.py | 16 +- + invest-applet/data/financialchart.ui | 703 +++++++++++++---------------------- + invest-applet/data/prefs-dialog.ui | 127 ++++--- + invest-applet/invest/chart.py | 16 +- 3 files changed, 348 insertions(+), 498 deletions(-) commit ef44d8f9fee6037e868704fe42709f765ef9d741 @@ -1079,8 +1166,8 @@ Updated Czech translation - po/cs.po | 311 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 161 insertions(+), 150 deletions(-) + po/cs.po | 311 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 161 insertions(+), 150 deletions(-) commit ceee86985f3ff5767e1aa24c66aae23a01680cb1 Author: Matej Urbančič @@ -1088,8 +1175,8 @@ Updated Slovenian translation - po/sl.po | 273 +++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 155 insertions(+), 118 deletions(-) + po/sl.po | 273 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 155 insertions(+), 118 deletions(-) commit dd214c54a55b55e44c1f78fe22ac7f304f5b08c8 Author: Enrico Minack @@ -1097,17 +1184,17 @@ [release] post-release bump to 3.1.2 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 5e7664f15f61b8a0ebd6683551563241a66ecb42 +commit 5e7664f15f61b8a0ebd6683551563241a66ecb42 (tag: GNOME_APPLETS_3_1_1) Author: Enrico Minack Date: Sun May 8 03:05:01 2011 +0200 [release] 3.1.1 - NEWS | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) + NEWS | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) commit f1f7d1aae71511fa9f697297367204e061df5045 Author: Mario Blättermann @@ -1115,8 +1202,8 @@ [l10n] Updated German translation - po/de.po | 216 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 111 insertions(+), 105 deletions(-) + po/de.po | 216 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 111 insertions(+), 105 deletions(-) commit 9469025caea9bff9794ecefe12473ea25caa10b4 Author: Daniel Mustieles @@ -1124,8 +1211,8 @@ Updated Spanish translation - po/es.po | 250 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 131 insertions(+), 119 deletions(-) + po/es.po | 250 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 131 insertions(+), 119 deletions(-) commit c29ca83d411d116dc005a9405a63039f486a7bb1 Author: Enrico Minack @@ -1135,21 +1222,21 @@ - with the former variable, make install does not work with --prefix so package building does not work - accessx-status/Makefile.am | 2 +- - battstat/Makefile.am | 2 +- - charpick/Makefile.am | 2 +- - cpufreq/Makefile.am | 2 +- - drivemount/Makefile.am | 2 +- - geyes/Makefile.am | 2 +- - gweather/Makefile.am | 2 +- - invest-applet/data/Makefile.am | 2 +- - mini-commander/src/Makefile.am | 2 +- - mixer/Makefile.am | 2 +- - modemlights/Makefile.am | 2 +- - multiload/Makefile.am | 2 +- - null_applet/Makefile.am | 2 +- - stickynotes/Makefile.am | 2 +- - trashapplet/Makefile.am | 2 +- + accessx-status/Makefile.am | 2 +- + battstat/Makefile.am | 2 +- + charpick/Makefile.am | 2 +- + cpufreq/Makefile.am | 2 +- + drivemount/Makefile.am | 2 +- + geyes/Makefile.am | 2 +- + gweather/Makefile.am | 2 +- + invest-applet/data/Makefile.am | 2 +- + mini-commander/src/Makefile.am | 2 +- + mixer/Makefile.am | 2 +- + modemlights/Makefile.am | 2 +- + multiload/Makefile.am | 2 +- + null_applet/Makefile.am | 2 +- + stickynotes/Makefile.am | 2 +- + trashapplet/Makefile.am | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) commit db30fe4f9583f203df52093d8f893f8ca8093591 @@ -1158,8 +1245,8 @@ mixer applet: type annotation in POTFILES.in was missing, broke distcheck - po/POTFILES.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/POTFILES.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 92d0dcf62dfcd60c8e87f64213c14f7f786627fe Author: Enrico Minack @@ -1174,27 +1261,27 @@ - removed standalone mode from applet, this can be achieved via panel-applet-test - had to explicitly state float values where expected (ints do not work anymore) - configure.in | 34 ++--- - invest-applet/data/GNOME_GtikApplet.server | 18 -- - invest-applet/data/Invest_Applet.server.in.in | 25 --- - invest-applet/data/Invest_Applet.xml | 10 - - invest-applet/data/Makefile.am | 52 +++--- - invest-applet/data/financialchart.ui | 4 +- - invest-applet/data/invest-applet-menu.xml | 5 + - ...g.gnome.applets.InvestApplet.panel-applet.in.in | 16 ++ - ...ome.panel.applet.InvestAppletFactory.service.in | 3 + - invest-applet/invest/__init__.py | 26 ++- - invest-applet/invest/about.py | 6 +- - invest-applet/invest/applet.py | 184 ++++++++++---------- - invest-applet/invest/chart.py | 25 ++-- - invest-applet/invest/defs.py.in | 1 + - invest-applet/invest/help.py | 6 +- - invest-applet/invest/invest-applet.py | 60 +++---- - invest-applet/invest/networkmanager.py | 6 +- - invest-applet/invest/preferences.py | 26 ++-- - invest-applet/invest/quotes.py | 43 +++-- - invest-applet/invest/widgets.py | 44 +++--- - po/POTFILES.in | 3 +- + configure.in | 34 ++-- + invest-applet/data/GNOME_GtikApplet.server | 18 -- + invest-applet/data/Invest_Applet.server.in.in | 25 --- + invest-applet/data/Invest_Applet.xml | 10 -- + invest-applet/data/Makefile.am | 52 +++--- + invest-applet/data/financialchart.ui | 4 +- + invest-applet/data/invest-applet-menu.xml | 5 + + ...g.gnome.applets.InvestApplet.panel-applet.in.in | 16 ++ + ...ome.panel.applet.InvestAppletFactory.service.in | 3 + + invest-applet/invest/__init__.py | 26 ++- + invest-applet/invest/about.py | 6 +- + invest-applet/invest/applet.py | 184 +++++++++++---------- + invest-applet/invest/chart.py | 25 ++- + invest-applet/invest/defs.py.in | 1 + + invest-applet/invest/help.py | 6 +- + invest-applet/invest/invest-applet.py | 60 +++---- + invest-applet/invest/networkmanager.py | 6 +- + invest-applet/invest/preferences.py | 26 +-- + invest-applet/invest/quotes.py | 43 ++--- + invest-applet/invest/widgets.py | 44 ++--- + po/POTFILES.in | 3 +- 21 files changed, 285 insertions(+), 312 deletions(-) commit b488efb416922792dc41b82ca798c897c6d004d5 @@ -1203,9 +1290,9 @@ null applet: files really have to be removed from POTFILES.in - null_applet/GNOME_NullApplet_Factory.server.in.in | 17 ----------------- - po/POTFILES.in | 7 ------- - 2 files changed, 0 insertions(+), 24 deletions(-) + null_applet/GNOME_NullApplet_Factory.server.in.in | 17 ----------------- + po/POTFILES.in | 7 ------- + 2 files changed, 24 deletions(-) commit 2aba9400ce5b025cf47685247d496d082db758bb Author: Enrico Minack @@ -1213,12 +1300,12 @@ null applet: removed unused bonobo files and updated po/POTFILES.in accordingly - null_applet/GNOME_CDPlayerApplet.server.in | 20 ------------------ - null_applet/GNOME_KeyboardApplet.server.in | 22 -------------------- - .../GNOME_MailcheckApplet_Factory.server.in | 20 ------------------ - null_applet/GNOME_MixerApplet.server.in | 22 -------------------- - null_applet/GNOME_Panel_WirelessApplet.server.in | 22 -------------------- - po/POTFILES.in | 11 +++++---- + null_applet/GNOME_CDPlayerApplet.server.in | 20 -------------------- + null_applet/GNOME_KeyboardApplet.server.in | 22 ---------------------- + .../GNOME_MailcheckApplet_Factory.server.in | 20 -------------------- + null_applet/GNOME_MixerApplet.server.in | 22 ---------------------- + null_applet/GNOME_Panel_WirelessApplet.server.in | 22 ---------------------- + po/POTFILES.in | 11 ++++++----- 6 files changed, 6 insertions(+), 111 deletions(-) commit 31e2b122483a959467282206105502f753bab342 @@ -1227,8 +1314,8 @@ mini-commander: use the new common path for menu files, see bug 646473 - mini-commander/src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + mini-commander/src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d99ac83fd2ca3117c6359157fc196ac79a0d5de2 Author: Christopher Aillon @@ -1241,8 +1328,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646473 - mini-commander/src/command_line.c | 35 +++++++++++++++++++++++++++-------- - 1 files changed, 27 insertions(+), 8 deletions(-) + mini-commander/src/command_line.c | 35 +++++++++++++++++++++++++++-------- + 1 file changed, 27 insertions(+), 8 deletions(-) commit beae0dcaf5bb05794473027d1f86dfcde4b98009 Author: Christopher Aillon @@ -1254,8 +1341,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646473 - mini-commander/src/preferences.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) + mini-commander/src/preferences.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) commit fd17e9ae2259dce63bb3d6363e3671a48b3edf91 Author: Christopher Aillon @@ -1267,8 +1354,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646473 - mini-commander/src/exec.c | 26 +++++++++++++++++++++----- - 1 files changed, 21 insertions(+), 5 deletions(-) + mini-commander/src/exec.c | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) commit ec016eefde5ee122d7fa32953765611a52369a7d Author: Christopher Aillon @@ -1280,8 +1367,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646473 - mini-commander/src/mini-commander_applet.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + mini-commander/src/mini-commander_applet.c | 1 - + 1 file changed, 1 deletion(-) commit d1289346c0bd16aca2cd2cc1c4ff00b48d393472 Author: Christopher Aillon @@ -1293,8 +1380,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646473 - mini-commander/src/command_line.c | 48 ++++++++++++++-------------- - mini-commander/src/mini-commander_applet.c | 4 +- + mini-commander/src/command_line.c | 48 +++++++++++++++--------------- + mini-commander/src/mini-commander_applet.c | 4 +-- 2 files changed, 26 insertions(+), 26 deletions(-) commit 99c787526f4745001cdcff9891ba25a1040e51ec @@ -1305,10 +1392,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=645463 - mixer/Makefile.am | 2 +- - mixer/applet.c | 88 +++++++++++++------------------------------------- - mixer/dock.c | 5 ++- - mixer/preferences.c | 5 +-- + mixer/Makefile.am | 2 +- + mixer/applet.c | 88 ++++++++++++++--------------------------------------- + mixer/dock.c | 5 +-- + mixer/preferences.c | 5 ++- 4 files changed, 29 insertions(+), 71 deletions(-) commit 6b2d68562da5ce97a3f37025071578eb18a9e5d1 @@ -1317,8 +1404,8 @@ bump to 3.1.1 because that's what we are heading for - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6a87376f327e8d8ba3e4586214e3736e1106d4f7 Author: Mario Blättermann @@ -1327,7 +1414,7 @@ [l10n] Updated German translation po/de.po | 2111 ++++++++++++++++---------------------------------------------- - 1 files changed, 550 insertions(+), 1561 deletions(-) + 1 file changed, 550 insertions(+), 1561 deletions(-) commit c6bcd368e2356e9cd01e28032b01059bd23771ae Author: Enrico Minack @@ -1336,10 +1423,10 @@ invest-applet: enabled to use network manager also with spec 0.9 - with 0.8.995, NM uses different values for states, see bug 647965 - configure.in | 3 +++ - invest-applet/invest/defs.py.in | 1 + - invest-applet/invest/networkmanager.py | 24 +++++++++++++++++++++++- - 3 files changed, 27 insertions(+), 1 deletions(-) + configure.in | 3 +++ + invest-applet/invest/defs.py.in | 1 + + invest-applet/invest/networkmanager.py | 24 +++++++++++++++++++++++- + 3 files changed, 27 insertions(+), 1 deletion(-) commit 8935df78f1a60ede926ecb9aea14b3c532721ce2 Author: Rudolfs Mazurs @@ -1347,8 +1434,8 @@ Updated Latvian translation. - po/lv.po | 1292 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 657 insertions(+), 635 deletions(-) + po/lv.po | 1292 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 657 insertions(+), 635 deletions(-) commit 7c839d8d67e67340ce383fe208833a903f62dc50 Author: Kristjan SCHMIDT @@ -1357,7 +1444,7 @@ Updated Esperanto translation po/eo.po | 1563 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 814 insertions(+), 749 deletions(-) + 1 file changed, 814 insertions(+), 749 deletions(-) commit 99f91d51c5e18bc86cdc425dbe4e3a280e9b8f63 Author: Enrico Minack @@ -1365,9 +1452,9 @@ fixes compilation problems for sticky notes and trash applet, see bug 638510 - stickynotes/Makefile.am | 1 + - trashapplet/src/Makefile.am | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) + stickynotes/Makefile.am | 1 + + trashapplet/src/Makefile.am | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) commit eff77bffb0180f3b68bb9037740081afe85edcdc Author: Gabor Kelemen @@ -1375,8 +1462,8 @@ Updated Hungarian translation - po/hu.po | 656 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 336 insertions(+), 320 deletions(-) + po/hu.po | 656 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 336 insertions(+), 320 deletions(-) commit 4be309309792304bbc91f329a206d8973d05af51 Author: Aron Xu @@ -1384,8 +1471,8 @@ Minor correction on Simplified Chinese translation. - po/zh_CN.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/zh_CN.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit f915b5198230a6040fdedc4f46442fe7b5a4ccad Author: Enrico Minack @@ -1393,8 +1480,8 @@ invest-applet: fixed broken charts for European markets, see bug 642470 - invest-applet/invest/chart.py | 2 +- - invest-applet/invest/quotes.py | 5 +---- + invest-applet/invest/chart.py | 2 +- + invest-applet/invest/quotes.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) commit 37948b2f8b389cd6dfa53c32b8c86eb4258fa3cc @@ -1403,8 +1490,8 @@ Updated Danish translation - gswitchit/help/da/da.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gswitchit/help/da/da.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2a2863971d283462a5253114fff37a1a10d3d018 Author: Piotr Drąg @@ -1412,8 +1499,8 @@ Updated Polish translation - po/pl.po | 547 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 279 insertions(+), 268 deletions(-) + po/pl.po | 547 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 279 insertions(+), 268 deletions(-) commit 96bf5c1f1a2346e2c87d185c23adc0d86f1ad04a Author: Gabriel F. Vilar @@ -1421,8 +1508,8 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 548 ++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 281 insertions(+), 267 deletions(-) + po/pt_BR.po | 548 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 281 insertions(+), 267 deletions(-) commit 655950b6c0c09f385f89b6e5029412ed4fd4a708 Author: Carlos Garcia Campos @@ -1432,8 +1519,8 @@ We depend on gtk 3, but the min version was still 2.20.0 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 17beccdb1a85a6b81f9b522dc3c482ba6d04f1d7 Author: ben @@ -1442,7 +1529,7 @@ [l10n]Update Simplified Chinese translation. po/zh_CN.po | 1404 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 738 insertions(+), 666 deletions(-) + 1 file changed, 738 insertions(+), 666 deletions(-) commit 5553b785d16665b82aab505d465e52186b3e0215 Author: Kenneth Nielsen @@ -1450,8 +1537,8 @@ Added da to list of languages - gswitchit/help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gswitchit/help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5853035cc79221dab04a516c999f44dabe981d25 Author: Nicky Thomassen @@ -1459,8 +1546,8 @@ Added Danish translation - gswitchit/help/da/da.po | 480 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 480 insertions(+), 0 deletions(-) + gswitchit/help/da/da.po | 480 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 480 insertions(+) commit b477024f4d0b25219c2f0f7af44c05ac348005ae Author: Vincent Untz @@ -1470,21 +1557,21 @@ This makes it easier to know where to install .panel-applet files. - accessx-status/Makefile.am | 2 +- - battstat/Makefile.am | 2 +- - charpick/Makefile.am | 2 +- - configure.in | 4 ++-- - cpufreq/Makefile.am | 2 +- - drivemount/Makefile.am | 2 +- - geyes/Makefile.am | 2 +- - gweather/Makefile.am | 2 +- - mini-commander/src/Makefile.am | 2 +- - mixer/Makefile.am | 2 +- - modemlights/Makefile.am | 2 +- - multiload/Makefile.am | 2 +- - null_applet/Makefile.am | 2 +- - stickynotes/Makefile.am | 2 +- - trashapplet/Makefile.am | 2 +- + accessx-status/Makefile.am | 2 +- + battstat/Makefile.am | 2 +- + charpick/Makefile.am | 2 +- + configure.in | 4 ++-- + cpufreq/Makefile.am | 2 +- + drivemount/Makefile.am | 2 +- + geyes/Makefile.am | 2 +- + gweather/Makefile.am | 2 +- + mini-commander/src/Makefile.am | 2 +- + mixer/Makefile.am | 2 +- + modemlights/Makefile.am | 2 +- + multiload/Makefile.am | 2 +- + null_applet/Makefile.am | 2 +- + stickynotes/Makefile.am | 2 +- + trashapplet/Makefile.am | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) commit 45a4988a6be02ed80046141d82c94e146f4556a1 @@ -1496,21 +1583,21 @@ We require the latest libpanel-applet, because the name argument was removed from PANEL_APPLET_OUT_PROCESS_FACTORY. - accessx-status/applet.c | 1 - - battstat/battstat_applet.c | 1 - - charpick/charpick.c | 1 - - configure.in | 2 +- - cpufreq/src/cpufreq-applet.c | 1 - - drivemount/drivemount.c | 1 - - geyes/geyes.c | 1 - - gweather/main.c | 1 - - mini-commander/src/mini-commander_applet.c | 1 - - mixer/load.c | 1 - - modemlights/modem-applet.c | 1 - - multiload/main.c | 1 - - null_applet/null_applet.c | 1 - - stickynotes/stickynotes_applet.c | 2 +- - trashapplet/src/trashapplet.c | 1 - + accessx-status/applet.c | 1 - + battstat/battstat_applet.c | 1 - + charpick/charpick.c | 1 - + configure.in | 2 +- + cpufreq/src/cpufreq-applet.c | 1 - + drivemount/drivemount.c | 1 - + geyes/geyes.c | 1 - + gweather/main.c | 1 - + mini-commander/src/mini-commander_applet.c | 1 - + mixer/load.c | 1 - + modemlights/modem-applet.c | 1 - + multiload/main.c | 1 - + null_applet/null_applet.c | 1 - + stickynotes/stickynotes_applet.c | 2 +- + trashapplet/src/trashapplet.c | 1 - 15 files changed, 2 insertions(+), 15 deletions(-) commit 48b138c31ff5e0da7738c9092c8e7c1614312c7d @@ -1519,8 +1606,8 @@ Updated Norwegian bokmål translation. - po/nb.po | 560 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 284 insertions(+), 276 deletions(-) + po/nb.po | 560 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 284 insertions(+), 276 deletions(-) commit ebd3481b12dd57f17aeaa98637276be452e9561c Author: Bruno Brouard @@ -1530,9 +1617,9 @@ Bruno Brouard and Alain Lojewski - invest-applet/docs/Makefile.am | 2 +- - invest-applet/docs/fr/fr.po | 866 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 867 insertions(+), 1 deletions(-) + invest-applet/docs/Makefile.am | 2 +- + invest-applet/docs/fr/fr.po | 866 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 867 insertions(+), 1 deletion(-) commit 71ced83db2ed310d975d1f684a90a00b87bdcbdf Author: Kjartan Maraas @@ -1540,10 +1627,10 @@ The build system insists on changing these so I'm just commiting them - geyes/docs/zh_HK/geyes.xml | 232 +++++---- - geyes/docs/zh_TW/geyes.xml | 232 +++++---- - stickynotes/docs/zh_HK/stickynotes_applet.xml | 631 ++++++++++++++++--------- - stickynotes/docs/zh_TW/stickynotes_applet.xml | 631 ++++++++++++++++--------- + geyes/docs/zh_HK/geyes.xml | 232 +++++----- + geyes/docs/zh_TW/geyes.xml | 232 +++++----- + stickynotes/docs/zh_HK/stickynotes_applet.xml | 631 +++++++++++++++++--------- + stickynotes/docs/zh_TW/stickynotes_applet.xml | 631 +++++++++++++++++--------- 4 files changed, 1090 insertions(+), 636 deletions(-) commit c0f6e56686679b0036ad82740207e47fdaa3cd72 @@ -1552,8 +1639,8 @@ Remove unused var - stickynotes/stickynotes.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) + stickynotes/stickynotes.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) commit 87ef419d3eca0543120601a73a0bdca9c33f45bd Author: Kjartan Maraas @@ -1561,8 +1648,8 @@ Fix compiler warning - gweather/gweather-pref.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gweather/gweather-pref.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e71599e5f0aef9913a43c10be5ad22b40a7d5cb2 Author: Marek Černocký @@ -1570,8 +1657,8 @@ Updated Czech translation - po/cs.po | 594 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 307 insertions(+), 287 deletions(-) + po/cs.po | 594 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 307 insertions(+), 287 deletions(-) commit d23cdba3f0551de3080066befea0ecda1390c507 Author: Jakob Kramer @@ -1579,8 +1666,8 @@ [l10n] Updated German doc translation - invest-applet/docs/de/de.po | 295 ++++++++++++++++++++++++++----------------- - 1 files changed, 181 insertions(+), 114 deletions(-) + invest-applet/docs/de/de.po | 295 +++++++++++++++++++++++++++----------------- + 1 file changed, 181 insertions(+), 114 deletions(-) commit dea641d767a1eed8afeae486bf62ea34d5d73695 Author: Bruno Brouard @@ -1589,7 +1676,7 @@ Updated French translation po/fr.po | 1095 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 558 insertions(+), 537 deletions(-) + 1 file changed, 558 insertions(+), 537 deletions(-) commit 6fd55674cdb0154d26c6d9a78001818cfe44fc58 Author: Carlos Garcia Campos @@ -1597,8 +1684,8 @@ cpufreq: Don't use size-request deprecated API - cpufreq/src/cpufreq-applet.c | 70 ++++++++++++++++++++--------------------- - 1 files changed, 34 insertions(+), 36 deletions(-) + cpufreq/src/cpufreq-applet.c | 70 +++++++++++++++++++++----------------------- + 1 file changed, 34 insertions(+), 36 deletions(-) commit b8588880f679b6166f6795877c9f0daefc95b1cc Author: Carlos Garcia Campos @@ -1608,21 +1695,21 @@ Applets directory is versioned now - accessx-status/Makefile.am | 2 +- - battstat/Makefile.am | 2 +- - charpick/Makefile.am | 2 +- - configure.in | 2 ++ - cpufreq/Makefile.am | 2 +- - drivemount/Makefile.am | 2 +- - geyes/Makefile.am | 2 +- - gweather/Makefile.am | 2 +- - mini-commander/src/Makefile.am | 2 +- - mixer/Makefile.am | 2 +- - modemlights/Makefile.am | 2 +- - multiload/Makefile.am | 2 +- - null_applet/Makefile.am | 2 +- - stickynotes/Makefile.am | 2 +- - trashapplet/Makefile.am | 2 +- + accessx-status/Makefile.am | 2 +- + battstat/Makefile.am | 2 +- + charpick/Makefile.am | 2 +- + configure.in | 2 ++ + cpufreq/Makefile.am | 2 +- + drivemount/Makefile.am | 2 +- + geyes/Makefile.am | 2 +- + gweather/Makefile.am | 2 +- + mini-commander/src/Makefile.am | 2 +- + mixer/Makefile.am | 2 +- + modemlights/Makefile.am | 2 +- + multiload/Makefile.am | 2 +- + null_applet/Makefile.am | 2 +- + stickynotes/Makefile.am | 2 +- + trashapplet/Makefile.am | 2 +- 15 files changed, 16 insertions(+), 14 deletions(-) commit c26ab5f7263acd6a2cf37db5df114f91e2ef329a @@ -1632,7 +1719,7 @@ Updated Slovenian translation po/sl.po | 1202 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 602 insertions(+), 600 deletions(-) + 1 file changed, 602 insertions(+), 600 deletions(-) commit 63487e3625c079c92abe3bbb36d88b30af186de0 Author: Mahyar Moghimi @@ -1640,8 +1727,8 @@ Updating Persian Translation - po/fa.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/fa.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 284d70e52b83260fa05eb5bd7299920e4f83b67f Author: Mahyar Moghimi @@ -1650,7 +1737,7 @@ Updating Persian Translation po/fa.po | 4515 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 2016 insertions(+), 2499 deletions(-) + 1 file changed, 2016 insertions(+), 2499 deletions(-) commit 72999ba75856c1a4f43c43cea0d44c9ad4de3273 Author: Daniel Mustieles @@ -1659,7 +1746,7 @@ Updated Spanish translation po/es.po | 1069 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 545 insertions(+), 524 deletions(-) + 1 file changed, 545 insertions(+), 524 deletions(-) commit 8cb2297ab097fae18a8eded38e96b93a2ac83ff2 Author: Alexander Shopov @@ -1667,8 +1754,8 @@ Updated Bulgarian translation - po/bg.po | 604 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 316 insertions(+), 288 deletions(-) + po/bg.po | 604 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 316 insertions(+), 288 deletions(-) commit 788a6916eb1ce2decff5254bc336a3d87f4b2bda Author: Andika Triwidada @@ -1677,7 +1764,7 @@ Updated Indonesian translation po/id.po | 1054 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 512 insertions(+), 542 deletions(-) + 1 file changed, 512 insertions(+), 542 deletions(-) commit adc50b2a7e68bfeea6f62a95e52f3957f40af14f Author: Daniel Nylander @@ -1686,7 +1773,7 @@ Updated Swedish translation po/sv.po | 1146 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 588 insertions(+), 558 deletions(-) + 1 file changed, 588 insertions(+), 558 deletions(-) commit c856cf4ec9aca237fcf2b2be0e50e5ad9550e471 Author: Ivar Smolin @@ -1694,8 +1781,8 @@ [l10n] Updated Estonian translation - po/et.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/et.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9f2eb39bb862803dc963e8b4ed375b929e19ab9b Author: Ivar Smolin @@ -1703,8 +1790,8 @@ [l10n] Updated Estonian translation - po/et.po | 46 +++++++++++++++++++++++++++++----------------- - 1 files changed, 29 insertions(+), 17 deletions(-) + po/et.po | 46 +++++++++++++++++++++++++++++----------------- + 1 file changed, 29 insertions(+), 17 deletions(-) commit b2f72f89e176c718179e3e8a486023fb241705ec Author: Yaron Shahrabani @@ -1712,8 +1799,8 @@ Updated Hebrew translation. - po/he.po | 1064 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 541 insertions(+), 523 deletions(-) + po/he.po | 1064 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 541 insertions(+), 523 deletions(-) commit 625ed2fa278fb7cf60238e513b84f504ed8fd932 Author: Fran Diéguez @@ -1721,8 +1808,8 @@ Updated Galician translations - po/gl.po | 1070 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 544 insertions(+), 526 deletions(-) + po/gl.po | 1070 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 544 insertions(+), 526 deletions(-) commit 26af3f70a0e3782081be3788029dfa06771e2dea Author: Kjartan Maraas @@ -1730,18 +1817,18 @@ Fix CFLAGS and LIBS to reflect that we're only about GNOME 3 now - accessx-status/Makefile.am | 11 ++++++++--- - battstat/Makefile.am | 5 +++-- - charpick/Makefile.am | 4 ++-- - cpufreq/src/Makefile.am | 9 +++++---- - geyes/Makefile.am | 4 ++-- - gweather/Makefile.am | 7 ++++--- - mini-commander/src/Makefile.am | 4 ++-- - mixer/Makefile.am | 5 +++-- - modemlights/Makefile.am | 5 +++-- - multiload/Makefile.am | 4 ++-- - stickynotes/Makefile.am | 5 +++-- - trashapplet/src/Makefile.am | 5 +++-- + accessx-status/Makefile.am | 11 ++++++++--- + battstat/Makefile.am | 5 +++-- + charpick/Makefile.am | 4 ++-- + cpufreq/src/Makefile.am | 9 +++++---- + geyes/Makefile.am | 4 ++-- + gweather/Makefile.am | 7 ++++--- + mini-commander/src/Makefile.am | 4 ++-- + mixer/Makefile.am | 5 +++-- + modemlights/Makefile.am | 5 +++-- + multiload/Makefile.am | 4 ++-- + stickynotes/Makefile.am | 5 +++-- + trashapplet/src/Makefile.am | 5 +++-- 12 files changed, 40 insertions(+), 28 deletions(-) commit a03597db6ce640e2b21b8a24559c01cf943f04c9 @@ -1750,8 +1837,8 @@ Use GAppInfo - multiload/main.c | 22 +++++++++++++++++----- - 1 files changed, 17 insertions(+), 5 deletions(-) + multiload/main.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) commit de5b7e354e09ff02b6d1fc3a5da1cee7a99ace98 Author: Kjartan Maraas @@ -1759,8 +1846,8 @@ Make stuff compile - trashapplet/src/xstuff.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + trashapplet/src/xstuff.h | 1 - + 1 file changed, 1 deletion(-) commit 90d2129906c7ead8e740bfcf5ab7e451e5ccff4e Author: Kjartan Maraas @@ -1768,8 +1855,8 @@ Make stuff compile - trashapplet/src/xstuff.c | 31 ++++++++++++------------------- - 1 files changed, 12 insertions(+), 19 deletions(-) + trashapplet/src/xstuff.c | 31 ++++++++++++------------------- + 1 file changed, 12 insertions(+), 19 deletions(-) commit 60a3efe3e9b55a5741ecd65ccd71c409ce304631 Author: Kjartan Maraas @@ -1777,8 +1864,8 @@ Drop catering for two versions of the panel - configure.in | 10 ++-------- - 1 files changed, 2 insertions(+), 8 deletions(-) + configure.in | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) commit fea6b8c6857d822475100aa7692c1360ff9292b9 Author: Kjartan Maraas @@ -1786,8 +1873,8 @@ Remove use of deprecated GDK functions and quiet a compiler warning - accessx-status/applet.c | 33 +++++++++++++++++++-------------- - 1 files changed, 19 insertions(+), 14 deletions(-) + accessx-status/applet.c | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) commit d26faa68fd2ce10591ca3dc5f64b36f074092425 Author: Kjartan Maraas @@ -1795,8 +1882,8 @@ Fix Makefile - null_applet/Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + null_applet/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) commit 26620fdf483af6626c3ad1783e8a94635b720540 Author: Kjartan Maraas @@ -1804,11 +1891,11 @@ Port null_applet to the new libpanel-applet - null_applet/Makefile.am | 56 +++++++++----------- - null_applet/null_applet.c | 33 +++++++----- - null_applet/null_applet.h | 50 +++++++++++++++++ - ...org.gnome.applets.NullApplet.panel-applet.in.in | 15 +++++ - ...gnome.panel.applet.NullAppletFactory.service.in | 3 + + null_applet/Makefile.am | 56 ++++++++++------------ + null_applet/null_applet.c | 33 ++++++++----- + null_applet/null_applet.h | 50 +++++++++++++++++++ + ...org.gnome.applets.NullApplet.panel-applet.in.in | 15 ++++++ + ...gnome.panel.applet.NullAppletFactory.service.in | 3 ++ 5 files changed, 114 insertions(+), 43 deletions(-) commit e3350ca2ad62dff019f91ea30006dfda54461444 @@ -1817,8 +1904,8 @@ More GDK fixes from Milan - stickynotes/stickynotes_applet_callbacks.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + stickynotes/stickynotes_applet_callbacks.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) commit a27ea0ec98ef76aac7ce3867123b6304d726957f Author: Kjartan Maraas @@ -1826,8 +1913,8 @@ More GDK fixes from Milan - stickynotes/util.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + stickynotes/util.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 5829a2a03b7edd371da26c76e9653b3dcdb63ca2 Author: Kjartan Maraas @@ -1835,8 +1922,8 @@ GDK fix from Milan Bouchet-Valat - stickynotes/stickynotes.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + stickynotes/stickynotes.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit 9f15852ad098d15b66449f66414f8b243f11b54c Author: Kjartan Maraas @@ -1844,8 +1931,8 @@ Use GSourceFunc. Patch from Milan Bouchet-Valat - geyes/geyes.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + geyes/geyes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7742d17cb81349ff3c10ac08643ac432845ef06d Author: Kjartan Maraas @@ -1853,8 +1940,8 @@ Port away from deprecated GDK functions. Patch from Milan Bouchet-Valat - drivemount/Makefile.am | 7 ++++- - drivemount/drive-button.c | 49 +++++++++++++++++++++++++++++++------------- + drivemount/Makefile.am | 7 +++++-- + drivemount/drive-button.c | 49 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 17 deletions(-) commit 561a932ce4e59361f54ec434eb24ef89309119b8 @@ -1863,8 +1950,8 @@ Patch from Milan Bouchet-Valat to fix compilation against gtk3 - charpick/charpick.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) + charpick/charpick.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) commit fb51ac7c3e0c6e2641eadea57d1117f5948393a2 Author: Christian Persch @@ -1872,9 +1959,9 @@ cpufreq: Fix the build with gtk3 - cpufreq/Makefile.am | 2 +- - cpufreq/src/Makefile.am | 2 +- - cpufreq/src/cpufreq-applet.c | 12 ++++++------ + cpufreq/Makefile.am | 2 +- + cpufreq/src/Makefile.am | 2 +- + cpufreq/src/cpufreq-applet.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) commit cd5250ed5d9aa467a34a6da1e2f566c191b25ca8 @@ -1883,8 +1970,8 @@ accessx: Fix the build with gtk3 - accessx-status/Makefile.am | 2 +- - accessx-status/applet.c | 78 +++++++++---------------------------------- + accessx-status/Makefile.am | 2 +- + accessx-status/applet.c | 78 ++++++++++------------------------------------ 2 files changed, 18 insertions(+), 62 deletions(-) commit 13522dcb2cb272b11214728c69c9ec179de78e2d @@ -1893,11 +1980,11 @@ battstat: Fix the build with gtk3 - battstat/Makefile.am | 2 +- - battstat/battstat.h | 3 --- - battstat/battstat_applet.c | 33 --------------------------------- - battstat/properties.c | 1 - - 4 files changed, 1 insertions(+), 38 deletions(-) + battstat/Makefile.am | 2 +- + battstat/battstat.h | 3 --- + battstat/battstat_applet.c | 33 --------------------------------- + battstat/properties.c | 1 - + 4 files changed, 1 insertion(+), 38 deletions(-) commit e963da0a21cf50622a1cc548f01e148df1ff575b Author: Christian Persch @@ -1905,10 +1992,10 @@ gweather: Fix the build with gtk3 - gweather/Makefile.am | 4 ++- - gweather/gweather-applet.c | 16 +++++++------- - gweather/gweather-dialog.c | 1 - - gweather/gweather-pref.c | 51 +++++++++++++++++++++---------------------- + gweather/Makefile.am | 4 +++- + gweather/gweather-applet.c | 16 +++++++-------- + gweather/gweather-dialog.c | 1 - + gweather/gweather-pref.c | 51 +++++++++++++++++++++++----------------------- 4 files changed, 36 insertions(+), 36 deletions(-) commit 5a130b3ce10e965bcd17bf4cd60bcd8d06b29738 @@ -1917,9 +2004,9 @@ multiload: Fix the build with gtk3 - multiload/Makefile.am | 2 +- - multiload/main.c | 12 ++++++------ - multiload/properties.c | 1 - + multiload/Makefile.am | 2 +- + multiload/main.c | 12 ++++++------ + multiload/properties.c | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) commit fb9db56d67afd44b1c05aedb8b511a98f1284522 @@ -1928,10 +2015,10 @@ trashapplet: Fix the build with gtk3 - trashapplet/Makefile.am | 2 +- - trashapplet/src/Makefile.am | 2 +- - trashapplet/src/trashapplet.c | 15 +++++++-------- - trashapplet/src/xstuff.c | 11 +++-------- + trashapplet/Makefile.am | 2 +- + trashapplet/src/Makefile.am | 2 +- + trashapplet/src/trashapplet.c | 15 +++++++-------- + trashapplet/src/xstuff.c | 11 +++-------- 4 files changed, 12 insertions(+), 18 deletions(-) commit 9cb63db161552427a959e3df4a6cbec30b09cb62 @@ -1940,11 +2027,11 @@ stickynotes: Fix the build with gtk3 - stickynotes/Makefile.am | 2 +- - stickynotes/stickynotes.c | 7 +--- - stickynotes/stickynotes_applet.c | 4 +- - stickynotes/stickynotes_applet_callbacks.c | 55 +++------------------------- - stickynotes/stickynotes_applet_callbacks.h | 5 --- + stickynotes/Makefile.am | 2 +- + stickynotes/stickynotes.c | 7 +--- + stickynotes/stickynotes_applet.c | 4 +-- + stickynotes/stickynotes_applet_callbacks.c | 55 ++++-------------------------- + stickynotes/stickynotes_applet_callbacks.h | 5 --- 5 files changed, 10 insertions(+), 63 deletions(-) commit 34943436d2c04d5c9f08fe95b737d263f89a9d18 @@ -1953,9 +2040,9 @@ geyes: Fix build with gtk3 - geyes/Makefile.am | 2 +- - geyes/geyes.c | 50 +++----------------------------------------------- - geyes/themes.c | 3 --- + geyes/Makefile.am | 2 +- + geyes/geyes.c | 50 +++----------------------------------------------- + geyes/themes.c | 3 --- 3 files changed, 4 insertions(+), 51 deletions(-) commit 71f00ef594e09ece5f735a4599143b7b74262f85 @@ -1964,9 +2051,9 @@ drivemount: Fix build with gtk3 - drivemount/Makefile.am | 2 +- - drivemount/drive-button.c | 8 ++++---- - drivemount/drivemount.c | 19 ++++--------------- + drivemount/Makefile.am | 2 +- + drivemount/drive-button.c | 8 ++++---- + drivemount/drivemount.c | 19 ++++--------------- 3 files changed, 9 insertions(+), 20 deletions(-) commit 298d6c077c70c2e50e5ecf2add90e7ea7571fb4f @@ -1975,8 +2062,8 @@ charpick: Fix build with gtk3 - charpick/Makefile.am | 2 +- - charpick/properties.c | 4 +--- + charpick/Makefile.am | 2 +- + charpick/properties.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) commit 42a8a515fd5ec7b50c2ae9b3d29471b0b39cec34 @@ -1985,8 +2072,8 @@ gtk3: update configure requirements - configure.in | 56 +++++++++++++++++++++++--------------------------------- - 1 files changed, 23 insertions(+), 33 deletions(-) + configure.in | 56 +++++++++++++++++++++++--------------------------------- + 1 file changed, 23 insertions(+), 33 deletions(-) commit bb2a6837143282687860ef811791096c4f187b39 Author: Vincent Untz @@ -1998,10 +2085,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=623369 - configure.in | 10 ++++------ - mixer/Makefile.am | 6 ++---- - multiload/Makefile.am | 4 ++-- - multiload/main.c | 32 +++++++++++++++++++++++--------- + configure.in | 10 ++++------ + mixer/Makefile.am | 6 ++---- + multiload/Makefile.am | 4 ++-- + multiload/main.c | 32 +++++++++++++++++++++++--------- 4 files changed, 31 insertions(+), 21 deletions(-) commit 274f17fe92b98b5a0bdd31de734240b4cc6227e9 @@ -2010,18 +2097,18 @@ Remove GtkObject use - battstat/battstat_applet.c | 16 ++++++++-------- - charpick/charpick.c | 8 ++++---- - cpufreq/src/cpufreq-applet.c | 10 +++++----- - drivemount/drive-button.c | 13 ++++++------- - drivemount/drive-list.c | 12 +++++------- - geyes/geyes.c | 2 +- - gweather/gweather-applet.c | 2 +- - gweather/gweather-pref.c | 2 +- - mini-commander/src/command_line.c | 4 ++-- - mixer/applet.c | 1 - - trashapplet/src/trash-empty.c | 6 +++--- - trashapplet/src/trashapplet.c | 11 +++++------ + battstat/battstat_applet.c | 16 ++++++++-------- + charpick/charpick.c | 8 ++++---- + cpufreq/src/cpufreq-applet.c | 10 +++++----- + drivemount/drive-button.c | 13 ++++++------- + drivemount/drive-list.c | 12 +++++------- + geyes/geyes.c | 2 +- + gweather/gweather-applet.c | 2 +- + gweather/gweather-pref.c | 2 +- + mini-commander/src/command_line.c | 4 ++-- + mixer/applet.c | 1 - + trashapplet/src/trash-empty.c | 6 +++--- + trashapplet/src/trashapplet.c | 11 +++++------ 12 files changed, 41 insertions(+), 46 deletions(-) commit 137c00e2de6098b0ecef75ec208d58de138d7a82 @@ -2032,8 +2119,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - battstat/battstat_applet.c | 173 +++++++++++++++++++------------------------- - 1 files changed, 76 insertions(+), 97 deletions(-) + battstat/battstat_applet.c | 173 ++++++++++++++++++++------------------------- + 1 file changed, 76 insertions(+), 97 deletions(-) commit 5b91de8cfdd3578a1219d5367354798fbb4b48d3 Author: Benjamin Otte @@ -2043,8 +2130,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - accessx-status/applet.c | 47 +++++++++++++++++++---------------------------- - 1 files changed, 19 insertions(+), 28 deletions(-) + accessx-status/applet.c | 47 +++++++++++++++++++---------------------------- + 1 file changed, 19 insertions(+), 28 deletions(-) commit 23f39be37c766a9f7f1c20ab2233d5a0e85d8b17 Author: Benjamin Otte @@ -2054,9 +2141,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - multiload/global.h | 4 +- - multiload/load-graph.c | 115 ++++++++++++++++------------------------------- - multiload/properties.c | 2 - + multiload/global.h | 4 +- + multiload/load-graph.c | 115 +++++++++++++++++-------------------------------- + multiload/properties.c | 2 - 3 files changed, 40 insertions(+), 81 deletions(-) commit 724533eefaec3268bc9787a1e146afbee171cf46 @@ -2067,8 +2154,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - accessx-status/applet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + accessx-status/applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3d51417f06ac5e4177e22ff970d7906e2802ff48 Author: Benjamin Otte @@ -2078,8 +2165,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - battstat/acpi-linux.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + battstat/acpi-linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 088a4e2ca6272cf029ca3e8ad990bde79f3084d1 Author: Benjamin Otte @@ -2089,9 +2176,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - gweather/gweather-applet.c | 1 - - gweather/gweather-pref.c | 2 -- - 2 files changed, 0 insertions(+), 3 deletions(-) + gweather/gweather-applet.c | 1 - + gweather/gweather-pref.c | 2 -- + 2 files changed, 3 deletions(-) commit f026336d7f01da8c8697770206042e5e7c606a11 Author: Benjamin Otte @@ -2101,8 +2188,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - multiload/linux-proc.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + multiload/linux-proc.c | 1 - + 1 file changed, 1 deletion(-) commit 47d62f766eed572c19935829535e738c5cc3d8ea Author: Benjamin Otte @@ -2112,8 +2199,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - trashapplet/src/trash-empty.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) + trashapplet/src/trash-empty.c | 8 -------- + 1 file changed, 8 deletions(-) commit 18e23a490529131d17c931247481cfa02b1f14b3 Author: Benjamin Otte @@ -2123,8 +2210,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - stickynotes/stickynotes_applet.c | 2 -- - stickynotes/stickynotes_applet_callbacks.c | 8 +++----- + stickynotes/stickynotes_applet.c | 2 -- + stickynotes/stickynotes_applet_callbacks.c | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) commit 33e10c46f76994a94fbccb8da0acb4ca36e6f20a @@ -2137,8 +2224,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - drivemount/drivemount.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + drivemount/drivemount.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit fe72f63c91a1458d97d455ab0078d042464366e7 Author: Enrico Minack @@ -2146,8 +2233,8 @@ gweather: fixes NetworkManager support to compile, see bug 636217 - gweather/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + gweather/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) commit 0058dde41dbc7710e2ddc5f28a0a69ed61d397e6 Author: Kjartan Maraas @@ -2155,8 +2242,8 @@ Updated Norwegian bokmål translation from Torstein Adolf Winterseth - po/nb.po | 784 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 398 insertions(+), 386 deletions(-) + po/nb.po | 784 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 398 insertions(+), 386 deletions(-) commit f468a4e540ebd10eada70d3fb2860418995280de Author: Theppitak Karoonboonyanan @@ -2164,8 +2251,8 @@ Updated Thai translation. - po/th.po | 311 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 170 insertions(+), 141 deletions(-) + po/th.po | 311 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 170 insertions(+), 141 deletions(-) commit f37c1c090dc4fcbadec6636ba65d7655544d22bf Author: Gheyret T.Kenji @@ -2173,8 +2260,8 @@ Added UG translation - po/ug.po | 24 +++++++++++------------- - 1 files changed, 11 insertions(+), 13 deletions(-) + po/ug.po | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) commit 8070e7424a745e7dca0b900cf90334f1295277cc Author: Mattias Põldaru @@ -2182,8 +2269,8 @@ [l10n] Updated Estonian translation - po/et.po | 255 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 137 insertions(+), 118 deletions(-) + po/et.po | 255 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 137 insertions(+), 118 deletions(-) commit 8647cefbe91ee55b187a511249db5ba7421a7497 Author: Wei-Lun Chao @@ -2191,8 +2278,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 25 +++++++++++++------------ - po/zh_TW.po | 25 +++++++++++++------------ + po/zh_HK.po | 25 +++++++++++++------------ + po/zh_TW.po | 25 +++++++++++++------------ 2 files changed, 26 insertions(+), 24 deletions(-) commit f6b5bf454a61ca0090a1a32b798045a807d8ddad @@ -2202,9 +2289,9 @@ moved to libnotify version 0.7 fixed API change of libnotify 0.7 for gweather and battstat, fixes #632803 - battstat/battstat_applet.c | 2 +- - configure.in | 2 +- - gweather/gweather-applet.c | 3 +-- + battstat/battstat_applet.c | 2 +- + configure.in | 2 +- + gweather/gweather-applet.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) commit 6273cedf8474d8082ea341dffc28f233e8a6d1c2 @@ -2213,17 +2300,17 @@ [release] post-release bump to 2.91.4 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit d5f2fba89e3879297fef742a3dcbe8dd7a169937 +commit d5f2fba89e3879297fef742a3dcbe8dd7a169937 (tag: GNOME_APPLETS_2_91_3) Author: Enrico Minack Date: Tue Nov 30 13:04:48 2010 +0100 [release] 2.91.3 - NEWS | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + NEWS | 8 ++++++++ + 1 file changed, 8 insertions(+) commit b3758cc76ac05a38618289f6b84054c8be6603a5 Author: Daniel Șerbănescu @@ -2231,9 +2318,9 @@ Added Romanian translation - trashapplet/docs/Makefile.am | 2 +- - trashapplet/docs/ro/ro.po | 350 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 351 insertions(+), 1 deletions(-) + trashapplet/docs/Makefile.am | 2 +- + trashapplet/docs/ro/ro.po | 350 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 351 insertions(+), 1 deletion(-) commit 0aada4486504728aaab68adad6610e5f1919f28d Author: Gheyret T.Kenji @@ -2241,8 +2328,8 @@ Added UG translation - po/ug.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/ug.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 956297505771e675cd99588f1e2b88f302e9453e Author: Carlos Garcia Campos @@ -2252,8 +2339,8 @@ Fixes bug #634725. - ...el.applet.MiniCommanderAppletFactory.service.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + .../src/org.gnome.panel.applet.MiniCommanderAppletFactory.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5d5784bdde5dbe1250f9405da84718f70d416961 Author: Gheyret T.Kenji @@ -2261,8 +2348,8 @@ Added UG translation - po/ug.po | 281 +++++++++++++++++++++----------------------------------------- - 1 files changed, 93 insertions(+), 188 deletions(-) + po/ug.po | 281 +++++++++++++++++++++------------------------------------------ + 1 file changed, 93 insertions(+), 188 deletions(-) commit f7cf34523454258a011438c7717b93023b144340 Author: Enrico Minack @@ -2270,17 +2357,17 @@ [release] post-release bump to 2.91.3 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit d82d022c08a799eae3ded13770474c07fcdcbd17 +commit d82d022c08a799eae3ded13770474c07fcdcbd17 (tag: GNOME_APPLETS_2_91_2) Author: Enrico Minack Date: Mon Nov 8 09:24:04 2010 +0100 [release] 2.91.2 - NEWS | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + NEWS | 6 ++++++ + 1 file changed, 6 insertions(+) commit 55afa8cf0127631c20329988f1bad59a66805f16 Author: Takayuki KUSANO @@ -2288,8 +2375,8 @@ Updated Japanese translation - po/ja.po | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) + po/ja.po | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) commit 0df817d938004f47a72ca12a5dde4ce60d32d045 Author: Carles Ferrando @@ -2297,8 +2384,8 @@ Updated Catalan (Valencian) translation - po/ca@valencia.po | 976 +++++++++++++++++++++++++++-------------------------- - 1 files changed, 506 insertions(+), 470 deletions(-) + po/ca@valencia.po | 976 ++++++++++++++++++++++++++++-------------------------- + 1 file changed, 506 insertions(+), 470 deletions(-) commit 319cc47844ff5660ffdeaae6fff9ec70a252ad9d Author: Christian Persch @@ -2308,40 +2395,40 @@ Convert some files from ISO-8859-1 to UTF-8. - battstat/acpi-freebsd.c | 2 +- - battstat/acpi-linux.c | 2 +- - battstat/acpi-linux.h | 2 +- - battstat/apmlib/Makefile.am | 2 +- - battstat/pixmaps.h | 2 +- - cpufreq/src/cpufreq-applet.c | 2 +- - cpufreq/src/cpufreq-applet.h | 2 +- - cpufreq/src/cpufreq-monitor-cpuinfo.c | 2 +- - cpufreq/src/cpufreq-monitor-cpuinfo.h | 2 +- - cpufreq/src/cpufreq-monitor-factory.c | 2 +- - cpufreq/src/cpufreq-monitor-factory.h | 2 +- - cpufreq/src/cpufreq-monitor-libcpufreq.c | 2 +- - cpufreq/src/cpufreq-monitor-libcpufreq.h | 2 +- - cpufreq/src/cpufreq-monitor-procfs.c | 2 +- - cpufreq/src/cpufreq-monitor-procfs.h | 2 +- - cpufreq/src/cpufreq-monitor-sysfs.c | 2 +- - cpufreq/src/cpufreq-monitor-sysfs.h | 2 +- - cpufreq/src/cpufreq-monitor.c | 2 +- - cpufreq/src/cpufreq-monitor.h | 2 +- - cpufreq/src/cpufreq-popup.c | 2 +- - cpufreq/src/cpufreq-popup.h | 2 +- - cpufreq/src/cpufreq-prefs.c | 2 +- - cpufreq/src/cpufreq-prefs.h | 2 +- - .../cpufreq-selector/cpufreq-selector-libcpufreq.c | 2 +- - .../cpufreq-selector/cpufreq-selector-libcpufreq.h | 2 +- - .../src/cpufreq-selector/cpufreq-selector-procfs.c | 2 +- - .../src/cpufreq-selector/cpufreq-selector-procfs.h | 2 +- - .../src/cpufreq-selector/cpufreq-selector-sysfs.c | 2 +- - .../src/cpufreq-selector/cpufreq-selector-sysfs.h | 2 +- - cpufreq/src/cpufreq-selector/cpufreq-selector.c | 2 +- - cpufreq/src/cpufreq-selector/cpufreq-selector.h | 2 +- - cpufreq/src/cpufreq-selector/main.c | 2 +- - cpufreq/src/cpufreq-utils.c | 2 +- - cpufreq/src/cpufreq-utils.h | 2 +- + battstat/acpi-freebsd.c | 2 +- + battstat/acpi-linux.c | 2 +- + battstat/acpi-linux.h | 2 +- + battstat/apmlib/Makefile.am | 2 +- + battstat/pixmaps.h | 2 +- + cpufreq/src/cpufreq-applet.c | 2 +- + cpufreq/src/cpufreq-applet.h | 2 +- + cpufreq/src/cpufreq-monitor-cpuinfo.c | 2 +- + cpufreq/src/cpufreq-monitor-cpuinfo.h | 2 +- + cpufreq/src/cpufreq-monitor-factory.c | 2 +- + cpufreq/src/cpufreq-monitor-factory.h | 2 +- + cpufreq/src/cpufreq-monitor-libcpufreq.c | 2 +- + cpufreq/src/cpufreq-monitor-libcpufreq.h | 2 +- + cpufreq/src/cpufreq-monitor-procfs.c | 2 +- + cpufreq/src/cpufreq-monitor-procfs.h | 2 +- + cpufreq/src/cpufreq-monitor-sysfs.c | 2 +- + cpufreq/src/cpufreq-monitor-sysfs.h | 2 +- + cpufreq/src/cpufreq-monitor.c | 2 +- + cpufreq/src/cpufreq-monitor.h | 2 +- + cpufreq/src/cpufreq-popup.c | 2 +- + cpufreq/src/cpufreq-popup.h | 2 +- + cpufreq/src/cpufreq-prefs.c | 2 +- + cpufreq/src/cpufreq-prefs.h | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.h | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector-procfs.c | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector-procfs.h | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.c | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector-sysfs.h | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector.c | 2 +- + cpufreq/src/cpufreq-selector/cpufreq-selector.h | 2 +- + cpufreq/src/cpufreq-selector/main.c | 2 +- + cpufreq/src/cpufreq-utils.c | 2 +- + cpufreq/src/cpufreq-utils.h | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) commit 92ba1934cd9787eda0f9b1b97322f5494a125fb6 @@ -2350,8 +2437,8 @@ [l10n] Updated Estonian translation - po/et.po | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) + po/et.po | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) commit e4e6b2d2282535e6b19a945c4e9fbd29703d904c Author: Gabor Kelemen @@ -2359,8 +2446,8 @@ Fix xml tags - trashapplet/docs/hu/hu.po | 17 +++++++++-------- - 1 files changed, 9 insertions(+), 8 deletions(-) + trashapplet/docs/hu/hu.po | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) commit d5131b667d4570211a783c58703aae5b5f1226d1 Author: Claude Paroz @@ -2368,8 +2455,8 @@ [sticky-notes help] Fix XML validity of French translation - stickynotes/docs/fr/fr.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + stickynotes/docs/fr/fr.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit c8afd0c35ea267b571867fe61040eff235fe1d16 Author: Jorge González @@ -2377,8 +2464,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 41 ++++------------------------------------- - 1 files changed, 4 insertions(+), 37 deletions(-) + invest-applet/docs/es/es.po | 41 ++++------------------------------------- + 1 file changed, 4 insertions(+), 37 deletions(-) commit 9992a4e5c12560a27039730e4937b4f77829cdb6 Author: krishnababu k @@ -2387,7 +2474,7 @@ Updated Telugu Translations po/te.po | 1310 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 664 insertions(+), 646 deletions(-) + 1 file changed, 664 insertions(+), 646 deletions(-) commit 090b0e9c38e97584dde85ba979a8edd1b58167a2 Author: Enrico Minack @@ -2395,17 +2482,17 @@ [release] post-release bump to 2.91.2 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit da180ea09cbdd2126e58a5f55ab8cb983d93c835 +commit da180ea09cbdd2126e58a5f55ab8cb983d93c835 (tag: GNOME_APPLETS_2_91_1) Author: Enrico Minack Date: Tue Oct 19 11:04:44 2010 +0200 [release] 2.91.1 - NEWS | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + NEWS | 12 ++++++++++++ + 1 file changed, 12 insertions(+) commit d2eb9e4e43bc5f885f7e093a30caa07950c3ef36 Author: Matej Urbančič @@ -2413,8 +2500,8 @@ Added sl for Slovenian translation - mini-commander/help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + mini-commander/help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9d7c808e587dfea4be2509590f7824d2111df95b Author: Matej Urbančič @@ -2422,8 +2509,8 @@ Updated Slovenian translation - mini-commander/help/sl/sl.po | 662 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 662 insertions(+), 0 deletions(-) + mini-commander/help/sl/sl.po | 662 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 662 insertions(+) commit 0c8762804fa18901ff23b146f4ee356b4078c974 Author: Matej Urbančič @@ -2431,8 +2518,8 @@ Added sl for Slovenian translation - trashapplet/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + trashapplet/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit a56cba0f465d806884cb2dd89c286190f23b699a Author: Matej Urbančič @@ -2440,8 +2527,8 @@ Updated Slovenian translation - trashapplet/docs/sl/sl.po | 226 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 226 insertions(+), 0 deletions(-) + trashapplet/docs/sl/sl.po | 226 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 226 insertions(+) commit 56840aeb7abfd1d8aa3eb3f6c53c4ed34389e6e7 Author: Matej Urbančič @@ -2449,8 +2536,8 @@ Added sl for Slovenian translation - stickynotes/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + stickynotes/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 67ec2f3da8af16d77bea2298f8db89c2f43d1c30 Author: Matej Urbančič @@ -2458,8 +2545,8 @@ Updated Slovenian translation - stickynotes/docs/sl/sl.po | 527 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 527 insertions(+), 0 deletions(-) + stickynotes/docs/sl/sl.po | 527 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 527 insertions(+) commit e88c031d7451a5d9418bb816c7611a74b7791cb1 Author: Matej Urbančič @@ -2467,8 +2554,8 @@ Added sl for Slovenian translation - multiload/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + multiload/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9fed2d3d895eb311bc03e3d1e973b4b04d8ff202 Author: Matej Urbančič @@ -2476,8 +2563,8 @@ Updated Slovenian translation - multiload/docs/sl/sl.po | 592 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 592 insertions(+), 0 deletions(-) + multiload/docs/sl/sl.po | 592 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 592 insertions(+) commit 401be93f7af3905cde5a047953a46cdbb20ebee1 Author: Matej Urbančič @@ -2485,8 +2572,8 @@ Added sl for Slovenian translation - mixer/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + mixer/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit a4dfbac6fa8474c5dc60855cd2744b48a807d933 Author: Matej Urbančič @@ -2494,8 +2581,8 @@ Updated Slovenian translation - mixer/docs/sl/sl.po | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 342 insertions(+), 0 deletions(-) + mixer/docs/sl/sl.po | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 342 insertions(+) commit 7db98c76b0a72f3bce0851068894d37da6b6be5e Author: Matej Urbančič @@ -2503,8 +2590,8 @@ Added sl for Slovenian translation - invest-applet/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + invest-applet/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3f33e1b2bb8c43c1680947147e29f08f98727d61 Author: Matej Urbančič @@ -2512,8 +2599,8 @@ Updated Slovenian translation - invest-applet/docs/sl/sl.po | 455 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 455 insertions(+), 0 deletions(-) + invest-applet/docs/sl/sl.po | 455 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 455 insertions(+) commit 8247b1fcd9d91c238cd4ddbb4c1ea9fc2075a456 Author: Matej Urbančič @@ -2521,8 +2608,8 @@ Added sl for Slovenian translation - gweather/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gweather/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 83050b842f6a1e359f7ac29c2c44c1534845350a Author: Matej Urbančič @@ -2530,8 +2617,8 @@ Updated Slovenian translation - gweather/docs/sl/sl.po | 747 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 747 insertions(+), 0 deletions(-) + gweather/docs/sl/sl.po | 747 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 747 insertions(+) commit 79428875c5a9d0ec91cf14951c96c48818e5564b Author: Matej Urbančič @@ -2539,8 +2626,8 @@ Added sl for Slovenian translation - gswitchit/help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gswitchit/help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit c17d34d8a240aa370ee9b3482f799571d9a475ed Author: Matej Urbančič @@ -2548,8 +2635,8 @@ Updated Slovenian translation - gswitchit/help/sl/sl.po | 251 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 251 insertions(+), 0 deletions(-) + gswitchit/help/sl/sl.po | 251 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 251 insertions(+) commit 959dd3975e17ba8d78c821052c575cd714288180 Author: Matej Urbančič @@ -2557,8 +2644,8 @@ Added sl for Slovenian translation - geyes/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + geyes/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 724d6b25f3de261f55d1ced7dae119130e6ecac3 Author: Matej Urbančič @@ -2566,8 +2653,8 @@ Updated Slovenian translation - geyes/docs/sl/sl.po | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 274 insertions(+), 0 deletions(-) + geyes/docs/sl/sl.po | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 274 insertions(+) commit 86a08f4a5b27d77a42e19e400c9efe4b0b699408 Author: Matej Urbančič @@ -2575,8 +2662,8 @@ Added sl for Slovenian translation - drivemount/help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + drivemount/help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit c3212cc28d937aaec164ddcd06780972989bb6a9 Author: Matej Urbančič @@ -2584,8 +2671,8 @@ Updated Slovenian translation - drivemount/help/sl/sl.po | 322 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 322 insertions(+), 0 deletions(-) + drivemount/help/sl/sl.po | 322 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 322 insertions(+) commit ff106301a45441faff698edc0e629c11207f9d92 Author: Matej Urbančič @@ -2593,8 +2680,8 @@ Added sl for Slovenian translation - cpufreq/help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + cpufreq/help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit f8063df70c69b29bee7b461eac92e585164fc1fa Author: Matej Urbančič @@ -2602,8 +2689,8 @@ Updated Slovenian translation - cpufreq/help/sl/sl.po | 403 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 403 insertions(+), 0 deletions(-) + cpufreq/help/sl/sl.po | 403 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 403 insertions(+) commit b92dc4bab1dd2a6671d3dbb20cedf2f4bc96b447 Author: Matej Urbančič @@ -2611,8 +2698,8 @@ Added sl for Slovenian translation - charpick/help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + charpick/help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 363d106440fc5454f13c1de0248886e1799d08c5 Author: Matej Urbančič @@ -2620,8 +2707,8 @@ Updated Slovenian translation - charpick/help/sl/sl.po | 438 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 438 insertions(+), 0 deletions(-) + charpick/help/sl/sl.po | 438 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 438 insertions(+) commit 9dc0539e570f44fe9c4ca918217e13469f58ebaf Author: Matej Urbančič @@ -2629,8 +2716,8 @@ Added sl for Slovenian translation - battstat/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + battstat/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 853577e287b58db9360e8c885eeb9ccf5f9e153a Author: Matej Urbančič @@ -2638,8 +2725,8 @@ Updated Slovenian translation - battstat/docs/sl/sl.po | 493 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 493 insertions(+), 0 deletions(-) + battstat/docs/sl/sl.po | 493 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 493 insertions(+) commit 320862f4fd08bc611d0c6f35f74c9fa8f59494db Author: Matej Urbančič @@ -2647,8 +2734,8 @@ Added sl for Slovenian translation - accessx-status/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + accessx-status/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 657cb4016a39905977a26aabd9f2e40fde66e6da Author: Matej Urbančič @@ -2656,8 +2743,8 @@ Updated Slovenian translation - accessx-status/docs/sl/sl.po | 327 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 327 insertions(+), 0 deletions(-) + accessx-status/docs/sl/sl.po | 327 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 327 insertions(+) commit d479a58102b222462fe30b52875fd673f6f76ee3 Author: Sahran @@ -2666,7 +2753,7 @@ Added UG translation po/ug.po | 1647 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 899 insertions(+), 748 deletions(-) + 1 file changed, 899 insertions(+), 748 deletions(-) commit d3bf188eab06d72ee6394a4d305b7317db33d408 Author: Klemen Košir @@ -2674,8 +2761,8 @@ Updated Slovenian translation - po/sl.po | 539 ++++++++++++++++++++++++++------------------------------------ - 1 files changed, 227 insertions(+), 312 deletions(-) + po/sl.po | 539 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 227 insertions(+), 312 deletions(-) commit 1c054e5dae5134a1ef11ed7f279eb18973717cc3 Author: Enrico Minack @@ -2685,8 +2772,8 @@ switched master to development branch, branched off gnome-2-32 before and merged all commits until then in there - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d4bea685996cfb4fe38aab3a5763b2517e83bdbf Author: Enrico Minack @@ -2696,8 +2783,8 @@ replaced *simple_quote* variables with *quote*, which now cover ALL quotes, not only simple ones, this removes the erroneous if branch - invest-applet/invest/quotes.py | 35 ++++++++++++++++------------------- - 1 files changed, 16 insertions(+), 19 deletions(-) + invest-applet/invest/quotes.py | 35 ++++++++++++++++------------------- + 1 file changed, 16 insertions(+), 19 deletions(-) commit 268c51f13c60c7cc456c806e867281a6006e8af5 Author: Changwoo Ryu @@ -2706,7 +2793,7 @@ Updated Korean translation po/ko.po | 1011 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 527 insertions(+), 484 deletions(-) + 1 file changed, 527 insertions(+), 484 deletions(-) commit dbe23d96c8fa67c4e52ee812ada9abb679e5c6e1 Author: Ivar Smolin @@ -2714,8 +2801,8 @@ [l10n] Updated Estonian translation - po/et.po | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + po/et.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit 5bb0749cad4a3ad2e8a34f0267f46474d8c738c4 Author: Giuseppe D'Andrea @@ -2723,9 +2810,9 @@ [l10n] Added invest-applet docs Italian translation - invest-applet/docs/Makefile.am | 2 +- - invest-applet/docs/it/it.po | 587 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 588 insertions(+), 1 deletions(-) + invest-applet/docs/Makefile.am | 2 +- + invest-applet/docs/it/it.po | 587 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 588 insertions(+), 1 deletion(-) commit 0f350b835ead8ffb45ca5addd1297028351a6bf7 Author: Michael Kotsarinis @@ -2733,8 +2820,8 @@ l10n: Updated Greek translation for gnome-applets/invest help - invest-applet/docs/el/el.po | 783 +++++++++++++++++++++---------------------- - 1 files changed, 380 insertions(+), 403 deletions(-) + invest-applet/docs/el/el.po | 783 +++++++++++++++++++++----------------------- + 1 file changed, 380 insertions(+), 403 deletions(-) commit 90646517f4849524a10d82e2923e92ec6c8ed985 Author: Žygimantas Beručka @@ -2743,7 +2830,7 @@ Updated Lithuanian translation po/lt.po | 1174 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 606 insertions(+), 568 deletions(-) + 1 file changed, 606 insertions(+), 568 deletions(-) commit 79d7ee18721d7aa5bce1faa86a90027435e96b32 Author: Enrico Minack @@ -2751,17 +2838,17 @@ [release] post-release bump to 2.32.1 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 083437e33d6b226b4e36d9fe8a92319bec7f9f2e +commit 083437e33d6b226b4e36d9fe8a92319bec7f9f2e (tag: GNOME_APPLETS_2_32_0) Author: Enrico Minack Date: Sun Sep 26 22:18:50 2010 +0200 [release] 2.32.0 - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) commit 75d6802b749504242b04b35caf127489cf360d46 Author: Joan Duran @@ -2769,8 +2856,8 @@ Updated Catalan translation - po/ca.po | 923 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 478 insertions(+), 445 deletions(-) + po/ca.po | 923 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 478 insertions(+), 445 deletions(-) commit 07ad34416f8728afba911918b430e630b8cdb147 Author: Yuri Myasoedov @@ -2778,8 +2865,8 @@ Updated Russian translation - po/ru.po | 720 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 349 insertions(+), 371 deletions(-) + po/ru.po | 720 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 349 insertions(+), 371 deletions(-) commit 540dd0a87f75db27f2957f5a73547a1ab2ad5f49 Author: Inaki Larranaga Murgoitio @@ -2787,8 +2874,8 @@ Updated Basque language - po/eu.po | 978 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 516 insertions(+), 462 deletions(-) + po/eu.po | 978 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 516 insertions(+), 462 deletions(-) commit 5995955ea83b436a1b20039d4b3042f7f88c1df1 Author: Khaled Hosny @@ -2796,8 +2883,8 @@ Updated Arabic translation - po/ar.po | 966 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 504 insertions(+), 462 deletions(-) + po/ar.po | 966 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 504 insertions(+), 462 deletions(-) commit 199ff1970ac2250311d5d170891fa5f363c33917 Author: Petr Kovar @@ -2805,8 +2892,8 @@ Update Czech translation - po/cs.po | 937 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 490 insertions(+), 447 deletions(-) + po/cs.po | 937 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 490 insertions(+), 447 deletions(-) commit e236dd8e2c4af71ef0310e91823e48f907876d93 Author: Daniel S. Koda @@ -2814,8 +2901,8 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 959 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 501 insertions(+), 458 deletions(-) + po/pt_BR.po | 959 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 501 insertions(+), 458 deletions(-) commit 32b28e90b8f50a2bf36c3103c529940f8ad04f95 Author: Takayuki KUSANO @@ -2823,8 +2910,8 @@ Fix Japanese translation - po/ja.po | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + po/ja.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 785d069c32ae21a16ef70a47a4b93e2d552e427f Author: Takayuki KUSANO @@ -2833,7 +2920,7 @@ Updated Japanese translation po/ja.po | 1072 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 557 insertions(+), 515 deletions(-) + 1 file changed, 557 insertions(+), 515 deletions(-) commit 3ceb573caaf7c6d42625571818c5566d93a515c1 Author: Wouter Bolsterlee @@ -2841,8 +2928,8 @@ Updated Dutch translation by Wouter Bolsterlee - po/nl.po | 964 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 503 insertions(+), 461 deletions(-) + po/nl.po | 964 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 503 insertions(+), 461 deletions(-) commit a827faddbdb9d788b1ce14b9c16b50ab5740f47a Author: Claudio Arseni @@ -2850,8 +2937,8 @@ [l10n] Updated Italian manager - po/it.po | 945 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 493 insertions(+), 452 deletions(-) + po/it.po | 945 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 493 insertions(+), 452 deletions(-) commit 73d377d365bc81e27a87e85a7317a5ab761bbe75 Author: Chao-Hsiung Liao @@ -2859,8 +2946,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 868 ++++++++++++++++++++++++++++++----------------------------- - po/zh_TW.po | 868 ++++++++++++++++++++++++++++++----------------------------- + po/zh_HK.po | 868 +++++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 868 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 890 insertions(+), 846 deletions(-) commit b0738df300763bf9120edfd38755b2b87c1a2ced @@ -2871,7 +2958,7 @@ po/LINGUAS | 1 + po/kk.po | 3524 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 3525 insertions(+), 0 deletions(-) + 2 files changed, 3525 insertions(+) commit b4c7abcb71336bad9af46affdb81598e88f0e041 Author: Kenneth Nielsen @@ -2879,8 +2966,8 @@ Updated Danish translation - po/da.po | 943 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 488 insertions(+), 455 deletions(-) + po/da.po | 943 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 488 insertions(+), 455 deletions(-) commit 37d814b56e16b25e2b5a36dfe237394b2e1b383b Author: Enrico Minack @@ -2888,17 +2975,17 @@ [release] post-release bump to 2.32.0 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit b28ce260ff85a02f9c998843ed1ec52eeb0f58fe +commit b28ce260ff85a02f9c998843ed1ec52eeb0f58fe (tag: GNOME_APPLETS_2_31_92) Author: Enrico Minack Date: Tue Sep 14 12:12:09 2010 +0200 [release] 2.31.92 - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) commit 870389805bf84c695cc6e86550abd54490d533bc Author: Ivar Smolin @@ -2906,8 +2993,8 @@ [l10n] Updated Estonian translation - po/et.po | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + po/et.po | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) commit 5e9468a6833f67f624fa10fd3f318b0e67d5b182 Author: Piotr Drąg @@ -2915,8 +3002,8 @@ Updated Polish translation - po/pl.po | 942 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 491 insertions(+), 451 deletions(-) + po/pl.po | 942 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 491 insertions(+), 451 deletions(-) commit 815bd8c6dc7dd23ceeb4ea6895858588910ec285 Author: Enrico Minack @@ -2924,8 +3011,8 @@ [invest-applet] added translator comments, fixes bug #613245 - invest-applet/data/financialchart.ui | 34 +++++++++++++++++----------------- - 1 files changed, 17 insertions(+), 17 deletions(-) + invest-applet/data/financialchart.ui | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) commit a34f92f07f1e1703f192a0c6e29a04fca68580b2 Author: Duarte Loreto @@ -2933,8 +3020,8 @@ Updated Portuguese translation - po/pt.po | 878 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 448 insertions(+), 430 deletions(-) + po/pt.po | 878 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 448 insertions(+), 430 deletions(-) commit 156b1fe7ded385ee4e80ceba68da4cf494709568 Author: Ivar Smolin @@ -2942,8 +3029,8 @@ [l10n] Updated Estonian translation - po/et.po | 44 ++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 36 insertions(+), 8 deletions(-) + po/et.po | 44 ++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 36 insertions(+), 8 deletions(-) commit ec1849b67715769396ebf88e6d9d11d1ee860336 Author: drtv @@ -2951,8 +3038,8 @@ Updated Tamil translation - po/ta.po | 880 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 453 insertions(+), 427 deletions(-) + po/ta.po | 880 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 453 insertions(+), 427 deletions(-) commit 6866a3a7226bd2cde1e39d5a8bc8f481f4ca89d4 Author: Philip Withnall @@ -2960,8 +3047,8 @@ Update British English translation - po/en_GB.po | 878 ++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 448 insertions(+), 430 deletions(-) + po/en_GB.po | 878 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 448 insertions(+), 430 deletions(-) commit 2d3ff1bd758236af6868112e23b2a4c17b56b474 Author: Michael Kotsarinis @@ -2970,7 +3057,7 @@ l10n: Updated Greek translation for gnome-applets po/el.po | 1376 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 763 insertions(+), 613 deletions(-) + 1 file changed, 763 insertions(+), 613 deletions(-) commit 96096e9eb37fe7ac76896a006f47a96be2751cf1 Author: Dirgita @@ -2979,7 +3066,7 @@ Updated Indonesian translation po/id.po | 1142 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 564 insertions(+), 578 deletions(-) + 1 file changed, 564 insertions(+), 578 deletions(-) commit 6b42bce1c2dd4a7f4283cd3726b83dd4a4cb9107 Author: Jorge González @@ -2987,8 +3074,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 41 ++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 40 insertions(+), 1 deletions(-) + invest-applet/docs/es/es.po | 41 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 40 insertions(+), 1 deletion(-) commit 96f56d8196b597413fb88522a65ac4a9f76ecd71 Author: Enrico Minack @@ -2996,17 +3083,17 @@ [release] post-release bump to 2.31.92 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit a54723c9a961247ff7b917ccb0b7609982b1fbe8 +commit a54723c9a961247ff7b917ccb0b7609982b1fbe8 (tag: GNOME_APPLETS_2_31_91) Author: Enrico Minack Date: Sun Aug 29 17:21:45 2010 +0200 [release] 2.31.91 - NEWS | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + NEWS | 9 +++++++++ + 1 file changed, 9 insertions(+) commit 8f2aa86cfd7acc7070a9a68a81344b95264dd695 Author: Jorge González @@ -3014,8 +3101,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) + invest-applet/docs/es/es.po | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) commit 853fd34fc93c864fac8576d535dbb225d813dc53 Author: Gabor Kelemen @@ -3023,8 +3110,8 @@ Updated Hungarian translation - po/hu.po | 907 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 472 insertions(+), 435 deletions(-) + po/hu.po | 907 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 472 insertions(+), 435 deletions(-) commit 404a1d843cc36966d376e50291c369d8903794eb Author: Jorge González @@ -3032,8 +3119,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 29 +++++++++++++++++++++++++---- - 1 files changed, 25 insertions(+), 4 deletions(-) + invest-applet/docs/es/es.po | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) commit 46117dc822bed724edbb5677a317c45ea0c7b4ab Author: Jorge González @@ -3041,8 +3128,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 56 +++++++++++++----------------------------- - 1 files changed, 18 insertions(+), 38 deletions(-) + invest-applet/docs/es/es.po | 56 +++++++++++++++------------------------------ + 1 file changed, 18 insertions(+), 38 deletions(-) commit 50196572158667d3cef9f35142a44ec59dc88bd1 Author: Benjamin Otte @@ -3052,8 +3139,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627490 - cpufreq/src/cpufreq-applet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + cpufreq/src/cpufreq-applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 71796cb8647c56989ed11b6aabe09a3e934d6ffb Author: Enrico Minack @@ -3061,10 +3148,10 @@ [invest-applet] fixed broken screen shot in invest manual - invest-applet/docs/C/figures/symbol-search.png | Bin 0 -> 44264 bytes - invest-applet/docs/C/invest-applet.xml | 2 +- - invest-applet/docs/Makefile.am | 2 +- - invest-applet/docs/symbol-search.png | Bin 44264 -> 0 bytes + invest-applet/docs/C/figures/symbol-search.png | Bin 0 -> 44264 bytes + invest-applet/docs/C/invest-applet.xml | 2 +- + invest-applet/docs/Makefile.am | 2 +- + invest-applet/docs/symbol-search.png | Bin 44264 -> 0 bytes 4 files changed, 2 insertions(+), 2 deletions(-) commit f2dc7f9a9e956414f6b27527ce38e3b31df26441 @@ -3073,8 +3160,8 @@ Updated Serbian translation - po/sr.po | 354 ++++++++++++++++++++++++++++++++------------------------ - po/sr@latin.po | 354 ++++++++++++++++++++++++++++++++------------------------ + po/sr.po | 354 ++++++++++++++++++++++++++++++++------------------------- + po/sr@latin.po | 354 ++++++++++++++++++++++++++++++++------------------------- 2 files changed, 402 insertions(+), 306 deletions(-) commit eb187f06a2ad4660e9e6d7f08a4332707eb4de75 @@ -3083,8 +3170,8 @@ Add dbus-glib to CFLAGS and LDADD to make this compile - cpufreq/src/Makefile.am | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + cpufreq/src/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) commit 7282e1210567a6ca2fd349ad051b7797811330a8 Author: Alexander Shopov @@ -3092,8 +3179,8 @@ Updated Bulgarian translation - po/bg.po | 872 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 449 insertions(+), 423 deletions(-) + po/bg.po | 872 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 449 insertions(+), 423 deletions(-) commit 07636f9bfcd997e14da392c63492d52eb3084000 Author: Jorge González @@ -3101,8 +3188,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 20 +++++++++++++------- - 1 files changed, 13 insertions(+), 7 deletions(-) + invest-applet/docs/es/es.po | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) commit fe5078bc1838bda8a09c382bea1aa17c5c499c9b Author: Matej Urbančič @@ -3110,8 +3197,8 @@ Updated Slovenian translation - po/sl.po | 576 +++++++++++++++++++++++++++++++++++++------------------------- - 1 files changed, 346 insertions(+), 230 deletions(-) + po/sl.po | 576 ++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 346 insertions(+), 230 deletions(-) commit 8c502322ef178dcb83338f6a972365721ab273b5 Author: Enrico Minack @@ -3119,18 +3206,18 @@ [release] post-release bump to 2.31.91 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit a46cbfb16a2050845d5b79e2700e1818a565fe6e +commit a46cbfb16a2050845d5b79e2700e1818a565fe6e (tag: GNOME_APPLETS_2_31_90_1) Author: Enrico Minack Date: Thu Aug 19 01:08:58 2010 +0200 [release] 2.31.90.1 - NEWS | 7 +++++++ - configure.in | 2 +- - 2 files changed, 8 insertions(+), 1 deletions(-) + NEWS | 7 +++++++ + configure.in | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) commit 475279a56210eda5d630fadebf38f350ca36de70 Author: Enrico Minack @@ -3143,9 +3230,9 @@ automake 1.9. Further, drivemount does not clean up one file, that was removed from the Makefile.am by mistake earlier. - autogen.sh | 2 +- - configure.in | 2 +- - drivemount/Makefile.am | 2 +- + autogen.sh | 2 +- + configure.in | 2 +- + drivemount/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit d5d6dc3810a6c2ea797cceeb621085d9fc4c9fad @@ -3154,8 +3241,8 @@ Updated French translation - invest-applet/invest/quotes.py | 1 + - po/fr.po | 309 ++++++++++++++++++++++----------------- + invest-applet/invest/quotes.py | 1 + + po/fr.po | 309 +++++++++++++++++++++++------------------ 2 files changed, 175 insertions(+), 135 deletions(-) commit d85922b23392af4af4cc4e519316745b90f4b56e @@ -3164,8 +3251,8 @@ Update POTFILES.in/.skip - po/POTFILES.in | 39 +++++++++++++-------------------------- - po/POTFILES.skip | 27 +++++++++++++-------------- + po/POTFILES.in | 39 +++++++++++++-------------------------- + po/POTFILES.skip | 27 +++++++++++++-------------- 2 files changed, 26 insertions(+), 40 deletions(-) commit b447ad6894750cf1e7fbc29a44dee6f88dd1a69b @@ -3174,9 +3261,9 @@ Added missing files - ...me.panel.applet.CPUFreqAppletFactory.service.in | 3 +++ - ...nome.panel.applet.GeyesAppletFactory.service.in | 3 +++ - 2 files changed, 6 insertions(+), 0 deletions(-) + cpufreq/org.gnome.panel.applet.CPUFreqAppletFactory.service.in | 3 +++ + geyes/org.gnome.panel.applet.GeyesAppletFactory.service.in | 3 +++ + 2 files changed, 6 insertions(+) commit 07253b902e9591ca661651081ae8d637e8a76fd3 Author: Carlos Garcia Campos @@ -3184,14 +3271,14 @@ [trashapplet] Port to new libpanel-applet API - trashapplet/GNOME_Panel_TrashApplet.server.in.in | 36 ------- - trashapplet/GNOME_Panel_TrashApplet.xml | 11 -- - trashapplet/Makefile.am | 31 +++++-- - ...rg.gnome.applets.TrashApplet.panel-applet.in.in | 16 +++ - ...nome.panel.applet.TrashAppletFactory.service.in | 3 + - trashapplet/src/Makefile.am | 9 +- - trashapplet/src/trashapplet.c | 97 +++++++++++--------- - trashapplet/trashapplet-menu.xml | 6 + + trashapplet/GNOME_Panel_TrashApplet.server.in.in | 36 -------- + trashapplet/GNOME_Panel_TrashApplet.xml | 11 --- + trashapplet/Makefile.am | 31 +++++-- + ...rg.gnome.applets.TrashApplet.panel-applet.in.in | 16 ++++ + ...nome.panel.applet.TrashAppletFactory.service.in | 3 + + trashapplet/src/Makefile.am | 9 +- + trashapplet/src/trashapplet.c | 97 ++++++++++++---------- + trashapplet/trashapplet-menu.xml | 6 ++ 8 files changed, 103 insertions(+), 106 deletions(-) commit be46000adf50329e93e7d04866024894730cb097 @@ -3200,16 +3287,16 @@ [stickynotes] Port to new libpanel-applet API - stickynotes/GNOME_StickyNotesApplet.server.in.in | 26 ------ - stickynotes/GNOME_StickyNotesApplet.xml | 15 ---- - stickynotes/Makefile.am | 38 ++++++--- - ...me.applets.StickyNotesApplet.panel-applet.in.in | 16 ++++ - ...anel.applet.StickyNotesAppletFactory.service.in | 3 + - stickynotes/stickynotes-applet-menu.xml | 10 ++ - stickynotes/stickynotes_applet.c | 88 +++++++++++++------ - stickynotes/stickynotes_applet.h | 4 +- - stickynotes/stickynotes_applet_callbacks.c | 24 +++-- - stickynotes/stickynotes_applet_callbacks.h | 16 ++-- + stickynotes/GNOME_StickyNotesApplet.server.in.in | 26 ------- + stickynotes/GNOME_StickyNotesApplet.xml | 15 ---- + stickynotes/Makefile.am | 38 ++++++---- + ...me.applets.StickyNotesApplet.panel-applet.in.in | 16 ++++ + ...anel.applet.StickyNotesAppletFactory.service.in | 3 + + stickynotes/stickynotes-applet-menu.xml | 10 +++ + stickynotes/stickynotes_applet.c | 88 +++++++++++++++------- + stickynotes/stickynotes_applet.h | 4 +- + stickynotes/stickynotes_applet_callbacks.c | 24 +++--- + stickynotes/stickynotes_applet_callbacks.h | 16 ++-- 10 files changed, 139 insertions(+), 101 deletions(-) commit 2851f906e52ab9ee3618bd2f544988ca0c68a60c @@ -3218,15 +3305,15 @@ [mixer] Port to new libpanel-applet API - mixer/GNOME_MixerApplet.server.in.in | 35 ----- - mixer/GNOME_MixerApplet.xml | 12 -- - mixer/Makefile.am | 46 ++++--- - mixer/applet.c | 140 +++++++++++--------- - mixer/applet.h | 4 + - mixer/load.c | 5 +- - mixer/mixer-applet-menu.xml | 7 + - ...rg.gnome.applets.MixerApplet.panel-applet.in.in | 16 +++ - ...nome.panel.applet.MixerAppletFactory.service.in | 3 + + mixer/GNOME_MixerApplet.server.in.in | 35 ------ + mixer/GNOME_MixerApplet.xml | 12 -- + mixer/Makefile.am | 46 ++++--- + mixer/applet.c | 140 ++++++++++++--------- + mixer/applet.h | 4 + + mixer/load.c | 5 +- + mixer/mixer-applet-menu.xml | 7 ++ + ...rg.gnome.applets.MixerApplet.panel-applet.in.in | 16 +++ + ...nome.panel.applet.MixerAppletFactory.service.in | 3 + 9 files changed, 139 insertions(+), 129 deletions(-) commit d667202cdb8429ff6abf80f86e95ba8e6cf2a2c0 @@ -3235,15 +3322,15 @@ [battstat] Port to new libpanel-applet API - battstat/GNOME_BattstatApplet.server.in.in | 36 ---------- - battstat/GNOME_BattstatApplet.xml | 12 --- - battstat/Makefile.am | 49 ++++++++----- - battstat/battstat-applet-menu.xml | 4 + - battstat/battstat.h | 3 +- - battstat/battstat_applet.c | 74 +++++++++++-------- - ...gnome.applets.BattstatApplet.panel-applet.in.in | 16 ++++ - ...e.panel.applet.BattstatAppletFactory.service.in | 3 + - battstat/properties.c | 5 +- + battstat/GNOME_BattstatApplet.server.in.in | 36 ----------- + battstat/GNOME_BattstatApplet.xml | 12 ---- + battstat/Makefile.am | 49 ++++++++------ + battstat/battstat-applet-menu.xml | 4 ++ + battstat/battstat.h | 3 +- + battstat/battstat_applet.c | 74 +++++++++++++--------- + ...gnome.applets.BattstatApplet.panel-applet.in.in | 16 +++++ + ...e.panel.applet.BattstatAppletFactory.service.in | 3 + + battstat/properties.c | 5 +- 9 files changed, 100 insertions(+), 102 deletions(-) commit 149a3570f0228503ce3ed01a79db1b6f25855e8e @@ -3252,14 +3339,14 @@ [geyes] Port to new libpanel-applet API - geyes/GNOME_GeyesApplet.server.in.in | 36 ---------- - geyes/GNOME_GeyesApplet.xml | 13 ---- - geyes/Makefile.am | 48 +++++++++----- - geyes/geyes-applet-menu.xml | 5 ++ - geyes/geyes.c | 68 ++++++++++--------- - geyes/geyes.h | 6 +- - ...rg.gnome.applets.GeyesApplet.panel-applet.in.in | 16 +++++ - geyes/themes.c | 5 +- + geyes/GNOME_GeyesApplet.server.in.in | 36 ------------ + geyes/GNOME_GeyesApplet.xml | 13 ----- + geyes/Makefile.am | 48 +++++++++------ + geyes/geyes-applet-menu.xml | 5 ++ + geyes/geyes.c | 68 ++++++++++++---------- + geyes/geyes.h | 6 +- + ...rg.gnome.applets.GeyesApplet.panel-applet.in.in | 16 +++++ + geyes/themes.c | 5 +- 8 files changed, 92 insertions(+), 105 deletions(-) commit a7c53c1b700a3ea3c18f44ad069d746c8b3351a8 @@ -3268,15 +3355,15 @@ [charpick] Port to new libpanel-applet API - charpick/GNOME_CharpickerApplet.server.in.in | 35 ---------- - charpick/GNOME_CharpickerApplet.xml | 12 ---- - charpick/Makefile.am | 48 +++++++++----- - charpick/charpick-applet-menu.xml | 4 + - charpick/charpick.c | 68 ++++++++++--------- - charpick/charpick.h | 6 +- - ...ome.applets.CharpickerApplet.panel-applet.in.in | 16 +++++ - ...panel.applet.CharpickerAppletFactory.service.in | 3 + - charpick/properties.c | 5 +- + charpick/GNOME_CharpickerApplet.server.in.in | 35 ----------- + charpick/GNOME_CharpickerApplet.xml | 12 ---- + charpick/Makefile.am | 48 +++++++++------ + charpick/charpick-applet-menu.xml | 4 ++ + charpick/charpick.c | 68 ++++++++++++---------- + charpick/charpick.h | 6 +- + ...ome.applets.CharpickerApplet.panel-applet.in.in | 16 +++++ + ...panel.applet.CharpickerAppletFactory.service.in | 3 + + charpick/properties.c | 5 +- 9 files changed, 94 insertions(+), 103 deletions(-) commit 62ab2e7d968e2186a309fa06d04b8442daf4bafd @@ -3285,15 +3372,15 @@ [multiload] Port to new libpanel-applet API - .../GNOME_MultiLoadApplet_Factory.server.in.in | 36 --------- - multiload/GNOME_MultiloadApplet.xml | 15 ---- - multiload/Makefile.am | 46 +++++++---- - multiload/global.h | 6 +- - multiload/main.c | 83 +++++++++++--------- - multiload/multiload-applet-menu.xml | 6 ++ - ...nome.applets.MultiLoadApplet.panel-applet.in.in | 16 ++++ - ....panel.applet.MultiLoadAppletFactory.service.in | 3 + - multiload/properties.c | 5 +- + .../GNOME_MultiLoadApplet_Factory.server.in.in | 36 ---------- + multiload/GNOME_MultiloadApplet.xml | 15 ---- + multiload/Makefile.am | 46 +++++++----- + multiload/global.h | 6 +- + multiload/main.c | 83 ++++++++++++---------- + multiload/multiload-applet-menu.xml | 6 ++ + ...nome.applets.MultiLoadApplet.panel-applet.in.in | 16 +++++ + ....panel.applet.MultiLoadAppletFactory.service.in | 3 + + multiload/properties.c | 5 +- 9 files changed, 104 insertions(+), 112 deletions(-) commit 57bc3f79ee5610ff4251854be35b030ece77f7d8 @@ -3302,13 +3389,13 @@ [modemlights] Port to new libpanel-applet API - modemlights/GNOME_ModemLights.server.in.in | 36 ------ - modemlights/GNOME_ModemLights.xml | 20 --- - modemlights/Makefile.am | 42 ++++-- - modemlights/modem-applet-menu.xml | 7 + - modemlights/modem-applet.c | 131 ++++++++++---------- - ...rg.gnome.applets.ModemApplet.panel-applet.in.in | 16 +++ - ...nome.panel.applet.ModemAppletFactory.service.in | 3 + + modemlights/GNOME_ModemLights.server.in.in | 36 ------ + modemlights/GNOME_ModemLights.xml | 20 ---- + modemlights/Makefile.am | 42 ++++--- + modemlights/modem-applet-menu.xml | 7 ++ + modemlights/modem-applet.c | 131 +++++++++++---------- + ...rg.gnome.applets.ModemApplet.panel-applet.in.in | 16 +++ + ...nome.panel.applet.ModemAppletFactory.service.in | 3 + 7 files changed, 122 insertions(+), 133 deletions(-) commit 96691bc4a604688d419f64bbf3e119c438d6c9f7 @@ -3317,13 +3404,13 @@ [drivemount] Port to new libpanel-applet API - drivemount/GNOME_DriveMountApplet.server.in.in | 28 ----------- - drivemount/GNOME_DriveMountApplet.xml | 10 ---- - drivemount/Makefile.am | 49 ++++++++++++------- - drivemount/drivemount-applet-menu.xml | 3 + - drivemount/drivemount.c | 51 ++++++++++++-------- - ...ome.applets.DriveMountApplet.panel-applet.in.in | 16 ++++++ - ...panel.applet.DriveMountAppletFactory.service.in | 3 + + drivemount/GNOME_DriveMountApplet.server.in.in | 28 ------------ + drivemount/GNOME_DriveMountApplet.xml | 10 ----- + drivemount/Makefile.am | 49 +++++++++++++-------- + drivemount/drivemount-applet-menu.xml | 3 ++ + drivemount/drivemount.c | 51 +++++++++++++--------- + ...ome.applets.DriveMountApplet.panel-applet.in.in | 16 +++++++ + ...panel.applet.DriveMountAppletFactory.service.in | 3 ++ 7 files changed, 83 insertions(+), 77 deletions(-) commit 9512923e49ff77b664a89ebbfe723c6e4afcdbad @@ -3332,20 +3419,20 @@ [mini-commander] Port to new libpanel-applet API - .../src/GNOME_MiniCommanderApplet.server.in.in | 35 ----------- - mini-commander/src/GNOME_MiniCommanderApplet.xml | 12 ---- - mini-commander/src/Makefile.am | 50 ++++++++++------ - mini-commander/src/about.c | 5 +- - mini-commander/src/about.h | 5 +- - mini-commander/src/help.c | 5 +- - mini-commander/src/help.h | 5 +- - mini-commander/src/mini-commander-applet-menu.xml | 4 + - mini-commander/src/mini-commander_applet.c | 62 ++++++++++--------- - mini-commander/src/mini-commander_applet.h | 1 + - ....applets.MiniCommanderApplet.panel-applet.in.in | 16 +++++ - ...el.applet.MiniCommanderAppletFactory.service.in | 3 + - mini-commander/src/preferences.c | 5 +- - mini-commander/src/preferences.h | 6 +- + .../src/GNOME_MiniCommanderApplet.server.in.in | 35 ------------ + mini-commander/src/GNOME_MiniCommanderApplet.xml | 12 ----- + mini-commander/src/Makefile.am | 50 ++++++++++------- + mini-commander/src/about.c | 5 +- + mini-commander/src/about.h | 5 +- + mini-commander/src/help.c | 5 +- + mini-commander/src/help.h | 5 +- + mini-commander/src/mini-commander-applet-menu.xml | 4 ++ + mini-commander/src/mini-commander_applet.c | 62 ++++++++++++---------- + mini-commander/src/mini-commander_applet.h | 1 + + ....applets.MiniCommanderApplet.panel-applet.in.in | 16 ++++++ + ...el.applet.MiniCommanderAppletFactory.service.in | 3 ++ + mini-commander/src/preferences.c | 5 +- + mini-commander/src/preferences.h | 6 +-- 14 files changed, 100 insertions(+), 114 deletions(-) commit 45f4cd1bbdbaae19d1455fb9f87563624ee9eea5 @@ -3354,13 +3441,13 @@ [accessx-status] Port to new libpanel-applet API - accessx-status/GNOME_AccessxApplet.xml | 13 ---- - .../GNOME_AccessxStatusApplet.server.in.in | 35 --------- - accessx-status/Makefile.am | 40 +++++++---- - accessx-status/accessx-status-applet-menu.xml | 5 ++ - accessx-status/applet.c | 77 ++++++++++---------- - ....applets.AccessxStatusApplet.panel-applet.in.in | 16 ++++ - ...el.applet.AccessxStatusAppletFactory.service.in | 3 + + accessx-status/GNOME_AccessxApplet.xml | 13 ---- + .../GNOME_AccessxStatusApplet.server.in.in | 35 ---------- + accessx-status/Makefile.am | 40 +++++++---- + accessx-status/accessx-status-applet-menu.xml | 5 ++ + accessx-status/applet.c | 77 +++++++++++----------- + ....applets.AccessxStatusApplet.panel-applet.in.in | 16 +++++ + ...el.applet.AccessxStatusAppletFactory.service.in | 3 + 7 files changed, 90 insertions(+), 99 deletions(-) commit 445b1ebba673fbc8d4943829c4607c41613cde5e @@ -3369,15 +3456,15 @@ [gweather] Port to new libpanel-applet API - gweather/GNOME_GWeatherApplet.xml | 16 ---- - gweather/GNOME_GWeatherApplet_Factory.server.in.in | 36 -------- - gweather/Makefile.am | 49 +++++++---- - gweather/gweather-applet-menu.xml | 7 ++ - gweather/gweather-applet.c | 86 +++++++++++--------- - gweather/gweather.h | 1 + - gweather/main.c | 11 +-- - ...gnome.applets.GWeatherApplet.panel-applet.in.in | 16 ++++ - ...e.panel.applet.GWeatherAppletFactory.service.in | 3 + + gweather/GNOME_GWeatherApplet.xml | 16 ---- + gweather/GNOME_GWeatherApplet_Factory.server.in.in | 36 --------- + gweather/Makefile.am | 49 +++++++----- + gweather/gweather-applet-menu.xml | 7 ++ + gweather/gweather-applet.c | 86 ++++++++++++---------- + gweather/gweather.h | 1 + + gweather/main.c | 11 ++- + ...gnome.applets.GWeatherApplet.panel-applet.in.in | 16 ++++ + ...e.panel.applet.GWeatherAppletFactory.service.in | 3 + 9 files changed, 109 insertions(+), 116 deletions(-) commit d160a23971c50ef890b7ed308174bb2556d0222c @@ -3386,13 +3473,13 @@ [cpufreq] Port to new libpanel-applet API - cpufreq/GNOME_CPUFreqApplet.server.in.in | 35 -------- - cpufreq/GNOME_CPUFreqApplet.xml | 12 --- - cpufreq/Makefile.am | 39 ++++++--- - cpufreq/cpufreq-applet-menu.xml | 4 + - ....gnome.applets.CPUFreqApplet.panel-applet.in.in | 15 +++ - cpufreq/src/Makefile.am | 7 +- - cpufreq/src/cpufreq-applet.c | 93 ++++++++++---------- + cpufreq/GNOME_CPUFreqApplet.server.in.in | 35 -------- + cpufreq/GNOME_CPUFreqApplet.xml | 12 --- + cpufreq/Makefile.am | 39 ++++++--- + cpufreq/cpufreq-applet-menu.xml | 4 + + ....gnome.applets.CPUFreqApplet.panel-applet.in.in | 15 ++++ + cpufreq/src/Makefile.am | 7 +- + cpufreq/src/cpufreq-applet.c | 93 +++++++++++----------- 7 files changed, 94 insertions(+), 111 deletions(-) commit 8183f9ff313b9dfac983a86130398b713fab84d5 @@ -3401,8 +3488,8 @@ [configure] Add libpanel-applet3 dependency - configure.in | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + configure.in | 6 ++++++ + 1 file changed, 6 insertions(+) commit b95fa8d4a07babe511cb04d38d64bac77b9d6cb6 Author: Enrico Minack @@ -3410,17 +3497,17 @@ [release] post-release bump to 2.31.91 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 2ba7bd587d408c6bc2022db5a1fb3187bea0dd2a +commit 2ba7bd587d408c6bc2022db5a1fb3187bea0dd2a (tag: GNOME_APPLETS_2_31_90) Author: Enrico Minack Date: Sun Aug 15 20:37:32 2010 +0200 [release] 2.31.90 - NEWS | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + NEWS | 9 +++++++++ + 1 file changed, 9 insertions(+) commit c89f6e1614cc8c14f990dbd33c4688586ad9f7d4 Author: A S Alam @@ -3428,8 +3515,8 @@ update translation for master - po/pa.po | 328 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 180 insertions(+), 148 deletions(-) + po/pa.po | 328 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 180 insertions(+), 148 deletions(-) commit c2a3a8ed92e1b5c807f5c5732a0e83785f10e86d Author: Andika Triwidada @@ -3437,8 +3524,8 @@ Updated Indonesian translation - po/id.po | 773 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 444 insertions(+), 329 deletions(-) + po/id.po | 773 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 444 insertions(+), 329 deletions(-) commit 55e35abc0b012df89f736e2a9e2ab43801fd0b60 Author: Torstein Adolf Winterseth @@ -3446,8 +3533,8 @@ Updated Norwegian Nynorsk translation - po/nn.po | 743 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 365 insertions(+), 378 deletions(-) + po/nn.po | 743 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 365 insertions(+), 378 deletions(-) commit c7ae85a524496e34059e7fdd90396db776fa2a06 Author: Mario Blättermann @@ -3455,8 +3542,8 @@ [i18n] Updated German doc translation - invest-applet/docs/de/de.po | 686 ++++++++++++++++++++++++++++++------------- - 1 files changed, 480 insertions(+), 206 deletions(-) + invest-applet/docs/de/de.po | 686 +++++++++++++++++++++++++++++++------------- + 1 file changed, 480 insertions(+), 206 deletions(-) commit be6601ddafe1da84dd20914b227cbad23d1455a9 Author: Daniel Nylander @@ -3464,8 +3551,8 @@ Updated Swedish translation - po/sv.po | 329 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 180 insertions(+), 149 deletions(-) + po/sv.po | 329 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 180 insertions(+), 149 deletions(-) commit 44c7f5b0419145305a295270c29bfe23171748a8 Author: Jorge González @@ -3473,8 +3560,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 51 ++++++++++++++++++++---------------------- - 1 files changed, 24 insertions(+), 27 deletions(-) + invest-applet/docs/es/es.po | 51 +++++++++++++++++++++------------------------ + 1 file changed, 24 insertions(+), 27 deletions(-) commit e9aff04645eb4fabaa29c8f62b926613478273eb Author: Kjartan Maraas @@ -3482,8 +3569,8 @@ Updated Norwegian bokmål translation - po/nb.po | 147 +++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 83 insertions(+), 64 deletions(-) + po/nb.po | 147 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 83 insertions(+), 64 deletions(-) commit a3c575602502f316951a55ea732d18bd9f91afde Author: Jorge González @@ -3491,8 +3578,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 594 ++++++++++++++++++++++++++++++++---------- - 1 files changed, 452 insertions(+), 142 deletions(-) + invest-applet/docs/es/es.po | 594 +++++++++++++++++++++++++++++++++----------- + 1 file changed, 452 insertions(+), 142 deletions(-) commit 1c824b32caf7aabb802747162a2e4e8748e9c109 Author: Enrico Minack @@ -3500,17 +3587,17 @@ [release] post-release bump to 2.31.90 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit e5bf6afd972f6f91e4032137bd6087aa6d4f854b +commit e5bf6afd972f6f91e4032137bd6087aa6d4f854b (tag: GNOME_APPLETS_2_31_6) Author: Enrico Minack Date: Mon Aug 2 21:12:00 2010 +0200 [release] 2.31.6 - NEWS | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + NEWS | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) commit 643bfae3d0ae1a94906fb1db4a36803886d250cb Author: Enrico Minack @@ -3518,8 +3605,8 @@ [invest-applet] documentation xml did not validate, fixed - invest-applet/docs/C/invest-applet.xml | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + invest-applet/docs/C/invest-applet.xml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit 21ebd82f8ed9f9c52713966a306d327b19faf679 Author: Enrico Minack @@ -3527,8 +3614,8 @@ [invest-applet] revert removal of revision section in documentation - invest-applet/docs/C/invest-applet.xml | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + invest-applet/docs/C/invest-applet.xml | 7 +++++++ + 1 file changed, 7 insertions(+) commit 8475d40a45b625a1c09a3a7dbc0419161cd2bcb8 Author: Enrico Minack @@ -3539,22 +3626,22 @@ As the applet icon, the "up" version is now used, which looks more friendly than the neutral one. - invest-applet/data/art/invest-16_down.png | Bin 784 -> 585 bytes - invest-applet/data/art/invest-16_neutral.png | Bin 746 -> 593 bytes - invest-applet/data/art/invest-16_up.png | Bin 774 -> 566 bytes - invest-applet/data/art/invest-22_down.png | Bin 1153 -> 834 bytes - invest-applet/data/art/invest-22_neutral.png | Bin 1089 -> 757 bytes - invest-applet/data/art/invest-22_up.png | Bin 1172 -> 795 bytes - invest-applet/data/art/invest-48_down.png | Bin 2463 -> 1933 bytes - invest-applet/data/art/invest-48_neutral.png | Bin 2300 -> 1608 bytes - invest-applet/data/art/invest-48_up.png | Bin 2494 -> 1864 bytes - invest-applet/data/art/invest-applet.16.png | Bin 746 -> 566 bytes - invest-applet/data/art/invest-applet.22.png | Bin 1089 -> 795 bytes - invest-applet/data/art/invest-applet.48.png | Bin 2300 -> 1864 bytes - invest-applet/data/art/invest-applet.svg | 472 ++++++++++++-------- - invest-applet/data/art/invest_down.svg | 555 ++++++++++++++++------- - invest-applet/data/art/invest_neutral.svg | 620 +++++++++++++++++++------- - invest-applet/data/art/invest_up.svg | 468 ++++++++++++-------- + invest-applet/data/art/invest-16_down.png | Bin 784 -> 585 bytes + invest-applet/data/art/invest-16_neutral.png | Bin 746 -> 593 bytes + invest-applet/data/art/invest-16_up.png | Bin 774 -> 566 bytes + invest-applet/data/art/invest-22_down.png | Bin 1153 -> 834 bytes + invest-applet/data/art/invest-22_neutral.png | Bin 1089 -> 757 bytes + invest-applet/data/art/invest-22_up.png | Bin 1172 -> 795 bytes + invest-applet/data/art/invest-48_down.png | Bin 2463 -> 1933 bytes + invest-applet/data/art/invest-48_neutral.png | Bin 2300 -> 1608 bytes + invest-applet/data/art/invest-48_up.png | Bin 2494 -> 1864 bytes + invest-applet/data/art/invest-applet.16.png | Bin 746 -> 566 bytes + invest-applet/data/art/invest-applet.22.png | Bin 1089 -> 795 bytes + invest-applet/data/art/invest-applet.48.png | Bin 2300 -> 1864 bytes + invest-applet/data/art/invest-applet.svg | 472 ++++++++++++-------- + invest-applet/data/art/invest_down.svg | 555 +++++++++++++++++------- + invest-applet/data/art/invest_neutral.svg | 620 +++++++++++++++++++-------- + invest-applet/data/art/invest_up.svg | 468 ++++++++++++-------- 16 files changed, 1424 insertions(+), 691 deletions(-) commit 990a039cd5814da7a5a903aaabc4f4cf8fb28556 @@ -3563,8 +3650,8 @@ [invest-applet] there is also the AUTHORS file, completing previous commit - AUTHORS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + AUTHORS | 1 + + 1 file changed, 1 insertion(+) commit d1edc157bb1312fba1c30dfe317079415e16d79a Author: Enrico Minack @@ -3572,8 +3659,8 @@ [invest-applet] updated authors list - MAINTAINERS | 10 +++------- - invest-applet/invest/about.py | 4 ++-- + MAINTAINERS | 10 +++------- + invest-applet/invest/about.py | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) commit c6d7510c33249735b8b5ac2e24440155baa8e833 @@ -3582,8 +3669,8 @@ [invest-applet] updated documentation, added section on new currency support - invest-applet/docs/C/invest-applet.xml | 262 +++++++++++++++++++++++--------- - invest-applet/docs/symbol-search.png | Bin 0 -> 44264 bytes + invest-applet/docs/C/invest-applet.xml | 262 +++++++++++++++++++++++---------- + invest-applet/docs/symbol-search.png | Bin 0 -> 44264 bytes 2 files changed, 187 insertions(+), 75 deletions(-) commit 0574c0cfdc82099e888a40548fb3d92901e64f12 @@ -3592,13 +3679,13 @@ [invest-applet] added help to context menu and preferences, fixes bug #563475 - invest-applet/data/Invest_Applet.xml | 1 + - invest-applet/data/prefs-dialog.ui | 17 ++++++++++++++++- - invest-applet/invest/Makefile.am | 1 + - invest-applet/invest/applet.py | 4 ++++ - invest-applet/invest/help.py | 8 ++++++++ - invest-applet/invest/invest-applet.py | 2 +- - invest-applet/invest/preferences.py | 8 +++++++- + invest-applet/data/Invest_Applet.xml | 1 + + invest-applet/data/prefs-dialog.ui | 17 ++++++++++++++++- + invest-applet/invest/Makefile.am | 1 + + invest-applet/invest/applet.py | 4 ++++ + invest-applet/invest/help.py | 8 ++++++++ + invest-applet/invest/invest-applet.py | 2 +- + invest-applet/invest/preferences.py | 8 +++++++- 7 files changed, 38 insertions(+), 3 deletions(-) commit 0eaa7fbc70dc65f6190853729efceca520a7df21 @@ -3607,8 +3694,8 @@ Updated Romanian translation - po/ro.po | 840 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 492 insertions(+), 348 deletions(-) + po/ro.po | 840 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 492 insertions(+), 348 deletions(-) commit 7280be2002d6407938aa3dea796f80334acf5983 Author: Yaron Shahrabani @@ -3616,8 +3703,8 @@ Updated Hebrew translation. - po/he.po | 135 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 79 insertions(+), 56 deletions(-) + po/he.po | 135 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 79 insertions(+), 56 deletions(-) commit c0bc1c380f7fc66580b05344f7d10d3bdb40dd77 Author: Mario Blättermann @@ -3625,8 +3712,8 @@ [i18n] Updated German translation - po/de.po | 139 +++++++++++++++++++++++++++++++++++++------------------------- - 1 files changed, 83 insertions(+), 56 deletions(-) + po/de.po | 139 ++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 83 insertions(+), 56 deletions(-) commit ee13be58f959be142c717fc6c1690a502ce1fa22 Author: Fran Diéguez @@ -3634,8 +3721,8 @@ Updated Galician translations - po/gl.po | 126 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 73 insertions(+), 53 deletions(-) + po/gl.po | 126 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 73 insertions(+), 53 deletions(-) commit 80e3fc47bd9cd6018de37b922ba2f483fa2be994 Author: Jorge González @@ -3643,8 +3730,8 @@ Updated Spanish translation - po/es.po | 160 +++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 91 insertions(+), 69 deletions(-) + po/es.po | 160 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 91 insertions(+), 69 deletions(-) commit bd893eb9bb60b8fb652c8d6696acda34d465fd40 Author: Eleanor Chen @@ -3652,8 +3739,8 @@ Update Simplified Chinese translations. - po/zh_CN.po | 550 ++++++++++++++++++++++++++++------------------------------- - 1 files changed, 257 insertions(+), 293 deletions(-) + po/zh_CN.po | 550 ++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 257 insertions(+), 293 deletions(-) commit ae5135987b604deae438f665222bb0388b33d532 Author: Matej Urbančič @@ -3661,8 +3748,8 @@ Updated Slovenian translation - po/sl.po | 134 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 78 insertions(+), 56 deletions(-) + po/sl.po | 134 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 78 insertions(+), 56 deletions(-) commit 1adb9753475b6eb2d158b848c21a2e0b6e8cd798 Author: Neil Bird @@ -3673,11 +3760,11 @@ This fix also adds a preference to control whether such hiding happens or not. Docs. not yet updated. - stickynotes/stickynotes.schemas.in | 12 +++++++ - stickynotes/stickynotes.ui | 17 ++++++++++ - stickynotes/stickynotes_applet.c | 12 ++++++- - stickynotes/stickynotes_applet.h | 1 + - stickynotes/stickynotes_applet_callbacks.c | 48 ++++++++++++++++++++++++++- + stickynotes/stickynotes.schemas.in | 12 ++++++++ + stickynotes/stickynotes.ui | 17 +++++++++++ + stickynotes/stickynotes_applet.c | 12 +++++++- + stickynotes/stickynotes_applet.h | 1 + + stickynotes/stickynotes_applet_callbacks.c | 48 ++++++++++++++++++++++++++++-- 5 files changed, 87 insertions(+), 3 deletions(-) commit 1bfffca3416580e4a11b023a3fc61d7d457b3cc0 @@ -3686,8 +3773,8 @@ Update Simplified Chinese translation. - po/zh_CN.po | 326 +++++++++++++++++++++++++++++------------------------------ - 1 files changed, 161 insertions(+), 165 deletions(-) + po/zh_CN.po | 326 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 161 insertions(+), 165 deletions(-) commit a8dc0c321f3ab1b5ea9d8de9488ecb6ed95746f7 Author: Fran Diéguez @@ -3695,8 +3782,8 @@ Fixed headers in galician translation file - po/gl.po | 65 ++++++++++++++++++++++--------------------------------------- - 1 files changed, 24 insertions(+), 41 deletions(-) + po/gl.po | 65 ++++++++++++++++++++++++---------------------------------------- + 1 file changed, 24 insertions(+), 41 deletions(-) commit 49ce0db9e48a67cc4047d201534a6a12be271d50 Author: Chao-Hsiung Liao @@ -3704,8 +3791,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 203 +++++++++++++++++++++++++++++++---------------------------- - po/zh_TW.po | 203 +++++++++++++++++++++++++++++++---------------------------- + po/zh_HK.po | 203 ++++++++++++++++++++++++++++++++---------------------------- + po/zh_TW.po | 203 ++++++++++++++++++++++++++++++++---------------------------- 2 files changed, 214 insertions(+), 192 deletions(-) commit 08c49f7ae80cbfab21f0867b18b1327df1be9241 @@ -3714,8 +3801,8 @@ Update Simplified Chinese help translation of charpick. - charpick/help/zh_CN/zh_CN.po | 279 ++++++++++++++++++++++-------------------- - 1 files changed, 144 insertions(+), 135 deletions(-) + charpick/help/zh_CN/zh_CN.po | 279 ++++++++++++++++++++++--------------------- + 1 file changed, 144 insertions(+), 135 deletions(-) commit b82dcef5173b4f504024320598f60e6d2350a6b5 Author: Teliute @@ -3723,8 +3810,8 @@ Update Simplified Chinese help translation of mixer. - mixer/docs/zh_CN/zh_CN.po | 142 +++++++++++++++++++++++---------------------- - 1 files changed, 73 insertions(+), 69 deletions(-) + mixer/docs/zh_CN/zh_CN.po | 142 ++++++++++++++++++++++++---------------------- + 1 file changed, 73 insertions(+), 69 deletions(-) commit 19b5e9f4649051157459c945daee77b192ed573f Author: Teliute @@ -3732,8 +3819,8 @@ Update Simplified Chinese translation. - invest-applet/docs/zh_CN/zh_CN.po | 181 +++++++++++++++++++------------------ - 1 files changed, 91 insertions(+), 90 deletions(-) + invest-applet/docs/zh_CN/zh_CN.po | 181 +++++++++++++++++++------------------- + 1 file changed, 91 insertions(+), 90 deletions(-) commit d8b070e49ee3e3391b606382904366d38402923e Author: Kjartan Maraas @@ -3741,8 +3828,8 @@ Updated Norwegian bokmål translation - po/nb.po | 23 ++++++++++++++++------- - 1 files changed, 16 insertions(+), 7 deletions(-) + po/nb.po | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) commit 436110c56184d02cb842f665aaf106f0fa90547c Author: Neil Bird @@ -3750,8 +3837,8 @@ [stickynotes] fix missing titlebar menu, bug #601908 - stickynotes/stickynotes.ui | 46 +++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 43 insertions(+), 3 deletions(-) + stickynotes/stickynotes.ui | 46 +++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 43 insertions(+), 3 deletions(-) commit 4cbd3f60135b4adb092948960c941ecc7858f20a Author: Mario Blättermann @@ -3759,8 +3846,8 @@ [i18n] Updated German translation - po/de.po | 265 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 135 insertions(+), 130 deletions(-) + po/de.po | 265 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 135 insertions(+), 130 deletions(-) commit fda9463bfb7d61c77a783b4e26d3465c04156857 Author: Kjartan Maraas @@ -3768,8 +3855,8 @@ Updated Norwegian bokmål translation - po/nb.po | 185 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 97 insertions(+), 88 deletions(-) + po/nb.po | 185 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 97 insertions(+), 88 deletions(-) commit 489ba1f76ac0ac76c1820f2c37368847129cde4c Author: Yaron Shahrabani @@ -3777,8 +3864,8 @@ Updated Hebrew translation. - po/he.po | 130 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 69 insertions(+), 61 deletions(-) + po/he.po | 130 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 69 insertions(+), 61 deletions(-) commit 6a06df9e8a3401480ca6c369ef1c0c72d3ceeaa7 Author: Matej Urbančič @@ -3786,8 +3873,8 @@ Updated Slovenian translation - po/sl.po | 725 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 337 insertions(+), 388 deletions(-) + po/sl.po | 725 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 337 insertions(+), 388 deletions(-) commit 00df0ed0715d67fddaee512c0012004757878f73 Author: Enrico Minack @@ -3795,18 +3882,18 @@ [release] post-release bump to 2.31.6 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 8c0c6b8a09f102a4b7f7be1db7771125c8888927 +commit 8c0c6b8a09f102a4b7f7be1db7771125c8888927 (tag: GNOME_APPLETS_2_31_5) Author: Enrico Minack Date: Sun Jul 11 22:04:32 2010 +0200 [release] 2.31.5 - NEWS | 27 +++++++++++++++++++++++++++ - configure.in | 2 +- - 2 files changed, 28 insertions(+), 1 deletions(-) + NEWS | 27 +++++++++++++++++++++++++++ + configure.in | 2 +- + 2 files changed, 28 insertions(+), 1 deletion(-) commit 66d73cb83a59323984930fb775d6d77c537629da Author: Callum McKenzie @@ -3814,9 +3901,9 @@ Add Enrico Minack to the maintainers list - MAINTAINERS | 3 +++ - gnome-applets.doap | 7 +++++++ - 2 files changed, 10 insertions(+), 0 deletions(-) + MAINTAINERS | 3 +++ + gnome-applets.doap | 7 +++++++ + 2 files changed, 10 insertions(+) commit 20513a11b489887ab85c69077d08d503d7ab4a35 Author: Enrico Minack @@ -3828,8 +3915,8 @@ already sets a default image, which is therefore already used for the preferences dialog. - invest-applet/invest/preferences.py | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) + invest-applet/invest/preferences.py | 7 ------- + 1 file changed, 7 deletions(-) commit b6917ed19d8d05ddb0ad09d77b77ff2091b2de1b Author: Fran Diéguez @@ -3837,9 +3924,9 @@ Added galician translations for help - accessx-status/docs/Makefile.am | 2 +- - accessx-status/docs/gl/gl.po | 435 +++++++++++++++++++++++++++++++++++++++ - 2 files changed, 436 insertions(+), 1 deletions(-) + accessx-status/docs/Makefile.am | 2 +- + accessx-status/docs/gl/gl.po | 435 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 436 insertions(+), 1 deletion(-) commit 168224040a2709ce350401cbbbfc4f2a5f795565 Author: Enrico Minack @@ -3847,8 +3934,8 @@ [invest-applet] added missing currencies.py file, completing commit 3a8c4d40... - invest-applet/invest/currencies.py | 145 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 145 insertions(+), 0 deletions(-) + invest-applet/invest/currencies.py | 145 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 145 insertions(+) commit 8fa5fe122cc6c552bb8580f1199d414cb5d17b61 Author: Fran Diéguez @@ -3856,8 +3943,8 @@ Updated Galician translations - po/gl.po | 184 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 96 insertions(+), 88 deletions(-) + po/gl.po | 184 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 96 insertions(+), 88 deletions(-) commit 9e8a17b086238f3572f91c624008a5e87be69999 Author: Enrico Minack @@ -3865,8 +3952,8 @@ [invest-applet] fixed help file seriesid clash, yelp finds the manual now, see bug #599728 - invest-applet/docs/invest-applet.omf.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + invest-applet/docs/invest-applet.omf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2ad2a78421fb82ac7ac8b08308863eca913b4789 Author: Jorge González @@ -3874,8 +3961,8 @@ Updated Spanish translation - po/es.po | 50 +++++++++++++++++++++++++++++--------------------- - 1 files changed, 29 insertions(+), 21 deletions(-) + po/es.po | 50 +++++++++++++++++++++++++++++--------------------- + 1 file changed, 29 insertions(+), 21 deletions(-) commit 3a8c4d4034c6c09f7c39d5943f37824da0919edb Author: Enrico Minack @@ -3886,12 +3973,12 @@ Currencies of stocks are show in the applet. A target currency can be given in preferences so that all currencies are automatically converted to that one. - invest-applet/data/prefs-dialog.ui | 35 +++++ - invest-applet/invest/Makefile.am | 1 + - invest-applet/invest/__init__.py | 51 ++++++- - invest-applet/invest/preferences.py | 245 +++++++++++++++++++++++++++-------- - invest-applet/invest/quotes.py | 205 +++++++++++++++++++++++++---- - invest-applet/invest/widgets.py | 12 +- + invest-applet/data/prefs-dialog.ui | 35 ++++++ + invest-applet/invest/Makefile.am | 1 + + invest-applet/invest/__init__.py | 51 ++++++-- + invest-applet/invest/preferences.py | 245 ++++++++++++++++++++++++++++-------- + invest-applet/invest/quotes.py | 205 +++++++++++++++++++++++++----- + invest-applet/invest/widgets.py | 12 +- 6 files changed, 453 insertions(+), 96 deletions(-) commit 836de671d6ab3962e6ef3caa3c77177fbb12da48 @@ -3901,7 +3988,7 @@ Updated Slovenian translation po/sl.po | 7307 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 3672 insertions(+), 3635 deletions(-) + 1 file changed, 3672 insertions(+), 3635 deletions(-) commit 6121f5b9a6438bfde3e0da3a9920827d3a75344b Author: Enrico Minack @@ -3913,8 +4000,8 @@ the invest applet to crash. This fix makes the applet wait some seconds and retry, in case GConfd will be available soon. - invest-applet/invest/__init__.py | 65 ++++++++++++++++++++++++++----------- - 1 files changed, 45 insertions(+), 20 deletions(-) + invest-applet/invest/__init__.py | 65 +++++++++++++++++++++++++++------------- + 1 file changed, 45 insertions(+), 20 deletions(-) commit df51669c1dfee18cc1a487b1240f862083bdac38 Author: Jorge González @@ -3922,8 +4009,8 @@ Updated Spanish translation - po/es.po | 168 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 85 insertions(+), 83 deletions(-) + po/es.po | 168 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 85 insertions(+), 83 deletions(-) commit 46f711745a9df31e6c044e01b690d7cd71cd5023 Author: Enrico Minack @@ -3931,9 +4018,9 @@ [invest-applet] numbers are parsed and formated using user's locale, fixes bug #608059 - invest-applet/invest/preferences.py | 20 +++++++++++----- - invest-applet/invest/quotes.py | 15 +++++++++-- - invest-applet/invest/widgets.py | 43 ++++++++++++++++++++++++---------- + invest-applet/invest/preferences.py | 20 +++++++++++------ + invest-applet/invest/quotes.py | 15 ++++++++++--- + invest-applet/invest/widgets.py | 43 ++++++++++++++++++++++++++----------- 3 files changed, 56 insertions(+), 22 deletions(-) commit 54b4e7ee82c4412351993d4880b2b1974c0b3dbc @@ -3946,8 +4033,8 @@ in the preferences, the configured cents were shown rounded to full cents. This caused confusion, so cents are now shown with at least two digits. - invest-applet/invest/preferences.py | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) + invest-applet/invest/preferences.py | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) commit 870b26c3854f7cdeb37c49d54a88b988242d4b36 Author: Enrico Minack @@ -3955,8 +4042,8 @@ [invest-applet] improves visibility of numbers in selected row, see bug #508419 - invest-applet/invest/widgets.py | 26 ++++++++++++++++++-------- - 1 files changed, 18 insertions(+), 8 deletions(-) + invest-applet/invest/widgets.py | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) commit e92b28f64a2c2b011c47ee60ec6944bc9df28ab4 Author: Aleksander Morgado @@ -3964,8 +4051,8 @@ drivemount: minor style fix - drivemount/drive-list.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + drivemount/drive-list.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit ba9964ff1760da59a9ce6b95009493e347515592 Author: Callum McKenzie @@ -3976,8 +4063,8 @@ Patch from Max Ulidtko to fix this (and other minor issues). See bug 617992. - multiload/load-graph.c | 37 ++++++++++++++++++++++++++++++++----- - multiload/main.c | 40 ---------------------------------------- + multiload/load-graph.c | 37 ++++++++++++++++++++++++++++++++----- + multiload/main.c | 40 ---------------------------------------- 2 files changed, 32 insertions(+), 45 deletions(-) commit e4499d78f05c91cc70fa40039181ae0312d0cec8 @@ -3986,8 +4073,8 @@ Add Esperanto translation - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit dffa31da4c55ed7d02707cb9c0375565ec29b35d Author: Kristjan Schmidt @@ -3996,7 +4083,7 @@ Add Esperanto translation po/eo.po | 3594 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 3594 insertions(+), 0 deletions(-) + 1 file changed, 3594 insertions(+) commit 4bc831b13992342871984d68c048ce26b5b077d3 Author: Callum McKenzie @@ -4004,8 +4091,8 @@ Add a comment to explain the apparently unecessary change made at the last commit - mixer/applet.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + mixer/applet.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit 2d369bbd7a21d2054078ead3ffdc07bf0d3a0af0 Author: Callum McKenzie @@ -4013,8 +4100,8 @@ Compile it before you commit - mixer/applet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + mixer/applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e542914564d5b34747b0c92de1b232fb34c16254 Author: Callum McKenzie @@ -4026,8 +4113,8 @@ it should be reset to NULL because you never know whe init_pixbufs is called recursively. - mixer/applet.c | 59 ++++++++++++++++++++++++++++--------------------------- - 1 files changed, 30 insertions(+), 29 deletions(-) + mixer/applet.c | 59 +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 30 insertions(+), 29 deletions(-) commit 31c4c93f34d9843628809aa9104db971a072a8c3 Author: Yaron Shahrabani @@ -4035,8 +4122,8 @@ Updated Hebrew translation - po/he.po | 218 ++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 100 insertions(+), 118 deletions(-) + po/he.po | 218 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 100 insertions(+), 118 deletions(-) commit 53087f781fe487e1d9c6002c3dfb41092ee8bac5 Author: Timo Jyrinki @@ -4044,8 +4131,8 @@ Updated Finnish help translation of invest applet by Jukka Heikkilä. - invest-applet/docs/fi/fi.po | 478 +++++++++++++++++++++++++++++------------- - 1 files changed, 330 insertions(+), 148 deletions(-) + invest-applet/docs/fi/fi.po | 478 ++++++++++++++++++++++++++++++-------------- + 1 file changed, 330 insertions(+), 148 deletions(-) commit 6591025b7adc00380565b6a2a2cc52ca6ab2ec0a Author: Timo Jyrinki @@ -4053,8 +4140,8 @@ Updated Finnish help translation by Jukka Heikkilä. - charpick/help/fi/fi.po | 573 +++++++++++++++++++++++++++++++++--------------- - 1 files changed, 397 insertions(+), 176 deletions(-) + charpick/help/fi/fi.po | 573 ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 397 insertions(+), 176 deletions(-) commit 0e97da8ea220bc867c783e76142300a9c26170aa Author: Gil Forcada @@ -4062,8 +4149,8 @@ Minor fixes to Catalan translation - po/ca.po | 86 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 43 insertions(+), 43 deletions(-) + po/ca.po | 86 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 43 insertions(+), 43 deletions(-) commit b23b248025fd8a38c0876b569a8bd34d400acd98 Author: Thomas Thurman @@ -4071,8 +4158,8 @@ Update Shavian translation - po/en@shaw.po | 164 +++++++++++++++++++++++--------------------------------- - 1 files changed, 67 insertions(+), 97 deletions(-) + po/en@shaw.po | 164 ++++++++++++++++++++++++---------------------------------- + 1 file changed, 67 insertions(+), 97 deletions(-) commit a88fba97a81b093d5d652fb9cc83be7fdf73d134 Author: Thomas Thurman @@ -4081,7 +4168,7 @@ Updated Shavian transliteration po/en@shaw.po | 1377 ++++++++++++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 1164 insertions(+), 213 deletions(-) + 1 file changed, 1164 insertions(+), 213 deletions(-) commit eb26556bf238a064d60a8f4265840499f87ea17d Author: Manoj Kumar Giri @@ -4089,8 +4176,8 @@ Updated Oriya Translation - po/or.po | 487 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 235 insertions(+), 252 deletions(-) + po/or.po | 487 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 235 insertions(+), 252 deletions(-) commit 2db482f30cdc84f40b916f044338209d1e0b5dd3 Author: Mattias Põldaru @@ -4098,8 +4185,8 @@ Estonian translation updated - po/et.po | 76 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 38 insertions(+), 38 deletions(-) + po/et.po | 76 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 38 insertions(+), 38 deletions(-) commit 383fae184e9afc84df7bd75d8baa602a94b7bc2a Author: Norayr Chilingaryan @@ -4108,7 +4195,7 @@ Updated Armenian translation. po/hy.po | 4667 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 2203 insertions(+), 2464 deletions(-) + 1 file changed, 2203 insertions(+), 2464 deletions(-) commit 169b8f99e370f1577593ef5071c33d8ec641f4ee Author: Enrico Minack @@ -4120,9 +4207,9 @@ Signed-off-by: Javier Jardón - invest-applet/invest/about.py | 3 --- - invest-applet/invest/invest-applet.py | 2 -- - 2 files changed, 0 insertions(+), 5 deletions(-) + invest-applet/invest/about.py | 3 --- + invest-applet/invest/invest-applet.py | 2 -- + 2 files changed, 5 deletions(-) commit 88daf9813d0a2981869636637c826749c9cbb148 Author: Gheyret Kenji @@ -4130,8 +4217,8 @@ Added UG translation - po/LINGUAS | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + po/LINGUAS | 1 - + 1 file changed, 1 deletion(-) commit 7c0a6de5691fada0b1298425d1cbad82b4fe7488 Author: Gheyret Kenji @@ -4139,8 +4226,8 @@ Added UG translation - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit 8c1ce33f30a5c320e6087d65667217d185014844 Author: Gheyret Kenji @@ -4148,8 +4235,8 @@ Added UG translation - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit d3d4bcca8b038306f828f4b561dddaed8639443c Author: Peteris Krisjanis @@ -4158,7 +4245,7 @@ Updated Latvian translation. po/lv.po | 1946 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 1064 insertions(+), 882 deletions(-) + 1 file changed, 1064 insertions(+), 882 deletions(-) commit 20e038c79f8557612eab3ea3edbaf23ec9390654 Author: Andre Klapper @@ -4166,8 +4253,8 @@ Store GtkWidget * window in a variable as it's called multiple times - accessx-status/applet.c | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) + accessx-status/applet.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) commit 1614274fcb96ed6d135c65ea3f52c9f58ea9805d Author: Andre Klapper @@ -4176,10 +4263,10 @@ Bump gtk+ requirement to 2.20. Also removes the previous gtk version checks. - accessx-status/applet.c | 9 +-------- - configure.in | 2 +- - drivemount/drive-button.c | 7 ------- - geyes/geyes.c | 4 ---- + accessx-status/applet.c | 9 +-------- + configure.in | 2 +- + drivemount/drive-button.c | 7 ------- + geyes/geyes.c | 4 ---- 4 files changed, 2 insertions(+), 20 deletions(-) commit 8f7a55f70bf8744d4f0d1bbb5a67c24a680315a5 @@ -4188,8 +4275,8 @@ Remove unneeded GTK_CHECK_VERSION for 2.18 - charpick/charpick.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) + charpick/charpick.c | 4 ---- + 1 file changed, 4 deletions(-) commit d596fcf9846bb31823671ae83207ae796685e93d Author: Andre Klapper @@ -4197,25 +4284,25 @@ Compile with -DGSEAL_ENABLE. Fixes bug 612473. Bumps gtk+ requirement to 2.18. - accessx-status/applet.c | 38 ++++++++++----- - battstat/battstat_applet.c | 12 ++-- - configure.in | 2 +- - cpufreq/src/cpufreq-applet.c | 22 +++++--- - cpufreq/src/cpufreq-popup.c | 4 +- - drivemount/drive-button.c | 25 +++++++--- - geyes/geyes.c | 14 ++++-- - gweather/gweather-dialog.c | 4 +- - gweather/gweather-pref.c | 2 +- - mixer/applet.c | 72 +++++++++++++++------------- - mixer/dock.c | 10 ++-- - mixer/preferences.c | 4 +- - multiload/load-graph.c | 38 ++++++++------ - multiload/properties.c | 4 +- - stickynotes/stickynotes_applet.c | 6 ++- - stickynotes/stickynotes_applet_callbacks.c | 4 +- - trashapplet/src/trash-empty.c | 2 +- - trashapplet/src/trashapplet.c | 2 +- - trashapplet/src/xstuff.c | 16 ++++--- + accessx-status/applet.c | 38 +++++++++++----- + battstat/battstat_applet.c | 12 ++--- + configure.in | 2 +- + cpufreq/src/cpufreq-applet.c | 22 +++++---- + cpufreq/src/cpufreq-popup.c | 4 +- + drivemount/drive-button.c | 25 ++++++++--- + geyes/geyes.c | 14 ++++-- + gweather/gweather-dialog.c | 4 +- + gweather/gweather-pref.c | 2 +- + mixer/applet.c | 72 ++++++++++++++++-------------- + mixer/dock.c | 10 ++--- + mixer/preferences.c | 4 +- + multiload/load-graph.c | 38 +++++++++------- + multiload/properties.c | 4 +- + stickynotes/stickynotes_applet.c | 6 ++- + stickynotes/stickynotes_applet_callbacks.c | 4 +- + trashapplet/src/trash-empty.c | 2 +- + trashapplet/src/trashapplet.c | 2 +- + trashapplet/src/xstuff.c | 16 ++++--- 19 files changed, 166 insertions(+), 115 deletions(-) commit b4fdf2c7deee1aee18e34f7344cc2e59a9001e89 @@ -4224,8 +4311,8 @@ Updated Kannada translations - po/kn.po | 371 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 182 insertions(+), 189 deletions(-) + po/kn.po | 371 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 182 insertions(+), 189 deletions(-) commit 71b929214721af767037f3828f311beab9b40481 Author: Carles Ferrando @@ -4234,7 +4321,7 @@ Updated Catalan (Valencian) translation po/ca@valencia.po | 5708 ++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 5443 insertions(+), 265 deletions(-) + 1 file changed, 5443 insertions(+), 265 deletions(-) commit cf3576284ba560d7c9c4f6876d11fb6e5dc644f6 Author: Andre Klapper @@ -4242,8 +4329,8 @@ Some small fixes for compiling with -DGSEAL_ENABLE. - drivemount/drive-button.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + drivemount/drive-button.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) commit 88886209b9722ee7f526ad546f6141174f4f2a82 Author: Reşat SABIQ @@ -4251,8 +4338,8 @@ Minor update for Crimean Tatar/Turkish translation - po/crh.po | 60 +++++++++++++++++++++--------------------------------------- - 1 files changed, 21 insertions(+), 39 deletions(-) + po/crh.po | 60 +++++++++++++++++++++--------------------------------------- + 1 file changed, 21 insertions(+), 39 deletions(-) commit a601442522799c71997d2f9fdc1bab7de3cbf726 Author: Yannig Marchegay @@ -4260,8 +4347,8 @@ Occitan translation update - po/oc.po | 84 ++++++++++++++++++++----------------------------------------- - 1 files changed, 28 insertions(+), 56 deletions(-) + po/oc.po | 84 ++++++++++++++++++++++------------------------------------------ + 1 file changed, 28 insertions(+), 56 deletions(-) commit f4bc24847a0516e1e064a22e69723265589259f2 Author: Yannig Marchegay @@ -4270,7 +4357,7 @@ Occitan translation update po/oc.po | 1953 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 1132 insertions(+), 821 deletions(-) + 1 file changed, 1132 insertions(+), 821 deletions(-) commit cab5c2435b1d12a5484013cfda3a9be513317683 Author: Andika Triwidada @@ -4279,7 +4366,7 @@ Updated Indonesian translation po/id.po | 3882 +++++++------------------------------------------------------- - 1 files changed, 425 insertions(+), 3457 deletions(-) + 1 file changed, 425 insertions(+), 3457 deletions(-) commit 94b7258892e0c2dcb05b743ad7e4e7fd963c1e58 Author: Andre Klapper @@ -4287,8 +4374,8 @@ Some small fixes for compiling with -DGSEAL_ENABLE. - trashapplet/src/trashapplet.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + trashapplet/src/trashapplet.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 7a3ce62d18c7a744d7a1d30637e929752747d824 Author: Andre Klapper @@ -4296,9 +4383,9 @@ Some small fixes for compiling with -DGSEAL_ENABLE. - stickynotes/stickynotes.c | 4 ++-- - stickynotes/stickynotes_applet.c | 2 +- - stickynotes/util.c | 4 ++-- + stickynotes/stickynotes.c | 4 ++-- + stickynotes/stickynotes_applet.c | 2 +- + stickynotes/util.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) commit 45af3864bb983fcdfdc7af665c505a7377f3143a @@ -4307,8 +4394,8 @@ Two small fixes for compiling with -DGSEAL_ENABLE. - geyes/themes.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + geyes/themes.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 351214943bb954b3300f8bca581ee635e63adaae Author: Theppitak Karoonboonyanan @@ -4316,8 +4403,8 @@ Updated Thai translation. - po/th.po | 53 ++++++++++++++++++++++++++++------------------------- - 1 files changed, 28 insertions(+), 25 deletions(-) + po/th.po | 53 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 28 insertions(+), 25 deletions(-) commit 57fa3cc55269b2ed0df2c3c6ad4aad7f84fe42e1 Author: Andre Klapper @@ -4325,8 +4412,8 @@ Fix my stupid mistake in the last commit - charpick/charpick.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + charpick/charpick.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 551d6dd3e388a0d8ab49fda35cac5eb5db54b528 Author: Andre Klapper @@ -4334,9 +4421,9 @@ Make charpick compile with -DGSEAL_ENABLE and bump GTK+ to 2.14.0. See bug 612473. - charpick/charpick.c | 10 +++++++--- - charpick/properties.c | 8 ++++---- - configure.in | 2 +- + charpick/charpick.c | 10 +++++++--- + charpick/properties.c | 8 ++++---- + configure.in | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) commit b9c701ba845825f072aabb1fc7291a6ec5450673 @@ -4345,8 +4432,8 @@ Fixes to Catalan translation - po/ca.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + po/ca.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit 555479672e472b40941515ab91584f762a18f784 Author: Wouter Bolsterlee @@ -4355,7 +4442,7 @@ Dutch translation updated by Wouter Bolsterlee po/nl.po | 3831 ++++++-------------------------------------------------------- - 1 files changed, 352 insertions(+), 3479 deletions(-) + 1 file changed, 352 insertions(+), 3479 deletions(-) commit b423f70bae529ec97f51c53c3aef5b97cad9f800 Author: Nicky Thomassen @@ -4363,8 +4450,8 @@ Added Danish translation of documentation - drivemount/help/da/da.po | 500 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 500 insertions(+), 0 deletions(-) + drivemount/help/da/da.po | 500 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 500 insertions(+) commit aea9e608699685760db12aa8df36c7cfe05f995c Author: Kenneth Nielsen @@ -4372,8 +4459,8 @@ Added da to list of languages - drivemount/help/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + drivemount/help/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 00c00af59ef5192b4771c6b1128cd527597e3065 Author: Gheyret Kenji @@ -4381,8 +4468,8 @@ Added UG translation - po/ug.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/ug.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit be8f56ceb7c781266f63269132b149c941e7392f Author: Gheyret Kenji @@ -4391,7 +4478,7 @@ Added UG translation po/ug.po | 3509 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 3509 insertions(+), 0 deletions(-) + 1 file changed, 3509 insertions(+) commit c68595189c4421ad336b6d08c0799cb39e9c5d6d Author: Kostas Papadimas @@ -4399,17 +4486,17 @@ Updated Greek translation - po/el.po | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + po/el.po | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) -commit 3bb78796e9280529799126353d6ef49697240212 +commit 3bb78796e9280529799126353d6ef49697240212 (tag: GNOME_APPLETS_2_30_0) Author: Ryan Lortie Date: Sun Mar 28 01:49:18 2010 -0500 [release] post-release bump to 2.30.1 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 286c749487567ea50657df6227823ce057092f45 Author: Ryan Lortie @@ -4417,9 +4504,9 @@ [release] 2.30.0 - NEWS | 25 +++++++++++++++++++++++++ - configure.in | 2 +- - 2 files changed, 26 insertions(+), 1 deletions(-) + NEWS | 25 +++++++++++++++++++++++++ + configure.in | 2 +- + 2 files changed, 26 insertions(+), 1 deletion(-) commit e9fcde49ff7b6b04f03df5c229d12c74229d6b01 Author: Ryan Lortie @@ -4429,10 +4516,10 @@ This is needed to pass make check - geyes/docs/zh_HK/geyes.xml | 3 ++- - geyes/docs/zh_TW/geyes.xml | 3 ++- - stickynotes/docs/zh_HK/stickynotes_applet.xml | 3 ++- - stickynotes/docs/zh_TW/stickynotes_applet.xml | 3 ++- + geyes/docs/zh_HK/geyes.xml | 3 ++- + geyes/docs/zh_TW/geyes.xml | 3 ++- + stickynotes/docs/zh_HK/stickynotes_applet.xml | 3 ++- + stickynotes/docs/zh_TW/stickynotes_applet.xml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) commit 7c6fb367b47af88befd110659b946e9952f0b157 @@ -4441,8 +4528,8 @@ remove trailing space after \ in Makefile - drivemount/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + drivemount/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit fdf4965e199f53f76e7cae940cd8645d7db09c0e Author: Reşat SABIQ @@ -4450,8 +4537,8 @@ Updated Crimean Tatar (Crimean Turkish) translation - po/crh.po | 37 ++++++++++++++++++++----------------- - 1 files changed, 20 insertions(+), 17 deletions(-) + po/crh.po | 37 ++++++++++++++++++++----------------- + 1 file changed, 20 insertions(+), 17 deletions(-) commit 729d5dd11a723f26b1ad9a05ddd0782d6bcfdb5d Author: Inaki Larranaga Murgoitio @@ -4459,8 +4546,8 @@ Updated Basque language - po/eu.po | 28 ++++++++++++++++++++-------- - 1 files changed, 20 insertions(+), 8 deletions(-) + po/eu.po | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) commit 77e5ffabe18a13833106b3850a55e7dbb5770147 Author: Kostas Papadimas @@ -4468,8 +4555,8 @@ Updated Greek translation - po/el.po | 36 ++++++------------------------------ - 1 files changed, 6 insertions(+), 30 deletions(-) + po/el.po | 36 ++++++------------------------------ + 1 file changed, 6 insertions(+), 30 deletions(-) commit 97281a3e76ae72729952542248d6f19e77690736 Author: Ask H. Larsen @@ -4477,8 +4564,8 @@ Updated Danish translation - po/da.po | 324 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 166 insertions(+), 158 deletions(-) + po/da.po | 324 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 166 insertions(+), 158 deletions(-) commit f619f0d486ce03d0f12f329a508c83a16179a293 Author: Jamil Ahmed @@ -4486,8 +4573,8 @@ Updated Bengali translation - po/bn.po | 450 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 230 insertions(+), 220 deletions(-) + po/bn.po | 450 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 230 insertions(+), 220 deletions(-) commit d14c53b832eaf28b8f25e2cb9ea72eb9fca391e4 Author: Nikos Bakaoukas @@ -4495,8 +4582,8 @@ Updated Greek translation for gnome-applets - po/el.po | 178 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 88 insertions(+), 90 deletions(-) + po/el.po | 178 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 88 insertions(+), 90 deletions(-) commit 2d0b98df8fd0751c23afa28351672e8510ecf3ea Author: Kevin-Wei-2 @@ -4504,14 +4591,14 @@ Updated Traditional Chinese translation (Hong Kong and Taiwan) - geyes/docs/Makefile.am | 2 +- - geyes/docs/zh_HK/zh_HK.po | 314 +++++++++++++++++ - geyes/docs/zh_TW/zh_TW.po | 351 +++++++++++++++++++ - po/zh_HK.po | 33 +- - po/zh_TW.po | 33 +- - stickynotes/docs/Makefile.am | 2 +- - stickynotes/docs/zh_HK/zh_HK.po | 677 ++++++++++++++++++++++++++++++++++++ - stickynotes/docs/zh_TW/zh_TW.po | 725 +++++++++++++++++++++++++++++++++++++++ + geyes/docs/Makefile.am | 2 +- + geyes/docs/zh_HK/zh_HK.po | 314 +++++++++++++++++ + geyes/docs/zh_TW/zh_TW.po | 351 +++++++++++++++++++ + po/zh_HK.po | 33 +- + po/zh_TW.po | 33 +- + stickynotes/docs/Makefile.am | 2 +- + stickynotes/docs/zh_HK/zh_HK.po | 677 +++++++++++++++++++++++++++++++++++++ + stickynotes/docs/zh_TW/zh_TW.po | 725 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 2105 insertions(+), 32 deletions(-) commit 9b5c6c19c1f7877d6fc0e5b5a53f78bf5f1c95be @@ -4520,8 +4607,8 @@ Updated Norwegian bokmål translation - po/nb.po | 117 ++++++++++++++++++------------------------------------------- - 1 files changed, 35 insertions(+), 82 deletions(-) + po/nb.po | 117 +++++++++++++++++++-------------------------------------------- + 1 file changed, 35 insertions(+), 82 deletions(-) commit 2e1563f18a3b84c5405bc13f8cea3fee394a041a Author: Žygimantas Beručka @@ -4529,8 +4616,8 @@ Updated Lithuanian translation. - po/lt.po | 332 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 172 insertions(+), 160 deletions(-) + po/lt.po | 332 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 172 insertions(+), 160 deletions(-) commit 7c39a4f432d099efb4c650fec28d80955a2e4995 Author: Marios Zindilis @@ -4538,8 +4625,8 @@ Updated Greek translation for gnome-applets invest documentation - invest-applet/docs/el/el.po | 182 +++++++++++++++++++++++------------------- - 1 files changed, 100 insertions(+), 82 deletions(-) + invest-applet/docs/el/el.po | 182 ++++++++++++++++++++++++-------------------- + 1 file changed, 100 insertions(+), 82 deletions(-) commit b91e33e93aa8cbe8ab2868d456bf5c17f5dd173b Author: Maxim V. Dziumanenko @@ -4547,8 +4634,8 @@ Updated Ukrainian translation - po/uk.po | 53 ++++++++++++++++++++++++++++------------------------- - 1 files changed, 28 insertions(+), 25 deletions(-) + po/uk.po | 53 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 28 insertions(+), 25 deletions(-) commit 66f35442d8a73654c44d8fe9d277be58c0a78f6c Author: Christian Kirbach @@ -4556,8 +4643,8 @@ Updated German translation - invest-applet/docs/de/de.po | 284 ++++++++++++++++++++++++------------------- - 1 files changed, 157 insertions(+), 127 deletions(-) + invest-applet/docs/de/de.po | 284 ++++++++++++++++++++++++-------------------- + 1 file changed, 157 insertions(+), 127 deletions(-) commit 739b5deae469885d1bd605a60569da61ca69e7ea Author: Antonio Fernandes C. Neto @@ -4565,8 +4652,8 @@ Updated Brazilian Portuguese translations. - po/pt_BR.po | 29 +++++++++++++++++++---------- - 1 files changed, 19 insertions(+), 10 deletions(-) + po/pt_BR.po | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) commit 26c36e06548ac05e022f031dbc680874cd865768 Author: Fran Diéguez @@ -4574,8 +4661,8 @@ Updated Galician translation - po/gl.po | 40 ++++++++++++++++++++++------------------ - 1 files changed, 22 insertions(+), 18 deletions(-) + po/gl.po | 40 ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) commit 826fd1739ce53ae19828d8d3a196ea64bcb12819 Author: Miloš Popović @@ -4583,8 +4670,8 @@ Updated Serbian translations - po/sr.po | 331 +++++++++++++++++++++++++++++--------------------------- - po/sr@latin.po | 331 +++++++++++++++++++++++++++++--------------------------- + po/sr.po | 331 +++++++++++++++++++++++++++++---------------------------- + po/sr@latin.po | 331 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 340 insertions(+), 322 deletions(-) commit 5941eb405f030af273ab22342d95392f6b95b025 @@ -4593,8 +4680,8 @@ Updated Basque language - po/eu.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + po/eu.po | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit 1dfc0c0d5b9c841607077a47e94988fdf61877a0 Author: Tommi Vainikainen @@ -4602,8 +4689,8 @@ Updated Finnish translation - po/fi.po | 33 ++++++++++++++++++--------------- - 1 files changed, 18 insertions(+), 15 deletions(-) + po/fi.po | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) commit 10837a5958c7868348f8e2471cd944a853ed7b6b Author: Adi Roiban @@ -4611,8 +4698,8 @@ Update Romanian translation - po/ro.po | 126 +++++++++++++++++++++++++------------------------------------- - 1 files changed, 51 insertions(+), 75 deletions(-) + po/ro.po | 126 ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 51 insertions(+), 75 deletions(-) commit 7189cdc0ba58d1cb2ee0867198ca5b554172b8b6 Author: Piotr Drąg @@ -4620,8 +4707,8 @@ Updated Polish translation - po/pl.po | 74 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 43 insertions(+), 31 deletions(-) + po/pl.po | 74 +++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 43 insertions(+), 31 deletions(-) commit 4913ca9e25d0b147935ebf3643eb21ee4d8d4127 Author: Ivar Smolin @@ -4629,8 +4716,8 @@ Estonian translation updated - po/et.po | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/et.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 487536a1d13fb34f50cada718e8fe091de333850 Author: Jorge González @@ -4639,7 +4726,7 @@ Updated Spanish translation po/es_ES.po | 1338 ++++++++++++++++++----------------------------------------- - 1 files changed, 396 insertions(+), 942 deletions(-) + 1 file changed, 396 insertions(+), 942 deletions(-) commit 36083f168f019ca2961c5bb86158af1a0b5d436d Author: Jorge González @@ -4647,8 +4734,8 @@ Updated Spanish translation - po/es.po | 224 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 104 insertions(+), 120 deletions(-) + po/es.po | 224 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 104 insertions(+), 120 deletions(-) commit 0d11c74ad8cae284c15bd5ceb86656b19347670a Author: A S Alam @@ -4656,8 +4743,8 @@ update Punjabi Translation - po/pa.po | 347 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 170 insertions(+), 177 deletions(-) + po/pa.po | 347 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 170 insertions(+), 177 deletions(-) commit 66d563e65d796187ba8386df68082d1688f8bd61 Author: Xandru Armesto Fernandez @@ -4665,8 +4752,8 @@ Added asturian language - geyes/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + geyes/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6bffbc8db7570631e59e29eeff14d38f18706902 Author: Xandru Armesto Fernandez @@ -4674,8 +4761,8 @@ Updated asturian language - geyes/docs/ast/ast.po | 371 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 371 insertions(+), 0 deletions(-) + geyes/docs/ast/ast.po | 371 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 371 insertions(+) commit 302a85bd461eae3394235b8dcd31885bd31e2138 Author: Alexander Shopov @@ -4683,8 +4770,8 @@ Updated Bulgarian translation - po/bg.po | 24 ++++++++++++++++++------ - 1 files changed, 18 insertions(+), 6 deletions(-) + po/bg.po | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) commit 10cf09196b8dc240b7480f96749ef32f8324a83e Author: Daniel Nylander @@ -4692,8 +4779,8 @@ Updated Swedish translation - po/sv.po | 128 +++++++++++++++++++++++++------------------------------------- - 1 files changed, 51 insertions(+), 77 deletions(-) + po/sv.po | 128 +++++++++++++++++++++++++-------------------------------------- + 1 file changed, 51 insertions(+), 77 deletions(-) commit 48963bf1c139e8b2083f10f833ceff9789c471ec Author: Bruno Brouard @@ -4701,8 +4788,8 @@ Updated Doc French translation - charpick/help/fr/fr.po | 277 ++++++++++++++++++++++++----------------------- - 1 files changed, 141 insertions(+), 136 deletions(-) + charpick/help/fr/fr.po | 277 +++++++++++++++++++++++++------------------------ + 1 file changed, 141 insertions(+), 136 deletions(-) commit a79844fce0965e5839e3e24805dafb51bc055e42 Author: Matej Urbančič @@ -4711,7 +4798,7 @@ Updated Slovenian translation po/sl.po | 7296 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 3635 insertions(+), 3661 deletions(-) + 1 file changed, 3635 insertions(+), 3661 deletions(-) commit 3215a628161280a7bbfbba7650d75f72f3f05512 Author: Ivar Smolin @@ -4719,8 +4806,8 @@ Estonian translation updated - po/et.po | 46 ++++++++++++++++++++++++++-------------------- - 1 files changed, 26 insertions(+), 20 deletions(-) + po/et.po | 46 ++++++++++++++++++++++++++-------------------- + 1 file changed, 26 insertions(+), 20 deletions(-) commit e5d2768081c495525e421f99dac1f1dd6b5cb6b1 Author: vasudeven @@ -4728,8 +4815,8 @@ updated Tamil translation - po/ta.po | 149 +++++++++++++++++++++++++++---------------------------------- - 1 files changed, 66 insertions(+), 83 deletions(-) + po/ta.po | 149 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 66 insertions(+), 83 deletions(-) commit 89487137c00708c1adea1225c1e7a6a53a0bdded Author: Duarte Loreto @@ -4737,8 +4824,8 @@ Updated Portuguese translation - po/pt.po | 33 ++++++++++++++++++--------------- - 1 files changed, 18 insertions(+), 15 deletions(-) + po/pt.po | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) commit abbd9941c662678ca9c0cd11d10f5dd6f8f3bc51 Author: Petr Kovar @@ -4746,8 +4833,8 @@ Update Czech translation - po/cs.po | 24 ++++++++++++++++++------ - 1 files changed, 18 insertions(+), 6 deletions(-) + po/cs.po | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) commit a04c6b229dee744cc9dfbe75343d23e89effc547 Author: Milo Casagrande @@ -4755,8 +4842,8 @@ Updated Italian translation - po/it.po | 218 +++++++++----------------------------------------------------- - 1 files changed, 31 insertions(+), 187 deletions(-) + po/it.po | 218 +++++++++------------------------------------------------------ + 1 file changed, 31 insertions(+), 187 deletions(-) commit 6bbce03067fac58f025051d78632e46d36edab02 Author: Gabor Kelemen @@ -4764,8 +4851,8 @@ Updated Hungarian translation - po/hu.po | 131 ++++++++++++++++++++------------------------------------------ - 1 files changed, 42 insertions(+), 89 deletions(-) + po/hu.po | 131 ++++++++++++++++++++------------------------------------------- + 1 file changed, 42 insertions(+), 89 deletions(-) commit 91a1a4cbceaed76e0182a2424a9e4adf268b112e Author: Leonid Kanter @@ -4773,8 +4860,8 @@ Update Russian translation - po/ru.po | 76 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 38 insertions(+), 38 deletions(-) + po/ru.po | 76 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 38 insertions(+), 38 deletions(-) commit 836b29eb3ecbc4c8c37ca9d81fa316e3f5632131 Author: Gil Forcada @@ -4782,8 +4869,8 @@ Updated Catalan translation - po/ca.po | 33 ++++++++++++++++++--------------- - 1 files changed, 18 insertions(+), 15 deletions(-) + po/ca.po | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) commit a66a5967a1bac4960096a1c63294140e58d33a92 Author: Mario Blättermann @@ -4791,8 +4878,8 @@ Updated German translation - po/de.po | 37 ++++++++++++++++++++----------------- - 1 files changed, 20 insertions(+), 17 deletions(-) + po/de.po | 37 ++++++++++++++++++++----------------- + 1 file changed, 20 insertions(+), 17 deletions(-) commit 9061eade3c6a0e5a44d6ffcb58b03db67dc26478 Author: Claude Paroz @@ -4800,8 +4887,8 @@ Updated French translation - po/fr.po | 44 ++++++++++++++++++++++++++++---------------- - 1 files changed, 28 insertions(+), 16 deletions(-) + po/fr.po | 44 ++++++++++++++++++++++++++++---------------- + 1 file changed, 28 insertions(+), 16 deletions(-) commit 78d4520a6d55af3f5850f70ddcf4eae3c2114fe8 Author: Philip Withnall @@ -4809,8 +4896,8 @@ Updated British English translation - po/en_GB.po | 33 ++++++++++++++++++--------------- - 1 files changed, 18 insertions(+), 15 deletions(-) + po/en_GB.po | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) commit deb12efcd0de559dfa9addcd3e14f33d317643d9 Author: Chris Coulson @@ -4821,11 +4908,11 @@ Build a null keyboard indicator applet so that it can be properly removed from the panel configuration on upgrade. - null_applet/GNOME_KeyboardApplet.server.in | 22 ++++++++++++++++++++++ - null_applet/Makefile.am | 4 +++- - null_applet/null_applet.c | 2 ++ - po/POTFILES.in | 1 + - 4 files changed, 28 insertions(+), 1 deletions(-) + null_applet/GNOME_KeyboardApplet.server.in | 22 ++++++++++++++++++++++ + null_applet/Makefile.am | 4 +++- + null_applet/null_applet.c | 2 ++ + po/POTFILES.in | 1 + + 4 files changed, 28 insertions(+), 1 deletion(-) commit ccb58d471f1d074b63e58d02587cb601337988f4 Author: Reşat SABIQ @@ -4833,8 +4920,8 @@ Updated Crimean Tatar (Crimean Turkish) translation - po/crh.po | 346 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 170 insertions(+), 176 deletions(-) + po/crh.po | 346 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 170 insertions(+), 176 deletions(-) commit b35a84fb697636b131d565dc9b11968f3e6a80f9 Author: Mattias Põldaru @@ -4842,8 +4929,8 @@ Estonian translation updated - po/et.po | 98 +++++++++++++++++++++++++++---------------------------------- - 1 files changed, 43 insertions(+), 55 deletions(-) + po/et.po | 98 ++++++++++++++++++++++++++++------------------------------------ + 1 file changed, 43 insertions(+), 55 deletions(-) commit ea0ac3c3d1e86e825973df313cb9355cbb21eb33 Author: Tommi Vainikainen @@ -4851,8 +4938,8 @@ Updated Finnish translation - po/fi.po | 281 ++++++++++++++++++++++++-------------------------------------- - 1 files changed, 107 insertions(+), 174 deletions(-) + po/fi.po | 281 ++++++++++++++++++++++++--------------------------------------- + 1 file changed, 107 insertions(+), 174 deletions(-) commit 7ffb09cc2922e99259e86ee01bbccf8e2a99b07e Author: Luca Ferretti @@ -4863,8 +4950,8 @@ Use gtk_button_new_with_mnemonic() instead gtk_button_new_with_label() as suggested by André Klapper. - gweather/gweather-pref.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gweather/gweather-pref.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit b0ac8bb8f1a7e59233e5b506ffe8c8f029584f97 Author: Nicky Thomassen @@ -4872,8 +4959,8 @@ Added Danish translation of the documentation - mixer/docs/da/da.po | 479 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 479 insertions(+), 0 deletions(-) + mixer/docs/da/da.po | 479 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 479 insertions(+) commit eeecdb4e756e3547d28b990102b0e7b147cb930b Author: Kenneth Nielsen @@ -4881,8 +4968,8 @@ Added da to list of languages - mixer/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + mixer/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit bae9a4223707bf2864604b1f39f176152351e0d6 Author: Kenneth Nielsen @@ -4890,8 +4977,8 @@ Added da to list of languages - battstat/docs/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + battstat/docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit c401c5ce398c3e962612b8c6211719a75a9b7971 Author: Nicky Thomassen @@ -4899,8 +4986,8 @@ Added Danish translation of the documentation - battstat/docs/da/da.po | 782 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 782 insertions(+), 0 deletions(-) + battstat/docs/da/da.po | 782 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 782 insertions(+) commit b41f7438696ea9095ed7bc55de8a67d8fadd7697 Author: Marek Černocký @@ -4908,8 +4995,8 @@ Add screenshot - charpick/help/cs/figures/charpick-preferences.png | Bin 0 -> 30424 bytes - 1 files changed, 0 insertions(+), 0 deletions(-) + charpick/help/cs/figures/charpick-preferences.png | Bin 0 -> 30424 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) commit 4eb84b1ef0d076f96bec08c41a5ac540921813f8 Author: Duarte Loreto @@ -4917,8 +5004,8 @@ Updated Portuguese translation - po/pt.po | 313 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 159 insertions(+), 154 deletions(-) + po/pt.po | 313 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 159 insertions(+), 154 deletions(-) commit f4f0b02a2b6950b6d00ee01fee69dff65bb1c2da Author: Jennie Petoumenou @@ -4926,8 +5013,8 @@ Updated Greek translation for charpick manual - charpick/help/el/el.po | 188 ++++++++++++++++++++++++++---------------------- - 1 files changed, 101 insertions(+), 87 deletions(-) + charpick/help/el/el.po | 188 ++++++++++++++++++++++++++----------------------- + 1 file changed, 101 insertions(+), 87 deletions(-) commit 312080e7f26a07f0d2ac714e2db1f379c9bd1979 Author: OKANO Takayoshi @@ -4936,8 +5023,8 @@ Updated Japanese translation. (fix typo) - po/ja.po | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + po/ja.po | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) commit f93a2b7f34f93389cf5df1ccdd51cfec23640869 Author: Luca Ferretti @@ -4945,8 +5032,8 @@ Updated Italian translation - po/it.po | 314 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 165 insertions(+), 149 deletions(-) + po/it.po | 314 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 165 insertions(+), 149 deletions(-) commit 0d8ef7ed5f7ab52fde46022d5a037e36406a72ea Author: Joan Duran @@ -4954,8 +5041,8 @@ Updated Catalan translation - po/ca.po | 317 ++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 146 insertions(+), 171 deletions(-) + po/ca.po | 317 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 146 insertions(+), 171 deletions(-) commit 527fe7e4a5e18bf4bb262dbb55d6348978408292 Author: Inaki Larranaga Murgoitio @@ -4963,8 +5050,8 @@ Updated Basque language - po/eu.po | 269 +++++++++++++++++++++++++++---------------------------------- - 1 files changed, 119 insertions(+), 150 deletions(-) + po/eu.po | 269 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 119 insertions(+), 150 deletions(-) commit 41e641bac67fdd0499c83329e3d0c491209d0d55 Author: Christian Kirbach @@ -4972,8 +5059,8 @@ Updated German doc translation - cpufreq/help/de/de.po | 24 ++++++++++++++---------- - 1 files changed, 14 insertions(+), 10 deletions(-) + cpufreq/help/de/de.po | 24 ++++++++++++++---------- + 1 file changed, 14 insertions(+), 10 deletions(-) commit 23bb1f36f041883896e6d5bd0ffc6f5d46799a62 Author: Changwoo Ryu @@ -4981,8 +5068,8 @@ Updated Korean translation - po/ko.po | 310 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 159 insertions(+), 151 deletions(-) + po/ko.po | 310 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 159 insertions(+), 151 deletions(-) commit 29e594571dc5eb15fb4add18514026edf606f734 Author: Claude Paroz @@ -4990,8 +5077,8 @@ Updated French translation - po/fr.po | 259 +++++++++++++++++++++++++++---------------------------------- - 1 files changed, 115 insertions(+), 144 deletions(-) + po/fr.po | 259 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 115 insertions(+), 144 deletions(-) commit 66b1903d1896ba4647d1aec05b8c9fa70284b553 Author: Hideki Yamane (Debian-JP) @@ -5001,8 +5088,8 @@ Merged typo fix by OKANO Takayoshi on mailing list. Reviewed by TAKAYUKI Kusano. - po/ja.po | 889 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 435 insertions(+), 454 deletions(-) + po/ja.po | 889 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 435 insertions(+), 454 deletions(-) commit cf9460e24f587f303148bf0247c2b4488f8a4998 Author: Christian Kirbach @@ -5010,8 +5097,8 @@ Updated German translation - po/de.po | 313 +++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 149 insertions(+), 164 deletions(-) + po/de.po | 313 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 149 insertions(+), 164 deletions(-) commit 0dbb5afde31aa279c42429da03680794ec16cae7 Author: Gotz Waschk @@ -5021,8 +5108,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=610950 - battstat/battstat_applet.c | 4 ++-- - gweather/gweather-applet.c | 2 +- + battstat/battstat_applet.c | 4 ++-- + gweather/gweather-applet.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit dbb52b1e615b08e88cc770a23c05f11364c016b5 @@ -5031,8 +5118,8 @@ Update Russian translation by Yuri Kozlov - po/ru.po | 743 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 346 insertions(+), 397 deletions(-) + po/ru.po | 743 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 346 insertions(+), 397 deletions(-) commit 34366d5074496c21c2d1b9185697fa4e2e5e1321 Author: Bruce Cowan @@ -5040,8 +5127,8 @@ Updated British English translation - po/en_GB.po | 319 ++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 164 insertions(+), 155 deletions(-) + po/en_GB.po | 319 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 164 insertions(+), 155 deletions(-) commit 0a19e024a82d1d21df6c9f052fbed4ce0eda1284 Author: Petr Kovar @@ -5049,8 +5136,8 @@ Update Czech translation - po/cs.po | 268 +++++++++++++++++++++++++++---------------------------------- - 1 files changed, 119 insertions(+), 149 deletions(-) + po/cs.po | 268 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 119 insertions(+), 149 deletions(-) commit 8d01df04506c5dd3ec6f2346c1abe78077959a0b Author: Piotr Drąg @@ -5058,8 +5145,8 @@ Updated Polish translation - po/pl.po | 850 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 419 insertions(+), 431 deletions(-) + po/pl.po | 850 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 419 insertions(+), 431 deletions(-) commit 44fdc2aae9623f2ca4eec723aca79d49f1d8d683 Author: Vladimir Melo @@ -5067,8 +5154,8 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 329 +++++++++++++++++++++++------------------------------------ - 1 files changed, 128 insertions(+), 201 deletions(-) + po/pt_BR.po | 329 +++++++++++++++++++++++------------------------------------- + 1 file changed, 128 insertions(+), 201 deletions(-) commit 9fdeee354f9ab9e9542d196772a4fb6790d0d959 Author: Fran Diéguez @@ -5076,8 +5163,8 @@ Updated Galician Translation - po/gl.po | 433 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 222 insertions(+), 211 deletions(-) + po/gl.po | 433 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 222 insertions(+), 211 deletions(-) commit 36db7ffbb4ece890782223bca54f81e94160ebef Author: Chao-Hsiung Liao @@ -5085,8 +5172,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 304 ++++++++++++++++++++++++++++++----------------------------- - po/zh_TW.po | 304 ++++++++++++++++++++++++++++++----------------------------- + po/zh_HK.po | 304 +++++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 304 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 312 insertions(+), 296 deletions(-) commit a19492a2b398e499beff2cbc83398ce790e6ab80 @@ -5095,8 +5182,8 @@ Updated Thai translation. - po/th.po | 292 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 149 insertions(+), 143 deletions(-) + po/th.po | 292 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 149 insertions(+), 143 deletions(-) commit e1eac582c3c1f446d742d958fdf732d4143d2932 Author: Jorge González @@ -5104,8 +5191,8 @@ Updated Spanish translation - invest-applet/docs/es/es.po | 222 +++++++++++++++++++++++-------------------- - 1 files changed, 119 insertions(+), 103 deletions(-) + invest-applet/docs/es/es.po | 222 ++++++++++++++++++++++++-------------------- + 1 file changed, 119 insertions(+), 103 deletions(-) commit 84c98d9c73931ee80fe21bd13bfd6c9a50525c96 Author: Alexander Shopov @@ -5113,8 +5200,8 @@ Updated Bulgarian translation - po/bg.po | 278 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 124 insertions(+), 154 deletions(-) + po/bg.po | 278 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 124 insertions(+), 154 deletions(-) commit 2640c7a68f74bd12bb3f37ac5f1bb1139d3f5117 Author: Paul Cutler @@ -5122,8 +5209,8 @@ Fix two spelling errors (tthe and candlestick chart) both in bgo #579607 - invest-applet/docs/C/invest-applet.xml | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + invest-applet/docs/C/invest-applet.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit cb54ac4a051beedbd114e021ff1c0c9bb138e7d8 Author: Jamil Ahmed @@ -5132,7 +5219,7 @@ Updated Bengali translation po/bn.po | 3610 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 1804 insertions(+), 1806 deletions(-) + 1 file changed, 1804 insertions(+), 1806 deletions(-) commit 6bf5c60795549c0bd8f5802708e5295f8e6978fa Author: Enrico Minack @@ -5140,11 +5227,11 @@ invest-applet: connects to the network manager via dbus to react on network changes, fixes bug #605739 - invest-applet/invest/Makefile.am | 1 + - invest-applet/invest/__init__.py | 5 +++ - invest-applet/invest/networkmanager.py | 58 ++++++++++++++++++++++++++++++++ - invest-applet/invest/quotes.py | 30 ++++++++++++++++- - 4 files changed, 93 insertions(+), 1 deletions(-) + invest-applet/invest/Makefile.am | 1 + + invest-applet/invest/__init__.py | 5 +++ + invest-applet/invest/networkmanager.py | 58 ++++++++++++++++++++++++++++++++++ + invest-applet/invest/quotes.py | 30 +++++++++++++++++- + 4 files changed, 93 insertions(+), 1 deletion(-) commit 6367ba9d78cc90a9e5b60feb805664f03e75ceb1 Author: Vincent Untz @@ -5152,19 +5239,19 @@ [release] post-release bump to 2.29.6 - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 9146ccf7786b320cdc025fe169ae9797307ce3c6 +commit 9146ccf7786b320cdc025fe169ae9797307ce3c6 (tag: GNOME_APPLETS_2_29_5) Author: Vincent Untz Date: Wed Jan 13 00:09:59 2010 +0100 [release] 2.29.5 - NEWS | 20 ++++++++++++++++++++ - battstat/docs/de/battstat.xml | 2 +- - configure.in | 2 +- - stickynotes/docs/de/stickynotes_applet.xml | 12 ++++++------ + NEWS | 20 ++++++++++++++++++++ + battstat/docs/de/battstat.xml | 2 +- + configure.in | 2 +- + stickynotes/docs/de/stickynotes_applet.xml | 12 ++++++------ 4 files changed, 28 insertions(+), 8 deletions(-) commit ba1a86892ecc54ac9fe0f522e905c3a4da4b9069 @@ -5176,25 +5263,25 @@ This reverts commit 79d73cbad010253027afafe536fc2abe0f8067e9. Sorry, I didn't know about git.mk :( - .gitignore | 43 ------------------------------------------- - accessx-status/.gitignore | 4 ---- - battstat/.gitignore | 6 ------ - charpick/.gitignore | 5 ----- - cpufreq/.gitignore | 9 --------- - drivemount/.gitignore | 5 ----- - geyes/.gitignore | 5 ----- - gkb-new/.gitignore | 1 - - gweather/.gitignore | 4 ---- - invest-applet/.gitignore | 1 - - m4/.gitignore | 7 ------- - mini-commander/.gitignore | 1 - - mixer/.gitignore | 5 ----- - multiload/.gitignore | 5 ----- - null_applet/.gitignore | 6 ------ - po/.gitignore | 5 ----- - stickynotes/.gitignore | 5 ----- - trashapplet/.gitignore | 4 ---- - 18 files changed, 0 insertions(+), 121 deletions(-) + .gitignore | 43 ------------------------------------------- + accessx-status/.gitignore | 4 ---- + battstat/.gitignore | 6 ------ + charpick/.gitignore | 5 ----- + cpufreq/.gitignore | 9 --------- + drivemount/.gitignore | 5 ----- + geyes/.gitignore | 5 ----- + gkb-new/.gitignore | 1 - + gweather/.gitignore | 4 ---- + invest-applet/.gitignore | 1 - + m4/.gitignore | 7 ------- + mini-commander/.gitignore | 1 - + mixer/.gitignore | 5 ----- + multiload/.gitignore | 5 ----- + null_applet/.gitignore | 6 ------ + po/.gitignore | 5 ----- + stickynotes/.gitignore | 5 ----- + trashapplet/.gitignore | 4 ---- + 18 files changed, 121 deletions(-) commit 921aa942fd26c505c767b3eb896b971ce59ada4d Author: Javier Jardón @@ -5207,8 +5294,8 @@ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=605098 - configure.in | 2 +- - drivemount/drive-button.c | 20 ++++++++++++-------- + configure.in | 2 +- + drivemount/drive-button.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) commit 79d73cbad010253027afafe536fc2abe0f8067e9 @@ -5217,25 +5304,25 @@ Recreated .gitignore files - .gitignore | 43 +++++++++++++++++++++++++++++++++++++++++++ - accessx-status/.gitignore | 4 ++++ - battstat/.gitignore | 6 ++++++ - charpick/.gitignore | 5 +++++ - cpufreq/.gitignore | 9 +++++++++ - drivemount/.gitignore | 5 +++++ - geyes/.gitignore | 5 +++++ - gkb-new/.gitignore | 1 + - gweather/.gitignore | 4 ++++ - invest-applet/.gitignore | 1 + - m4/.gitignore | 7 +++++++ - mini-commander/.gitignore | 1 + - mixer/.gitignore | 5 +++++ - multiload/.gitignore | 5 +++++ - null_applet/.gitignore | 6 ++++++ - po/.gitignore | 5 +++++ - stickynotes/.gitignore | 5 +++++ - trashapplet/.gitignore | 4 ++++ - 18 files changed, 121 insertions(+), 0 deletions(-) + .gitignore | 43 +++++++++++++++++++++++++++++++++++++++++++ + accessx-status/.gitignore | 4 ++++ + battstat/.gitignore | 6 ++++++ + charpick/.gitignore | 5 +++++ + cpufreq/.gitignore | 9 +++++++++ + drivemount/.gitignore | 5 +++++ + geyes/.gitignore | 5 +++++ + gkb-new/.gitignore | 1 + + gweather/.gitignore | 4 ++++ + invest-applet/.gitignore | 1 + + m4/.gitignore | 7 +++++++ + mini-commander/.gitignore | 1 + + mixer/.gitignore | 5 +++++ + multiload/.gitignore | 5 +++++ + null_applet/.gitignore | 6 ++++++ + po/.gitignore | 5 +++++ + stickynotes/.gitignore | 5 +++++ + trashapplet/.gitignore | 4 ++++ + 18 files changed, 121 insertions(+) commit 6469b563975c473f9af6aee016b1198d69660cc5 Author: Maxim V. Dziumanenko @@ -5243,8 +5330,8 @@ Update Ukrainian translation - po/uk.po | 282 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 145 insertions(+), 137 deletions(-) + po/uk.po | 282 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 145 insertions(+), 137 deletions(-) commit 15220659d1ee9c1bf3c45d3d648bcf10415b3dcc Author: Khaled Hosny @@ -5252,8 +5339,8 @@ Updated Arabic translation - po/ar.po | 288 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 148 insertions(+), 140 deletions(-) + po/ar.po | 288 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 140 deletions(-) commit d197e1041f6e52e7734e7094ef9c6bd12a1ae9ac Author: Sergey V. Udaltsov @@ -5265,20 +5352,20 @@ more. The help files should be moved perhaps as well. And xmodmap files as well. - Makefile.am | 5 - - configure.in | 38 +-- - gswitchit/ChangeLog.old | 629 ----------------------- - gswitchit/GNOME_GSwitchItApplet.xml | 16 - - gswitchit/GNOME_KeyboardApplet.server.in.in | 45 -- - gswitchit/Makefile.am | 60 --- - gswitchit/gswitchit-applet.c | 712 --------------------------- - gswitchit/gswitchit-applet.h | 34 -- - gswitchit/gswitchit-applet.png | Bin 2378 -> 0 bytes - gswitchit/gswitchit-properties-capplet.png | Bin 2378 -> 0 bytes - gswitchit/gswitchit.ui | 83 --- - gswitchit/switch.c | 37 -- - po/POTFILES.in | 4 - - 13 files changed, 1 insertions(+), 1662 deletions(-) + Makefile.am | 5 - + configure.in | 38 +- + gswitchit/ChangeLog.old | 629 ------------------------ + gswitchit/GNOME_GSwitchItApplet.xml | 16 - + gswitchit/GNOME_KeyboardApplet.server.in.in | 45 -- + gswitchit/Makefile.am | 60 --- + gswitchit/gswitchit-applet.c | 712 ---------------------------- + gswitchit/gswitchit-applet.h | 34 -- + gswitchit/gswitchit-applet.png | Bin 2378 -> 0 bytes + gswitchit/gswitchit-properties-capplet.png | Bin 2378 -> 0 bytes + gswitchit/gswitchit.ui | 83 ---- + gswitchit/switch.c | 37 -- + po/POTFILES.in | 4 - + 13 files changed, 1 insertion(+), 1662 deletions(-) commit 222ab673a50abbf09a1c63058f27ad50bbe52d46 Author: Lucian Adrian Grijincu @@ -5286,8 +5373,8 @@ Update Romanian translation - po/ro.po | 733 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 328 insertions(+), 405 deletions(-) + po/ro.po | 733 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 328 insertions(+), 405 deletions(-) commit 21d8872cce7396f799d859fb19ef6d124c4022e1 Author: Kjartan Maraas @@ -5295,8 +5382,8 @@ Updated Norwegian bokmål translation. - po/nb.po | 178 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 103 insertions(+), 75 deletions(-) + po/nb.po | 178 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 103 insertions(+), 75 deletions(-) commit 8e10fa500d492cb5a1f45289cffcfe87804b31f2 Author: Yaron Sharabani @@ -5304,8 +5391,8 @@ Updated Hebrew translation - po/he.po | 645 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 374 insertions(+), 271 deletions(-) + po/he.po | 645 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 374 insertions(+), 271 deletions(-) commit 45fbc26df010eee6c01ee9ab8ae5ed361ab5cd40 Author: Aron Xu @@ -5314,7 +5401,7 @@ Update Simplified Chinese translation. po/zh_CN.po | 1072 ++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 580 insertions(+), 492 deletions(-) + 1 file changed, 580 insertions(+), 492 deletions(-) commit acfa650f32090c797fee5afc714867419339d5e6 Author: Christian Kirbach @@ -5322,8 +5409,8 @@ [sticky notes] Updated German manual translation - stickynotes/docs/de/de.po | 609 +++++++++++++++++++++++---------------------- - 1 files changed, 308 insertions(+), 301 deletions(-) + stickynotes/docs/de/de.po | 609 +++++++++++++++++++++++----------------------- + 1 file changed, 308 insertions(+), 301 deletions(-) commit 058df946ad8940ecf727f70f08d8ffb6f37c8902 Author: Gabor Kelemen @@ -5331,8 +5418,8 @@ Updated Hungarian translation - po/hu.po | 222 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 119 insertions(+), 103 deletions(-) + po/hu.po | 222 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 119 insertions(+), 103 deletions(-) commit e965f0eb2dc03e75564afc4ff73ba4bd7e41f3ac Author: Christian Kirbach @@ -5340,8 +5427,8 @@ [mini-commander] Updated German manual - mini-commander/help/de/de.po | 195 ++++++++++++++++++++++-------------------- - 1 files changed, 101 insertions(+), 94 deletions(-) + mini-commander/help/de/de.po | 195 ++++++++++++++++++++++--------------------- + 1 file changed, 101 insertions(+), 94 deletions(-) commit 60d3a01200187ec7758cebce3fe6e36fcfbabc30 Author: Christian Kirbach @@ -5349,8 +5436,8 @@ Updated German translation - trashapplet/docs/de/de.po | 272 +++++++++++++++++++++++++++++--------------- - 1 files changed, 179 insertions(+), 93 deletions(-) + trashapplet/docs/de/de.po | 272 ++++++++++++++++++++++++++++++---------------- + 1 file changed, 179 insertions(+), 93 deletions(-) commit 2db9e038f0888bdea42f9ca9bd5959eed2ebabbd Author: Ivar Smolin @@ -5358,8 +5445,8 @@ Updating Estonian translation - po/et.po | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) + po/et.po | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) commit 68130e2a10eb86f75af1c0caeecbfa7f075ffb6e Author: Thomas Thurman @@ -5369,7 +5456,7 @@ po/LINGUAS | 1 + po/en@shaw.po | 2760 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2761 insertions(+), 0 deletions(-) + 2 files changed, 2761 insertions(+) commit 5af7b36f162bc7fd8abf2954bc76ff7bad207b5a Author: Daniel Nylander @@ -5377,8 +5464,8 @@ Updated Swedish translation - po/sv.po | 178 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 103 insertions(+), 75 deletions(-) + po/sv.po | 178 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 103 insertions(+), 75 deletions(-) commit 1bdbe7b2002a46a337992b2f7b134646909b79a4 Author: Matej Urbančič @@ -5386,8 +5473,8 @@ Updated Slovenian translation - po/sl.po | 267 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 147 insertions(+), 120 deletions(-) + po/sl.po | 267 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 147 insertions(+), 120 deletions(-) commit 659add57a706735e4389dc4859fdc616beef70aa Author: Kostas Papadimas @@ -5396,7 +5483,7 @@ Updated Greek translation po/el.po | 1180 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 553 insertions(+), 627 deletions(-) + 1 file changed, 553 insertions(+), 627 deletions(-) commit 870699ac6072ea91b0fe2771ba7ce7a587ffe885 Author: drtvasudevan @@ -5404,8 +5491,8 @@ Updated Tamil translation - po/ta.po | 186 +++++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 107 insertions(+), 79 deletions(-) + po/ta.po | 186 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 107 insertions(+), 79 deletions(-) commit 99259cdee777354c712358efdf14e222b3d07b8a Author: Christian Kirbach @@ -5413,8 +5500,8 @@ [cpufreq help] Added 2 screenshots to German manual. - .../de/figures/cpufreq-applet-preferences-smp.png | Bin 0 -> 15441 bytes - .../de/figures/cpufreq-applet-selector-both.png | Bin 0 -> 12435 bytes + .../help/de/figures/cpufreq-applet-preferences-smp.png | Bin 0 -> 15441 bytes + .../help/de/figures/cpufreq-applet-selector-both.png | Bin 0 -> 12435 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit b34e2a9ed84475394c1abc5a69ce4eece633108c @@ -5423,11 +5510,11 @@ [battstat applet] Updated German help translation and its screenshots - battstat/docs/de/de.po | 533 ++++++++++---------- - .../docs/de/figures/battstat-applet-expanded.png | Bin 0 -> 8670 bytes - battstat/docs/de/figures/battstat-applet.png | Bin 939 -> 8088 bytes - battstat/docs/de/figures/battstat-preferences.png | Bin 0 -> 45763 bytes - battstat/docs/de/figures/context-menu.png | Bin 0 -> 10381 bytes + battstat/docs/de/de.po | 533 +++++++++++---------- + .../docs/de/figures/battstat-applet-expanded.png | Bin 0 -> 8670 bytes + battstat/docs/de/figures/battstat-applet.png | Bin 939 -> 8088 bytes + battstat/docs/de/figures/battstat-preferences.png | Bin 0 -> 45763 bytes + battstat/docs/de/figures/context-menu.png | Bin 0 -> 10381 bytes 5 files changed, 269 insertions(+), 264 deletions(-) commit c1f98852c22570d62194b103c075513f10f1e72c @@ -5436,8 +5523,8 @@ Updated Crimean Tatar (Crimean Turkish) translation - po/crh.po | 540 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 273 insertions(+), 267 deletions(-) + po/crh.po | 540 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 273 insertions(+), 267 deletions(-) commit 847454453d2d5c9ed8ac85f9381e7f37f76c888f Author: Kjartan Maraas @@ -5446,7 +5533,7 @@ Update this a bit. po/nn.po | 2387 ++++++++++++++++++++------------------------------------------ - 1 files changed, 753 insertions(+), 1634 deletions(-) + 1 file changed, 753 insertions(+), 1634 deletions(-) commit 330dd851f79521b0340ab7b7bea559f1ec9ee7e2 Author: Ray Strode @@ -5466,8 +5553,8 @@ See bug 424639 for more details. - gweather/gweather-pref.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + gweather/gweather-pref.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) commit 9ff5b57d27bed58fd08f148fceec58957e773ace Author: Jorge González @@ -5475,8 +5562,8 @@ Updated Spanish translation - po/es.po | 101 +++++++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 64 insertions(+), 37 deletions(-) + po/es.po | 101 ++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 64 insertions(+), 37 deletions(-) commit 0bf446d87e8b3c873ad9bf3edfec5b4714a07d8f Author: Mario Klug @@ -5484,8 +5571,8 @@ Updated German translation - po/de.po | 190 +++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 107 insertions(+), 83 deletions(-) + po/de.po | 190 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 107 insertions(+), 83 deletions(-) commit 47440be0e498520776648712fef052851e4f50dd Author: Timo Jyrinki @@ -5493,8 +5580,8 @@ Updated Finnish translation by Jyri Grönroos. - po/fi.po | 119 ++++++++++++++++++++++++++++++++++++++----------------------- - 1 files changed, 74 insertions(+), 45 deletions(-) + po/fi.po | 119 +++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 74 insertions(+), 45 deletions(-) commit 51fd777236b9755bdeeef7e821db6e63653b8f28 Author: Callum McKenzie @@ -5504,8 +5591,8 @@ Patch from Michael Pryc in bug 594797. - stickynotes/stickynotes.ui | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + stickynotes/stickynotes.ui | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit fe0f4cc3d4978d3f3336268451aa387a52495620 Author: Joan Duran @@ -5513,8 +5600,8 @@ Updated Catalan translation - po/ca.po | 594 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 313 insertions(+), 281 deletions(-) + po/ca.po | 594 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 313 insertions(+), 281 deletions(-) commit a68d1b669f2f76595f6f7e259ec5b181d8cea641 Author: Callum McKenzie @@ -5526,8 +5613,8 @@ English let alone any other language. Patch from Enrico Minack (bug 582766/536224). - invest-applet/data/financialchart.ui | 15 +++++++++------ - invest-applet/invest/chart.py | 5 ++++- + invest-applet/data/financialchart.ui | 15 +++++++++------ + invest-applet/invest/chart.py | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) commit c9f69665139ea89fe4385a54bb98410ba35141a3 @@ -5536,8 +5623,8 @@ Fix help of the keyboard applet to open the right file - gswitchit/gswitchit-applet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gswitchit/gswitchit-applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6832c4facf79e08ac37354ab8f1a5f3b66420d64 Author: Callum McKenzie @@ -5547,8 +5634,8 @@ These are the minimal necessary fixes to get past msgfmt -c. - po/ka.po | 12 ++++++------ - po/ky.po | 20 ++++++++++---------- + po/ka.po | 12 ++++++------ + po/ky.po | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) commit 189506e8321531db5d0f35b2ab12c5326d4f1888 @@ -5560,8 +5647,8 @@ There was a missing % sign. I hope I've got it in the right place, but this is needed so the new branch can get into git. - po/fa.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/fa.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit ffd1867c061012354bf51583f1f68b1343aa00af Author: Callum McKenzie @@ -5569,7 +5656,7 @@ Removing executable permissions from more translation files - 0 files changed, 0 insertions(+), 0 deletions(-) + 0 files changed commit 5e89b58805c59633f1e3399239f9ce6d5e6660bd Author: Callum McKenzie @@ -5577,9 +5664,9 @@ Remove .xml files obsoleted by the .po process from the repository. - charpick/help/de/char-palette.xml | 306 ------------------- - mini-commander/help/de/command-line.xml | 488 ------------------------------- - 2 files changed, 0 insertions(+), 794 deletions(-) + charpick/help/de/char-palette.xml | 306 -------------------- + mini-commander/help/de/command-line.xml | 488 -------------------------------- + 2 files changed, 794 deletions(-) commit 5193347389083d13cf16f4f5da938cfb0b7d372d Author: Callum McKenzie @@ -5589,9 +5676,9 @@ Plus disabling invest-applet test permanently. - 0 files changed, 0 insertions(+), 0 deletions(-) + 0 files changed -commit 034c5b8967dc4d724000807a3cd7ae27c759d8da +commit 034c5b8967dc4d724000807a3cd7ae27c759d8da (tag: GNOME_APPLETS_2_28_0) Author: Callum McKenzie Date: Mon Sep 21 19:06:00 2009 +1200 @@ -5599,9 +5686,9 @@ Plus disabling invest-applet test permanently. - NEWS | 13 +++++++++++++ - configure.in | 2 +- - invest-applet/invest/Makefile.am | 8 ++++---- + NEWS | 13 +++++++++++++ + configure.in | 2 +- + invest-applet/invest/Makefile.am | 8 ++++---- 3 files changed, 18 insertions(+), 5 deletions(-) commit 9d2845b2b6b8047c7fbeb38274963522f2f169c5 @@ -5611,7 +5698,7 @@ Updating Assamese translations po/as.po | 1065 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 540 insertions(+), 525 deletions(-) + 1 file changed, 540 insertions(+), 525 deletions(-) commit 965303dbd965cf82089aec4d5729f5c7431fbb83 Author: Petr Kovar @@ -5619,8 +5706,8 @@ Updated Czech translation - po/cs.po | 98 ++++++++++++-------------------------------------------------- - 1 files changed, 19 insertions(+), 79 deletions(-) + po/cs.po | 98 +++++++++++++--------------------------------------------------- + 1 file changed, 19 insertions(+), 79 deletions(-) commit 6dc122dba99a605c1c4d785b97d5653822bb0348 Author: Daniel Nylander @@ -5628,8 +5715,8 @@ Updated Swedish translation - po/sv.po | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + po/sv.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit 1da036b1805e3496da7e3b84597f1d6b829286c9 Author: Gabor Kelemen @@ -5637,9 +5724,9 @@ Added Hungarian translation by Balazs Mesko - cpufreq/help/Makefile.am | 2 +- - cpufreq/help/hu/hu.po | 577 ++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 578 insertions(+), 1 deletions(-) + cpufreq/help/Makefile.am | 2 +- + cpufreq/help/hu/hu.po | 577 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 578 insertions(+), 1 deletion(-) commit 9c70afc0db42748ba61c9e66728a46989398267c Author: dooteo @@ -5647,8 +5734,8 @@ Deleted english image - .../eu/figures/system-monitor-applet_window.png | Bin 447 -> 0 bytes - 1 files changed, 0 insertions(+), 0 deletions(-) + .../docs/eu/figures/system-monitor-applet_window.png | Bin 447 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) commit 1098de1b2f79c03adc64950543041dc2fe6fe9da Author: dooteo @@ -5656,9 +5743,9 @@ Deleted english images - .../eu/figures/cpufreq-applet-preferences-smp.png | Bin 9428 -> 0 bytes - .../eu/figures/cpufreq-applet-selector-both.png | Bin 7739 -> 0 bytes - .../help/eu/figures/cpufreq-applet-selector.png | Bin 8836 -> 0 bytes + .../help/eu/figures/cpufreq-applet-preferences-smp.png | Bin 9428 -> 0 bytes + cpufreq/help/eu/figures/cpufreq-applet-selector-both.png | Bin 7739 -> 0 bytes + cpufreq/help/eu/figures/cpufreq-applet-selector.png | Bin 8836 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) commit 03f12341b5a4f3f7cc990e504c5c6acdff4847bd @@ -5667,8 +5754,8 @@ Delete english images - charpick/help/eu/figures/charpalette_applet.png | Bin 1797 -> 0 bytes - charpick/help/eu/figures/charpick_characters.png | Bin 36598 -> 0 bytes + charpick/help/eu/figures/charpalette_applet.png | Bin 1797 -> 0 bytes + charpick/help/eu/figures/charpick_characters.png | Bin 36598 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit 121f8e63feda05a4ef8b977f92234965a1bb745d @@ -5677,8 +5764,8 @@ delete english image - gweather/docs/eu/figures/gweather_applet.png | Bin 1225 -> 0 bytes - 1 files changed, 0 insertions(+), 0 deletions(-) + gweather/docs/eu/figures/gweather_applet.png | Bin 1225 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) commit bb4bf9ec6d970cbce135a893c35d16f17a95bb43 Author: dooteo @@ -5686,8 +5773,8 @@ deleted english images - mixer/docs/eu/figures/volumecontrol_applet.png | Bin 987 -> 0 bytes - 1 files changed, 0 insertions(+), 0 deletions(-) + mixer/docs/eu/figures/volumecontrol_applet.png | Bin 987 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) commit 91ede7b489e9b71c0c37182cdf46246e3a6403c2 Author: Manoj Kumar Giri @@ -5695,8 +5782,8 @@ Upadated Oriya Translation - po/or.po | 70 +++++++++++++++++++++++--------------------------------------- - 1 files changed, 26 insertions(+), 44 deletions(-) + po/or.po | 70 ++++++++++++++++++++++++---------------------------------------- + 1 file changed, 26 insertions(+), 44 deletions(-) commit f9664c976b1a0b256aa65ce8d0cc5771e9fed291 Author: Mario Blättermann @@ -5704,8 +5791,8 @@ Updated German doc translation - cpufreq/help/de/de.po | 482 +++++++++++++++++++++++++------------------------ - 1 files changed, 244 insertions(+), 238 deletions(-) + cpufreq/help/de/de.po | 482 +++++++++++++++++++++++++------------------------- + 1 file changed, 244 insertions(+), 238 deletions(-) commit 813c695956cc4485ecfc5b4584e85e93044b3039 Author: Maxim V. Dziumanenko @@ -5713,8 +5800,8 @@ Added Ukrainian translation - po/uk.po | 64 +++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 35 insertions(+), 29 deletions(-) + po/uk.po | 64 +++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 35 insertions(+), 29 deletions(-) commit eb374ce4c1784be1ceda165ab49f353ee4f08bc8 Author: Adi Roiban @@ -5723,7 +5810,7 @@ Updated Romanian translation po/ro.po | 1668 ++++++++++++++++++++++---------------------------------------- - 1 files changed, 579 insertions(+), 1089 deletions(-) + 1 file changed, 579 insertions(+), 1089 deletions(-) commit 5244fd7996ea93aef4d60b663596e36d9426b26b Author: Matej Urbančič @@ -5731,8 +5818,8 @@ Updated Slovenian translation - po/sl.po | 970 ++++++++++++++++++++++++++++---------------------------------- - 1 files changed, 444 insertions(+), 526 deletions(-) + po/sl.po | 970 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 444 insertions(+), 526 deletions(-) commit 6fc0aeb3ce0d41d983cb8c5d8e667a5002b416c4 Author: Rajesh Ranjan @@ -5740,8 +5827,8 @@ hindi update by Rajesh Ranjan - po/hi.po | 183 ++++++++++++++++++-------------------------------------------- - 1 files changed, 52 insertions(+), 131 deletions(-) + po/hi.po | 183 ++++++++++++++++++--------------------------------------------- + 1 file changed, 52 insertions(+), 131 deletions(-) commit 8ccfd088c574630677601d3bed17f45594168a5b Author: Mohammad Anwari @@ -5750,7 +5837,7 @@ Removed unused plural translations po/id.po | 3833 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 1823 insertions(+), 2010 deletions(-) + 1 file changed, 1823 insertions(+), 2010 deletions(-) commit 5dc7697baafd12601aa628b59ec74967a4871e65 Author: Shankar Prasad @@ -5758,8 +5845,8 @@ Updated Kannada(kn) translation - po/kn.po | 470 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 228 insertions(+), 242 deletions(-) + po/kn.po | 470 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 228 insertions(+), 242 deletions(-) commit 665a9490cd3dd28b405935632a1644ea474ab98a Author: Ask H. Larsen @@ -5767,8 +5854,8 @@ Updated Danish translation - po/da.po | 438 ++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 230 insertions(+), 208 deletions(-) + po/da.po | 438 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 230 insertions(+), 208 deletions(-) commit 64809a33f9f6d22e1a15e496179358911a3c0346 Author: Philip Withnall @@ -5776,8 +5863,8 @@ Updated British English translation - po/en_GB.po | 634 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 331 insertions(+), 303 deletions(-) + po/en_GB.po | 634 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 331 insertions(+), 303 deletions(-) commit 14a734e6f5d766ec311e8825e6e190cd337d7ddf Author: Kostas Papadimas @@ -5797,14 +5884,14 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - cpufreq/help/Makefile.am | 2 +- - cpufreq/help/zh_HK/zh_HK.po | 398 +++++++++++++++++++++++++++++++++++++++ - cpufreq/help/zh_TW/zh_TW.po | 398 +++++++++++++++++++++++++++++++++++++++ - po/zh_HK.po | 60 +++--- - po/zh_TW.po | 60 +++--- - trashapplet/docs/Makefile.am | 2 +- - trashapplet/docs/zh_HK/zh_HK.po | 221 ++++++++++++++++++++++ - trashapplet/docs/zh_TW/zh_TW.po | 221 ++++++++++++++++++++++ + cpufreq/help/Makefile.am | 2 +- + cpufreq/help/zh_HK/zh_HK.po | 398 ++++++++++++++++++++++++++++++++++++++++ + cpufreq/help/zh_TW/zh_TW.po | 398 ++++++++++++++++++++++++++++++++++++++++ + po/zh_HK.po | 60 +++--- + po/zh_TW.po | 60 +++--- + trashapplet/docs/Makefile.am | 2 +- + trashapplet/docs/zh_HK/zh_HK.po | 221 ++++++++++++++++++++++ + trashapplet/docs/zh_TW/zh_TW.po | 221 ++++++++++++++++++++++ 8 files changed, 1300 insertions(+), 62 deletions(-) commit a5cf6262af537ca55a9397d68c339c14a27c9455 @@ -5816,8 +5903,8 @@ Fixing a few cases where the wrong widget was still being read (should have been no crash though). - stickynotes/stickynotes.ui | 2 +- - stickynotes/stickynotes_applet.c | 2 +- + stickynotes/stickynotes.ui | 2 +- + stickynotes/stickynotes_applet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 1e168c5046a5d0599cfc163960bd5be5163d7de9 @@ -5830,8 +5917,8 @@ with newer GTK+. With older GTK+ desensitisation isn't working properly. - stickynotes/stickynotes.ui | 8 +++--- - stickynotes/stickynotes_applet.c | 53 ++++++++++++++++++------------------- + stickynotes/stickynotes.ui | 8 +++--- + stickynotes/stickynotes_applet.c | 53 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 31 deletions(-) commit cd17796cea15715425d7a5f6a89c564015670d66 @@ -5840,8 +5927,8 @@ Updated German translation - po/de.po | 586 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 302 insertions(+), 284 deletions(-) + po/de.po | 586 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 302 insertions(+), 284 deletions(-) commit 0c6e9598985e73df677abd7f2148e5ea9ad2bb3d Author: Enrico Minack @@ -5853,8 +5940,8 @@ applet could no longer show the latest stock data, see Bug #592377. This patch fixes this bug. - invest-applet/invest/quotes.py | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + invest-applet/invest/quotes.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) commit a00f823edc562c2687533d90f4708344fffb4546 Author: Gintautas Miliauskas @@ -5862,8 +5949,8 @@ Updated Lithuanian translation. - po/lt.po | 614 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 321 insertions(+), 293 deletions(-) + po/lt.po | 614 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 321 insertions(+), 293 deletions(-) commit a6d52a1e31d181a0ff514ca8101bce0476211a3b Author: krishnababu k @@ -5871,8 +5958,8 @@ Updated Telugu Translation - po/te.po | 611 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 296 insertions(+), 315 deletions(-) + po/te.po | 611 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 296 insertions(+), 315 deletions(-) commit e551dfcb9b8f7804425fe64d2ffcbeb1c52c39c3 Author: Sandeep Shedmake @@ -5880,8 +5967,8 @@ Updated Marathi Translations - po/mr.po | 715 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 329 insertions(+), 386 deletions(-) + po/mr.po | 715 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 329 insertions(+), 386 deletions(-) commit 1d1f9806fdf28b76f9cbe708625e1d2609551125 Author: Denis ARNAUD @@ -5889,10 +5976,10 @@ Updated breton translation - po/br.po | 188 ++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 files changed, 127 insertions(+), 61 deletions(-) + po/br.po | 188 ++++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 127 insertions(+), 61 deletions(-) -commit cc20082d1ce470759827ba7315ed5547ff3a385b +commit cc20082d1ce470759827ba7315ed5547ff3a385b (tag: GNOME_APPLETS_2_27_92) Author: Callum McKenzie Date: Tue Sep 8 22:43:04 2009 +1200 @@ -5901,11 +5988,11 @@ Release notes, plus disabling of make check for invest applet until I can get it working out of tree. - NEWS | 13 +++++++++++++ - configure.in | 2 +- - invest-applet/invest/Makefile.am | 2 +- - invest-applet/invest/__init__.py | 6 +++--- - invest-applet/invest/test.py | 6 ++++++ + NEWS | 13 +++++++++++++ + configure.in | 2 +- + invest-applet/invest/Makefile.am | 2 +- + invest-applet/invest/__init__.py | 6 +++--- + invest-applet/invest/test.py | 6 ++++++ 5 files changed, 24 insertions(+), 5 deletions(-) commit d90a6efd19f0a17f2a65dceb95f5378b1cdf83c2 @@ -5914,8 +6001,8 @@ UPdating for Punjabi - po/pa.po | 700 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 369 insertions(+), 331 deletions(-) + po/pa.po | 700 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 369 insertions(+), 331 deletions(-) commit 19101fc45ec87a71562118e120f75488b82aabb4 Author: Gabor Kelemen @@ -5923,8 +6010,8 @@ Hungarian translation updated - po/hu.po | 630 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 308 insertions(+), 322 deletions(-) + po/hu.po | 630 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 308 insertions(+), 322 deletions(-) commit 9471e04ee0cc8571103fa3e07fc562555f3bd4f8 Author: Enrico Minack @@ -5932,12 +6019,12 @@ invest-applet: Added more descriptive debug messages. - invest-applet/invest/__init__.py | 15 ++++++++++++--- - invest-applet/invest/chart.py | 6 +++--- - invest-applet/invest/invest-applet.py | 11 ++++++----- - invest-applet/invest/preferences.py | 5 +++-- - invest-applet/invest/quotes.py | 9 +++++---- - invest-applet/invest/widgets.py | 4 ++-- + invest-applet/invest/__init__.py | 15 ++++++++++++--- + invest-applet/invest/chart.py | 6 +++--- + invest-applet/invest/invest-applet.py | 11 ++++++----- + invest-applet/invest/preferences.py | 5 +++-- + invest-applet/invest/quotes.py | 9 +++++---- + invest-applet/invest/widgets.py | 4 ++-- 6 files changed, 31 insertions(+), 19 deletions(-) commit 93044cd1510e0e3fe83a9a321a221f5c844854f7 @@ -5946,8 +6033,8 @@ Updated Italian translation - po/it.po | 60 +++++++++++++++++++----------------------------------------- - 1 files changed, 19 insertions(+), 41 deletions(-) + po/it.po | 60 +++++++++++++++++++----------------------------------------- + 1 file changed, 19 insertions(+), 41 deletions(-) commit b19c7725825d6ed8b64263096f252691266eb0d8 Author: Luca Ferretti @@ -5955,57 +6042,57 @@ Add Behdad's git.mk to autogenerate .gitignore - Makefile.am | 2 + - accessx-status/Makefile.am | 2 + - accessx-status/docs/Makefile.am | 2 + - accessx-status/pixmaps/Makefile.am | 2 + - battstat/Makefile.am | 2 + - battstat/apmlib/Makefile.am | 2 + - battstat/docs/Makefile.am | 2 + - battstat/sounds/Makefile.am | 2 + - charpick/Makefile.am | 2 + - charpick/help/Makefile.am | 2 + - cpufreq/Makefile.am | 2 + - cpufreq/help/Makefile.am | 2 + - cpufreq/pixmaps/Makefile.am | 2 + - cpufreq/src/Makefile.am | 2 + - cpufreq/src/cpufreq-selector/Makefile.am | 2 + - drivemount/Makefile.am | 2 + - drivemount/help/Makefile.am | 2 + - geyes/Makefile.am | 2 + - geyes/docs/Makefile.am | 2 + - geyes/themes/Makefile.am | 2 + - git.mk | 183 ++++++++++++++++++++++++++++++ - gkb-new/Makefile.am | 2 + - gkb-new/xmodmap.sun/Makefile.am | 2 + - gkb-new/xmodmap/Makefile.am | 2 + - gswitchit/Makefile.am | 2 + - gswitchit/help/Makefile.am | 2 + - gweather/Makefile.am | 2 + - gweather/docs/Makefile.am | 2 + - invest-applet/Makefile.am | 2 + - invest-applet/data/Makefile.am | 2 + - invest-applet/data/art/Makefile.am | 2 + - invest-applet/docs/Makefile.am | 2 + - invest-applet/invest/Makefile.am | 2 + - man/Makefile.am | 2 + - mini-commander/Makefile.am | 2 + - mini-commander/help/Makefile.am | 2 + - mini-commander/src/Makefile.am | 2 + - mixer/Makefile.am | 2 + - mixer/docs/Makefile.am | 2 + - modemlights/Makefile.am | 2 + - multiload/Makefile.am | 2 + - multiload/docs/Makefile.am | 2 + - null_applet/Makefile.am | 2 + - stickynotes/Makefile.am | 2 + - stickynotes/data/Makefile.am | 2 + - stickynotes/docs/Makefile.am | 2 + - stickynotes/pixmaps/Makefile.am | 2 + - trashapplet/Makefile.am | 2 + - trashapplet/docs/Makefile.am | 2 + - trashapplet/src/Makefile.am | 2 + - 50 files changed, 281 insertions(+), 0 deletions(-) + Makefile.am | 2 + + accessx-status/Makefile.am | 2 + + accessx-status/docs/Makefile.am | 2 + + accessx-status/pixmaps/Makefile.am | 2 + + battstat/Makefile.am | 2 + + battstat/apmlib/Makefile.am | 2 + + battstat/docs/Makefile.am | 2 + + battstat/sounds/Makefile.am | 2 + + charpick/Makefile.am | 2 + + charpick/help/Makefile.am | 2 + + cpufreq/Makefile.am | 2 + + cpufreq/help/Makefile.am | 2 + + cpufreq/pixmaps/Makefile.am | 2 + + cpufreq/src/Makefile.am | 2 + + cpufreq/src/cpufreq-selector/Makefile.am | 2 + + drivemount/Makefile.am | 2 + + drivemount/help/Makefile.am | 2 + + geyes/Makefile.am | 2 + + geyes/docs/Makefile.am | 2 + + geyes/themes/Makefile.am | 2 + + git.mk | 183 +++++++++++++++++++++++++++++++ + gkb-new/Makefile.am | 2 + + gkb-new/xmodmap.sun/Makefile.am | 2 + + gkb-new/xmodmap/Makefile.am | 2 + + gswitchit/Makefile.am | 2 + + gswitchit/help/Makefile.am | 2 + + gweather/Makefile.am | 2 + + gweather/docs/Makefile.am | 2 + + invest-applet/Makefile.am | 2 + + invest-applet/data/Makefile.am | 2 + + invest-applet/data/art/Makefile.am | 2 + + invest-applet/docs/Makefile.am | 2 + + invest-applet/invest/Makefile.am | 2 + + man/Makefile.am | 2 + + mini-commander/Makefile.am | 2 + + mini-commander/help/Makefile.am | 2 + + mini-commander/src/Makefile.am | 2 + + mixer/Makefile.am | 2 + + mixer/docs/Makefile.am | 2 + + modemlights/Makefile.am | 2 + + multiload/Makefile.am | 2 + + multiload/docs/Makefile.am | 2 + + null_applet/Makefile.am | 2 + + stickynotes/Makefile.am | 2 + + stickynotes/data/Makefile.am | 2 + + stickynotes/docs/Makefile.am | 2 + + stickynotes/pixmaps/Makefile.am | 2 + + trashapplet/Makefile.am | 2 + + trashapplet/docs/Makefile.am | 2 + + trashapplet/src/Makefile.am | 2 + + 50 files changed, 281 insertions(+) commit 2234307c31d0bc479b9c9415374ab2608ff7f5f2 Author: Yaron Shahrabani @@ -6013,8 +6100,8 @@ Updated Hebrew translation - po/he.po | 47 +++++++++++++++++++++++------------------------ - 1 files changed, 23 insertions(+), 24 deletions(-) + po/he.po | 47 +++++++++++++++++++++++------------------------ + 1 file changed, 23 insertions(+), 24 deletions(-) commit 5683847336e20e5c287712356dbabaa51acae907 Author: Claude Paroz @@ -6022,8 +6109,8 @@ Improved French translation - po/fr.po | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) + po/fr.po | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) commit e4f60853ecce56a117d5330056dd1f177f0ee347 Author: Sweta Kothari @@ -6031,8 +6118,8 @@ Updated Gujarati Translations - po/gu.po | 590 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 293 insertions(+), 297 deletions(-) + po/gu.po | 590 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 293 insertions(+), 297 deletions(-) commit 0040a5c8ee2f5f7b87fed4be969ed97bbb5b6042 Author: Runa Bhattacharjee @@ -6040,8 +6127,8 @@ Updated Bengali India Translations - po/bn_IN.po | 90 ++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 49 insertions(+), 41 deletions(-) + po/bn_IN.po | 90 +++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 49 insertions(+), 41 deletions(-) commit 8779eb13f30c501ced779ece85d2bd52ce55d548 Author: Duarte Loreto @@ -6049,8 +6136,8 @@ Updated Portuguese translation - po/pt.po | 636 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 326 insertions(+), 310 deletions(-) + po/pt.po | 636 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 326 insertions(+), 310 deletions(-) commit 9d648ea33db33a4f2d7944c8223a46e0a61824a0 Author: Baris Cicek @@ -6058,8 +6145,8 @@ Updated Turkish translaion. - po/tr.po | 1629 ++++++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 908 insertions(+), 721 deletions(-) + po/tr.po | 1629 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 908 insertions(+), 721 deletions(-) commit 7a06196213334fdeb953eb4c80f0543a4540b8ee Author: Tomasz Dominikowski @@ -6068,7 +6155,7 @@ Updated Polish translation po/pl.po | 1082 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 510 insertions(+), 572 deletions(-) + 1 file changed, 510 insertions(+), 572 deletions(-) commit 84dbf32041dbb577d2983ed1f5a0697362143e23 Author: Claude Paroz @@ -6076,8 +6163,8 @@ Updated French translation - po/fr.po | 50 +++++++++++++++++++++++++++++--------------------- - 1 files changed, 29 insertions(+), 21 deletions(-) + po/fr.po | 50 +++++++++++++++++++++++++++++--------------------- + 1 file changed, 29 insertions(+), 21 deletions(-) commit 6cdb89106f5c0f3a4f0e4f4224dcb82e80558c35 Author: Callum McKenzie @@ -6088,8 +6175,8 @@ Its the all too common no return value from a timer callback bug. Patch from Enrico Minack. Fixes bug 571033. - invest-applet/invest/quotes.py | 41 ++++++++++++++++++++------------------- - 1 files changed, 21 insertions(+), 20 deletions(-) + invest-applet/invest/quotes.py | 41 +++++++++++++++++++++-------------------- + 1 file changed, 21 insertions(+), 20 deletions(-) commit 7699f4796b86f3d592e91c769478b2d7db7e8b6c Author: mpopovic@git.gnome.org @@ -6097,8 +6184,8 @@ Updated Serbian translation - po/sr.po | 497 +++++++++++++++++++++++++++++--------------------------- - po/sr@latin.po | 497 +++++++++++++++++++++++++++++--------------------------- + po/sr.po | 497 ++++++++++++++++++++++++++++++--------------------------- + po/sr@latin.po | 497 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 520 insertions(+), 474 deletions(-) commit ac505a62fd335f4d2e7e697b81087e7cd158911a @@ -6107,8 +6194,8 @@ Updated Basque language - po/eu.po | 567 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 272 insertions(+), 295 deletions(-) + po/eu.po | 567 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 272 insertions(+), 295 deletions(-) commit 5785be8859d10d53658a861f09c8f94210598c12 Author: Ani @@ -6116,8 +6203,8 @@ Updated Malayalam Translations - po/ml.po | 665 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 334 insertions(+), 331 deletions(-) + po/ml.po | 665 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 334 insertions(+), 331 deletions(-) commit 418bacd2b71800c7dc2ee143be5a0e4e318bc023 Author: Jonh Wendell @@ -6125,8 +6212,8 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 24 +++++++++++------------- - 1 files changed, 11 insertions(+), 13 deletions(-) + po/pt_BR.po | 24 +++++++++++------------- + 1 file changed, 11 insertions(+), 13 deletions(-) commit 220ee74c69fa1201edce0f5964bbba10606c1dbb Author: ifelix @@ -6134,18 +6221,18 @@ Updated Tamil Translations - po/ta.po | 101 ++++++++++++++++---------------------------------------------- - 1 files changed, 26 insertions(+), 75 deletions(-) + po/ta.po | 101 ++++++++++++++++----------------------------------------------- + 1 file changed, 26 insertions(+), 75 deletions(-) -commit a5b0837cc14072f28ede3e90ab0f829231fc3802 +commit a5b0837cc14072f28ede3e90ab0f829231fc3802 (tag: GNOME_APPLETS_2_27_91) Author: Callum McKenzie Date: Tue Aug 25 21:21:51 2009 +1200 GNOME 2.27.91 - NEWS | 17 +++++++++++++++++ - configure.in | 2 +- - 2 files changed, 18 insertions(+), 1 deletions(-) + NEWS | 17 +++++++++++++++++ + configure.in | 2 +- + 2 files changed, 18 insertions(+), 1 deletion(-) commit 5834bebe8f2ad0aa24951db6398f1f7d746a5bff Author: Carles Ferrando @@ -6155,7 +6242,7 @@ po/LINGUAS | 1 + po/ca@valencia.po | 3736 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 3737 insertions(+), 0 deletions(-) + 2 files changed, 3737 insertions(+) commit 63375322c345af7662e61868e0150ace885f7e38 Author: Daniel Nylander @@ -6163,8 +6250,8 @@ Updated Swedish translation - po/sv.po | 35 +++++++++++++++++------------------ - 1 files changed, 17 insertions(+), 18 deletions(-) + po/sv.po | 35 +++++++++++++++++------------------ + 1 file changed, 17 insertions(+), 18 deletions(-) commit 028473471d16eb23a1526ebc37e77df7ca7926d1 Author: Changwoo Ryu @@ -6172,8 +6259,8 @@ Update Korean translation - po/ko.po | 566 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 265 insertions(+), 301 deletions(-) + po/ko.po | 566 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 265 insertions(+), 301 deletions(-) commit af7478ac915379268dac1aa2e9539e719003dfca Author: Mario Blättermann @@ -6181,8 +6268,8 @@ Fixed bug #591916 - trashapplet/docs/de/de.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + trashapplet/docs/de/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 819cab74aca8eb0cb70241bec60636870ce8d5a8 Author: Kjartan Maraas @@ -6190,8 +6277,8 @@ Updated Norwegian bokmål translation. - po/nb.po | 37 ++++++++++++++++++------------------- - 1 files changed, 18 insertions(+), 19 deletions(-) + po/nb.po | 37 ++++++++++++++++++------------------- + 1 file changed, 18 insertions(+), 19 deletions(-) commit 8688a643ea8ff5b0b39814310538a9c2bd3a7f96 Author: Khaled Hosny @@ -6199,8 +6286,8 @@ Updated Arabic translation - po/ar.po | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) + po/ar.po | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) commit c78bf1459b818cf8f263c029b4e15aab6d5a98ae Author: Ivar Smolin @@ -6208,8 +6295,8 @@ Updating Estonian translation - po/et.po | 19 +++++++++---------- - 1 files changed, 9 insertions(+), 10 deletions(-) + po/et.po | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) commit 2020ebc94e47144ac5a992e12172292a7ad1c104 Author: Khaled Hosny @@ -6218,7 +6305,7 @@ Updated Arabic translation po/ar.po | 1719 +++++++++++++++++++++++++++++++++++++++++--------------------- - 1 files changed, 1139 insertions(+), 580 deletions(-) + 1 file changed, 1139 insertions(+), 580 deletions(-) commit 8e0777ff437e0afb2504679c9cb30c679766b8f8 Author: Theppitak Karoonboonyanan @@ -6226,8 +6313,8 @@ Updated Thai translation. - po/th.po | 639 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 328 insertions(+), 311 deletions(-) + po/th.po | 639 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 328 insertions(+), 311 deletions(-) commit 4ad39871f9478b798afd514062088f28127bf805 Author: Antón Méixome @@ -6235,8 +6322,8 @@ Updated Galician Translation - po/gl.po | 94 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 47 insertions(+), 47 deletions(-) + po/gl.po | 94 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 47 insertions(+), 47 deletions(-) commit f2a00a0f3a6b52eb3827da7c425fa0980c1ff50b Author: Alexander Shopov @@ -6244,8 +6331,8 @@ Updated Bulgarian translation - po/bg.po | 411 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 190 insertions(+), 221 deletions(-) + po/bg.po | 411 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 190 insertions(+), 221 deletions(-) commit b758c6dc583a356681d8e803863cc89f4d64dbb3 Author: Tommi Vainikainen @@ -6253,8 +6340,8 @@ Updated Finnish translation - po/fi.po | 23 +++++++++++------------ - 1 files changed, 11 insertions(+), 12 deletions(-) + po/fi.po | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) commit 22c07a80bd1263ca5a48786f31b38a57eba9b21f Author: Milo Casagrande @@ -6263,8 +6350,8 @@ Updated Italian translation * Fixes part of bug 591923 - geyes/docs/it/it.po | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) + geyes/docs/it/it.po | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) commit f08b2bd3b68fa575f4f3ccbfd84572dff4d84d7b Author: Jorge González @@ -6272,8 +6359,8 @@ Updated Spanish translation - po/es.po | 37 ++++++++++++++++++------------------- - 1 files changed, 18 insertions(+), 19 deletions(-) + po/es.po | 37 ++++++++++++++++++------------------- + 1 file changed, 18 insertions(+), 19 deletions(-) commit 1d110723a0d47d990308e957323c46b03af1b4e4 Author: Seán de Búrca @@ -6281,8 +6368,8 @@ Updated Irish translation - po/ga.po | 59 +++++++++++++++++++++++++++++------------------------------ - 1 files changed, 29 insertions(+), 30 deletions(-) + po/ga.po | 59 +++++++++++++++++++++++++++++------------------------------ + 1 file changed, 29 insertions(+), 30 deletions(-) commit 99024034292b85f28a9f2973e5b6557229e50589 Author: Callum McKenzie @@ -6293,8 +6380,8 @@ It turns out gettext isn't as smart as I gave it credit for. See bug 591904. - trashapplet/src/trash-empty.c | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) + trashapplet/src/trash-empty.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) commit ac5f1ab07308d5ed7677b2e905c732b873fa77ea Author: Krix Apolinário @@ -6304,8 +6391,8 @@ Reviewed by Djavan Fagundes. - po/pt_BR.po | 474 +++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 250 insertions(+), 224 deletions(-) + po/pt_BR.po | 474 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 250 insertions(+), 224 deletions(-) commit 7ea575bfe54050745b5ffc858a176ceec3d8fa12 Author: Andre Klapper @@ -6313,8 +6400,8 @@ Updated Czech translation. - po/cs.po | 467 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 248 insertions(+), 219 deletions(-) + po/cs.po | 467 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 248 insertions(+), 219 deletions(-) commit 6b0f2e12326f50aaf932442cd8017aa17e8980af Author: Tommi Vainikainen @@ -6322,8 +6409,8 @@ Updated Finnish translation - po/fi.po | 33 +++++++++++++++++++-------------- - 1 files changed, 19 insertions(+), 14 deletions(-) + po/fi.po | 33 +++++++++++++++++++-------------- + 1 file changed, 19 insertions(+), 14 deletions(-) commit feadfacced466026d7565a2b3e5ad67ce5865a9a Author: Rajesh Ranjan @@ -6331,8 +6418,8 @@ hindi update - po/hi.po | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + po/hi.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 412a3d4bf522e891e8649c2ab1d185af9f42aaf8 Author: Rajesh Ranjan @@ -6340,8 +6427,8 @@ hindi update - po/hi.po | 298 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 138 insertions(+), 160 deletions(-) + po/hi.po | 298 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 138 insertions(+), 160 deletions(-) commit b9ca2c4e5d94015c1882fd7b834da80c615d3b43 Author: Matthias Clasen @@ -6351,15 +6438,15 @@ Fixes bgo#585307. - configure.in | 21 +-- - cpufreq/src/Makefile.am | 8 - - cpufreq/src/cpufreq-selector.c | 118 ++----------- - cpufreq/src/cpufreq-selector/Makefile.am | 2 +- - .../cpufreq-selector/cpufreq-selector-service.c | 187 ++++++++------------ - .../cpufreq-selector/cpufreq-selector-service.h | 2 + - .../cpufreq-selector/cpufreq-selector-service.xml | 7 +- - .../org.gnome.cpufreqselector.policy.in | 2 +- - cpufreq/src/cpufreq-utils.c | 122 +++---------- + configure.in | 21 +-- + cpufreq/src/Makefile.am | 8 - + cpufreq/src/cpufreq-selector.c | 118 ++----------- + cpufreq/src/cpufreq-selector/Makefile.am | 2 +- + .../cpufreq-selector/cpufreq-selector-service.c | 187 +++++++++------------ + .../cpufreq-selector/cpufreq-selector-service.h | 2 + + .../cpufreq-selector/cpufreq-selector-service.xml | 7 +- + .../org.gnome.cpufreqselector.policy.in | 2 +- + cpufreq/src/cpufreq-utils.c | 122 +++----------- 9 files changed, 129 insertions(+), 340 deletions(-) commit 574b6bc734964b56529bcf9324588e79d1cbcc75 @@ -6368,8 +6455,8 @@ Updated Oriya Translation - po/or.po | 437 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 217 insertions(+), 220 deletions(-) + po/or.po | 437 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 217 insertions(+), 220 deletions(-) commit c7cc33a931be25a365073ad1c602ee4c64fab1a6 Author: Callum McKenzie @@ -6380,8 +6467,8 @@ Bug 582766. As pointed out by Enrico Minack, the 5 year option is available, but not the 3 year option. So just replace it. - invest-applet/data/financialchart.ui | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + invest-applet/data/financialchart.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit cb93221752fa919c9c6d25dabb3d8ca05a5b1e91 Author: Callum McKenzie @@ -6392,8 +6479,8 @@ Gets around some gconf weirdness and makes make dist-check succeed (whether this is for the right reasons remains to be seen). - mini-commander/src/mc-install-default-macros.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + mini-commander/src/mc-install-default-macros.c | 3 +++ + 1 file changed, 3 insertions(+) commit 0146c6d3bf9f38ce501c4da792bdaae28e68eca9 Author: Luca Ferretti @@ -6401,8 +6488,8 @@ Updated Italian translation - po/it.po | 510 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 274 insertions(+), 236 deletions(-) + po/it.po | 510 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 274 insertions(+), 236 deletions(-) commit 122fbab1dfab084578c56a2f6c8fde3940cd8d9a Author: Antón Méixome @@ -6410,8 +6497,8 @@ Updated Galician translation - po/gl.po | 781 +++++++++++++++++++++++++++----------------------------------- - 1 files changed, 340 insertions(+), 441 deletions(-) + po/gl.po | 781 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 340 insertions(+), 441 deletions(-) commit 1215439dd958bf3f1ff1325e2b0359b87d0b5e0e Author: Seán de Búrca @@ -6420,7 +6507,7 @@ Updated Irish translation po/ga.po | 1338 ++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 files changed, 903 insertions(+), 435 deletions(-) + 1 file changed, 903 insertions(+), 435 deletions(-) commit 66f766613e58be93b6dcb3ce3142d3cb3ce76386 Author: Seán de Búrca @@ -6428,9 +6515,9 @@ Remove useless Plural-Forms line which breaks build with gnome-doc-utils master - gweather/docs/el/el.po | 1 - - multiload/docs/el/el.po | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) + gweather/docs/el/el.po | 1 - + multiload/docs/el/el.po | 1 - + 2 files changed, 2 deletions(-) commit ac47d2bd54726732ad4553c30172cd897163d490 Author: Mario Blättermann @@ -6438,9 +6525,9 @@ Added screenshot to German translation - cpufreq/help/de/de.po | 2 +- - .../help/de/figures/cpufreq-applet-preferences.png | Bin 0 -> 21500 bytes - 2 files changed, 1 insertions(+), 1 deletions(-) + cpufreq/help/de/de.po | 2 +- + cpufreq/help/de/figures/cpufreq-applet-preferences.png | Bin 0 -> 21500 bytes + 2 files changed, 1 insertion(+), 1 deletion(-) commit 0182ce305e9a0268543ed2ba4d00e50528bd68b8 Author: Mario Blättermann @@ -6448,8 +6535,8 @@ Updated German translation - charpick/help/de/de.po | 456 +++++++++++++++++++++++++++++++++++++----------- - 1 files changed, 353 insertions(+), 103 deletions(-) + charpick/help/de/de.po | 456 ++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 353 insertions(+), 103 deletions(-) commit 30354c5143212a70197668e74bc9a345eff86b8a Author: Mario Blättermann @@ -6457,8 +6544,8 @@ Removed unneeded image - mini-commander/help/de/figures/command-line.png | Bin 1068 -> 0 bytes - 1 files changed, 0 insertions(+), 0 deletions(-) + mini-commander/help/de/figures/command-line.png | Bin 1068 -> 0 bytes + 1 file changed, 0 insertions(+), 0 deletions(-) commit 341babc0895e10524dee69e4ae3be225a2996a07 Author: Mario Blättermann @@ -6466,9 +6553,9 @@ Updated German translation - mini-commander/help/de/de.po | 195 +++++++++++------------ - mini-commander/help/de/figures/prefs-macros.png | Bin 0 -> 36556 bytes - mini-commander/help/de/figures/prefs.png | Bin 0 -> 29850 bytes + mini-commander/help/de/de.po | 195 ++++++++++++------------ + mini-commander/help/de/figures/prefs-macros.png | Bin 0 -> 36556 bytes + mini-commander/help/de/figures/prefs.png | Bin 0 -> 29850 bytes 3 files changed, 96 insertions(+), 99 deletions(-) commit 03b89322781176843234bd4984565f8f40c8122c @@ -6477,8 +6564,8 @@ Updated Norwegian bokmål translation. - po/nb.po | 85 +++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 46 insertions(+), 39 deletions(-) + po/nb.po | 85 +++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 46 insertions(+), 39 deletions(-) commit 4680e804a4ac2b7edab0c85728e72f8f9e1e7195 Author: Denis Arnaud @@ -6486,8 +6573,8 @@ Added br in LINGUAS file - po/LINGUAS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + 1 file changed, 1 insertion(+) commit 980f0f886636d1e27cc1be6884004c0bb95a2953 Author: Denis Arnaud @@ -6496,7 +6583,7 @@ Updated breton translation po/br.po | 3470 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 3470 insertions(+), 0 deletions(-) + 1 file changed, 3470 insertions(+) commit ee8dc6bc1177d6b10a750bc18087284843c5f93e Author: Daniel Nylander @@ -6504,8 +6591,8 @@ Updated Swedish translation - po/sv.po | 22 +++++++++++++--------- - 1 files changed, 13 insertions(+), 9 deletions(-) + po/sv.po | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) commit e5c278475c6baace8622cad3cb00c37a8d14deed Author: Ivar Smolin @@ -6513,18 +6600,18 @@ Updating Estonian translation - po/et.po | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) + po/et.po | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) -commit 5cb77cdb1802bece4da47c980178d89a8a11fe77 +commit 5cb77cdb1802bece4da47c980178d89a8a11fe77 (tag: GNOME_APPLETS_2_27_4) Author: Callum McKenzie Date: Wed Jul 29 19:03:42 2009 +1200 General: 2.27.4 release notes and version bump - NEWS | 23 +++++++++++++++++++++++ - configure.in | 2 +- - 2 files changed, 24 insertions(+), 1 deletions(-) + NEWS | 23 +++++++++++++++++++++++ + configure.in | 2 +- + 2 files changed, 24 insertions(+), 1 deletion(-) commit a26d7452bc79f473ac5d72e980d8eb5902e99b2b Author: Callum McKenzie @@ -6535,8 +6622,8 @@ Don't remove the transitional GtikApplet .server file. Debian patch, see gnome:589428. - invest-applet/data/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + invest-applet/data/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 2fef58bad96c519a5710a4dd65db3a63a9331ef2 Author: drtvasudevan @@ -6544,8 +6631,8 @@ Updated Tamil translation - po/ta.po | 82 +++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 44 insertions(+), 38 deletions(-) + po/ta.po | 82 ++++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 44 insertions(+), 38 deletions(-) commit e2c60617f1ac4c040095d15da24402a1c7c0e192 Author: Petr Kovar @@ -6555,10 +6642,10 @@ Reviewed by: Lucas Lommer and Petr Kovar. - multiload/docs/Makefile.am | 2 +- - multiload/docs/cs/cs.po | 748 ++++++++++++++++++++ - .../docs/cs/figures/multiload-preferences.png | Bin 0 -> 40874 bytes - 3 files changed, 749 insertions(+), 1 deletions(-) + multiload/docs/Makefile.am | 2 +- + multiload/docs/cs/cs.po | 748 +++++++++++++++++++++ + .../docs/cs/figures/multiload-preferences.png | Bin 0 -> 40874 bytes + 3 files changed, 749 insertions(+), 1 deletion(-) commit ce76730c04caae9e69469651960112b12467dbee Author: Petr Kovar @@ -6566,14 +6653,14 @@ Added Czech help translation for battstat by Marek Cernocky - battstat/docs/Makefile.am | 2 +- - battstat/docs/cs/cs.po | 514 ++++++++++++++++++++ - .../docs/cs/figures/battstat-applet-expanded.png | Bin 0 -> 7687 bytes - battstat/docs/cs/figures/battstat-applet.png | Bin 0 -> 8089 bytes - battstat/docs/cs/figures/battstat-credits-hal.png | Bin 0 -> 44645 bytes - battstat/docs/cs/figures/battstat-preferences.png | Bin 0 -> 41874 bytes - battstat/docs/cs/figures/context-menu.png | Bin 0 -> 12487 bytes - 7 files changed, 515 insertions(+), 1 deletions(-) + battstat/docs/Makefile.am | 2 +- + battstat/docs/cs/cs.po | 514 +++++++++++++++++++++ + .../docs/cs/figures/battstat-applet-expanded.png | Bin 0 -> 7687 bytes + battstat/docs/cs/figures/battstat-applet.png | Bin 0 -> 8089 bytes + battstat/docs/cs/figures/battstat-credits-hal.png | Bin 0 -> 44645 bytes + battstat/docs/cs/figures/battstat-preferences.png | Bin 0 -> 41874 bytes + battstat/docs/cs/figures/context-menu.png | Bin 0 -> 12487 bytes + 7 files changed, 515 insertions(+), 1 deletion(-) commit c81842b3a168bfe945af53c575e8586ca1a2172e Author: Petr Kovar @@ -6581,13 +6668,13 @@ Updated Czech help translation for various applets by Marek Cernocky - accessx-status/docs/cs/cs.po | 348 +++++++++++++++++++++++++---------- - charpick/help/cs/cs.po | 40 +++-- - drivemount/help/cs/cs.po | 23 ++- - geyes/docs/cs/cs.po | 105 ++++++----- - gswitchit/help/cs/cs.po | 423 ++++++++++++++++++++++++++++++++---------- - mixer/docs/cs/cs.po | 163 +++++++++-------- - trashapplet/docs/cs/cs.po | 104 ++++++----- + accessx-status/docs/cs/cs.po | 348 +++++++++++++++++++++++++---------- + charpick/help/cs/cs.po | 40 ++-- + drivemount/help/cs/cs.po | 23 ++- + geyes/docs/cs/cs.po | 105 ++++++----- + gswitchit/help/cs/cs.po | 423 +++++++++++++++++++++++++++++++++---------- + mixer/docs/cs/cs.po | 163 +++++++++-------- + trashapplet/docs/cs/cs.po | 104 ++++++----- 7 files changed, 818 insertions(+), 388 deletions(-) commit 297e4139a58654fbfcefd73fa1cbfc411ffe086e @@ -6596,8 +6683,8 @@ Updated Hebrew translation - po/he.po | 542 +++++++++++++++++++++++++++----------------------------------- - 1 files changed, 236 insertions(+), 306 deletions(-) + po/he.po | 542 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 236 insertions(+), 306 deletions(-) commit 39ed34268f5f29212b8f9c1b9b98596c0843ef99 Author: Jorge González @@ -6605,8 +6692,8 @@ Updated Spanish translation - po/es.po | 21 ++++++++++++--------- - 1 files changed, 12 insertions(+), 9 deletions(-) + po/es.po | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) commit e3f343127a8626d42b7fb16f9eb1ca7749ecb52a Merge: e286e49 fb6862e @@ -6624,11 +6711,11 @@ A contribution from Enrico Minack to allow user-supplied labels to be used instead of the stock symbol. - invest-applet/invest/__init__.py | 28 ++++++++++++++++++++++++++++ - invest-applet/invest/preferences.py | 32 ++++++++++++++++++-------------- - invest-applet/invest/quotes.py | 27 +++++++++++++++++---------- - invest-applet/invest/test.py | 2 +- - invest-applet/invest/widgets.py | 22 +++++++++++++++------- + invest-applet/invest/__init__.py | 28 ++++++++++++++++++++++++++++ + invest-applet/invest/preferences.py | 32 ++++++++++++++++++-------------- + invest-applet/invest/quotes.py | 27 +++++++++++++++++---------- + invest-applet/invest/test.py | 2 +- + invest-applet/invest/widgets.py | 22 +++++++++++++++------- 5 files changed, 79 insertions(+), 32 deletions(-) commit e286e49b5a9f1ed6fe8d3de8fd7b2e51c1ff527a @@ -6637,8 +6724,8 @@ Updated Swedish translation - po/sv.po | 39 +++++++++++++++++++++------------------ - 1 files changed, 21 insertions(+), 18 deletions(-) + po/sv.po | 39 +++++++++++++++++++++------------------ + 1 file changed, 21 insertions(+), 18 deletions(-) commit f318b474129c34ff262f5c75d7f32bf03417e3d0 Author: Callum McKenzie @@ -6650,8 +6737,8 @@ whatever its void return value returned. Should fix bug 589213, I think the report of every 1 seconds in that case might be mistaken. - stickynotes/stickynotes.c | 4 +++- - stickynotes/stickynotes.h | 4 ++-- + stickynotes/stickynotes.c | 4 +++- + stickynotes/stickynotes.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) commit b439c6cd1a469b4de979a7da59324fa33e264e65 @@ -6660,8 +6747,8 @@ Updated Hebrew translation - po/he.po | 760 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 408 insertions(+), 352 deletions(-) + po/he.po | 760 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 408 insertions(+), 352 deletions(-) commit ad6ce9aa1d3b184aad5e00a7e5227459cf74704b Author: Claude Paroz @@ -6669,8 +6756,8 @@ Removed obsolete script - po/update.sh | 45 --------------------------------------------- - 1 files changed, 0 insertions(+), 45 deletions(-) + po/update.sh | 45 --------------------------------------------- + 1 file changed, 45 deletions(-) commit 2b6230ed36529cba62b75e52b8282d8517205970 Author: Ilkka Tuohela @@ -6678,8 +6765,8 @@ Updated Finnish translation - po/fi.po | 607 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 315 insertions(+), 292 deletions(-) + po/fi.po | 607 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 315 insertions(+), 292 deletions(-) commit 6df48d5c1b0d47b7f1fd387f05c98a0183e19da1 Author: Chao-Hsiung Liao @@ -6687,8 +6774,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 598 +++++++++++++++++++++++++++++++---------------------------- - po/zh_TW.po | 598 +++++++++++++++++++++++++++++++---------------------------- + po/zh_HK.po | 598 +++++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 598 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 628 insertions(+), 568 deletions(-) commit d22641075368cd33ae8233c32c0de89a14842efb @@ -6697,8 +6784,8 @@ Updated Spanish translation - po/es.po | 114 +++++++++++++++++++++++++++---------------------------------- - 1 files changed, 51 insertions(+), 63 deletions(-) + po/es.po | 114 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 51 insertions(+), 63 deletions(-) commit 61e76a842876f8c2cd9e8933ae3b10baddfcc3fd Author: Callum McKenzie @@ -6709,8 +6796,8 @@ Previously the check used ChangeLog and we switched to Makefile.am. This update fixes a missed case. - invest-applet/invest/__init__.py | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + invest-applet/invest/__init__.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) commit 369caed944a16da36605080fa4241787ccdbc47a Author: Callum McKenzie @@ -6721,8 +6808,8 @@ Patch from Claude Paroz. See bug 588683. Also, rework the other message in the trash emptying dialog to remove an old FIXME. - trashapplet/src/trash-empty.c | 28 +++++++++++++--------------- - 1 files changed, 13 insertions(+), 15 deletions(-) + trashapplet/src/trash-empty.c | 28 +++++++++++++--------------- + 1 file changed, 13 insertions(+), 15 deletions(-) commit 94b465a4c85f1d98b54a395f4e9b06da38a30d44 Author: Jonathan Ernst @@ -6730,8 +6817,8 @@ Updated French translation - po/fr.po | 523 +++++++++++++++++++++++++++++--------------------------------- - 1 files changed, 246 insertions(+), 277 deletions(-) + po/fr.po | 523 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 246 insertions(+), 277 deletions(-) commit 65d7d63a5436d5a989d61da27771a1fe7a18054c Author: Ivar Smolin @@ -6739,8 +6826,8 @@ Updating Estonian translation - po/et.po | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) + po/et.po | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) commit 115801365e0f3f33a09bb6452d0ad60fc450983b Author: Callum McKenzie @@ -6750,8 +6837,8 @@ Patch from Enrico Minack. Fixes bug 450176. - invest-applet/invest/preferences.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + invest-applet/invest/preferences.py | 2 ++ + 1 file changed, 2 insertions(+) commit 6c77ab3d9c189bae30f5b7cee25a63fddbe41018 Author: Callum McKenzie @@ -6762,8 +6849,8 @@ Nice patch from Enrico Minack to make adding a new stock more intuitive. See bug 473706. - invest-applet/invest/preferences.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + invest-applet/invest/preferences.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit 3541818f77407b62ce128ecf9dafac344540bd76 Author: Callum McKenzie @@ -6775,8 +6862,8 @@ is checked to detect an uninstalled version since ChangeLog has been removed. We now use Makefile.am. - invest-applet/invest/invest-applet.py | 22 +++++++++--------- - invest-applet/invest/widgets.py | 37 +++++++++++++++++---------------- + invest-applet/invest/invest-applet.py | 22 ++++++++++----------- + invest-applet/invest/widgets.py | 37 ++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 29 deletions(-) commit 8b0a283e1bb7aee43a7b97cf0d6cae1810b29b9a @@ -6787,8 +6874,8 @@ Patch from Enrico Minack. Fixes bug 555789. - invest-applet/invest/preferences.py | 40 +++++++++++++++++----------------- - 1 files changed, 20 insertions(+), 20 deletions(-) + invest-applet/invest/preferences.py | 40 ++++++++++++++++++------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) commit 5b26d3b1392d84a2277934f941e3bbdb086afe4b Author: Maxim V. Dziumanenko @@ -6797,7 +6884,7 @@ Updated Ukrainian translation po/uk.po | 1114 +++++++++++++++++++++++++++++++++----------------------------- - 1 files changed, 587 insertions(+), 527 deletions(-) + 1 file changed, 587 insertions(+), 527 deletions(-) commit 547db14a6fa8f6b8825fd4abf3b251215626aa63 Author: Daniel Nylander @@ -6805,8 +6892,8 @@ Updated Swedish translation - po/sv.po | 566 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 290 insertions(+), 276 deletions(-) + po/sv.po | 566 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 290 insertions(+), 276 deletions(-) commit a6b4d8e2e23418b5389ce2d46b4cfc278a967119 Author: Sergey V. Udaltsov @@ -6817,8 +6904,8 @@ Libxklavier changed API/ABI, all gnome modules are changed to use new version - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d98c933d870092d2318250d77f4d80003a7fccf9 Author: Timo Jyrinki @@ -6826,15 +6913,15 @@ Remove figures identical to original (but only those) from fi help - charpick/help/fi/figures/charpalette_applet.png | Bin 1797 -> 0 bytes - charpick/help/fi/figures/charpick_characters.png | Bin 36598 -> 0 bytes - .../fi/figures/cpufreq-applet-selector-both.png | Bin 7739 -> 0 bytes - .../help/fi/figures/cpufreq-applet-selector.png | Bin 8836 -> 0 bytes - .../help/fi/figures/drivemount-applet_example.png | Bin 1238 -> 0 bytes - geyes/docs/fi/figures/geyes_applet.png | Bin 1690 -> 0 bytes - gweather/docs/fi/figures/gweather_applet.png | Bin 1225 -> 0 bytes - mixer/docs/fi/figures/volumecontrol_applet.png | Bin 987 -> 0 bytes - .../fi/figures/system-monitor-applet_window.png | Bin 447 -> 0 bytes + charpick/help/fi/figures/charpalette_applet.png | Bin 1797 -> 0 bytes + charpick/help/fi/figures/charpick_characters.png | Bin 36598 -> 0 bytes + .../help/fi/figures/cpufreq-applet-selector-both.png | Bin 7739 -> 0 bytes + cpufreq/help/fi/figures/cpufreq-applet-selector.png | Bin 8836 -> 0 bytes + .../help/fi/figures/drivemount-applet_example.png | Bin 1238 -> 0 bytes + geyes/docs/fi/figures/geyes_applet.png | Bin 1690 -> 0 bytes + gweather/docs/fi/figures/gweather_applet.png | Bin 1225 -> 0 bytes + mixer/docs/fi/figures/volumecontrol_applet.png | Bin 987 -> 0 bytes + .../docs/fi/figures/system-monitor-applet_window.png | Bin 447 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) commit a40db0c098ccf1a8f66c5c6a1b8ce58d48de5ded @@ -6845,8 +6932,8 @@ Reviewed by: Petr Kovar. - stickynotes/docs/cs/cs.po | 532 +++++++++++++++++++++++++++++++++++---------- - 1 files changed, 418 insertions(+), 114 deletions(-) + stickynotes/docs/cs/cs.po | 532 ++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 418 insertions(+), 114 deletions(-) commit 70a123d125979ba85072fe31259749a92e1b654d Author: Petr Kovar @@ -6859,18 +6946,18 @@ Reviewed by: Lucas Lommer and Petr Kovar. - cpufreq/help/Makefile.am | 2 +- - cpufreq/help/cs/cs.po | 602 ++++++++++++++++++ - .../cs/figures/cpufreq-applet-preferences-smp.png | Bin 0 -> 9761 bytes - .../help/cs/figures/cpufreq-applet-preferences.png | Bin 0 -> 22936 bytes - gweather/docs/cs/cs.po | 641 +++++++++++++++----- - stickynotes/docs/Makefile.am | 2 +- - stickynotes/docs/cs/cs.po | 522 ++++++++++++++++ - .../docs/cs/figures/stickynote-right-menu-lock.png | Bin 0 -> 18805 bytes - .../docs/cs/figures/stickynote-right-menu-new.png | Bin 0 -> 17762 bytes - .../docs/cs/figures/stickynotes-note-prefs.png | Bin 0 -> 28228 bytes - stickynotes/docs/cs/figures/stickynotes-prefs.png | Bin 0 -> 40453 bytes - stickynotes/docs/cs/figures/stickynotes_applet.png | Bin 0 -> 26380 bytes + cpufreq/help/Makefile.am | 2 +- + cpufreq/help/cs/cs.po | 602 +++++++++++++++++++ + .../cs/figures/cpufreq-applet-preferences-smp.png | Bin 0 -> 9761 bytes + .../help/cs/figures/cpufreq-applet-preferences.png | Bin 0 -> 22936 bytes + gweather/docs/cs/cs.po | 641 +++++++++++++++------ + stickynotes/docs/Makefile.am | 2 +- + stickynotes/docs/cs/cs.po | 522 +++++++++++++++++ + .../docs/cs/figures/stickynote-right-menu-lock.png | Bin 0 -> 18805 bytes + .../docs/cs/figures/stickynote-right-menu-new.png | Bin 0 -> 17762 bytes + .../docs/cs/figures/stickynotes-note-prefs.png | Bin 0 -> 28228 bytes + stickynotes/docs/cs/figures/stickynotes-prefs.png | Bin 0 -> 40453 bytes + stickynotes/docs/cs/figures/stickynotes_applet.png | Bin 0 -> 26380 bytes 12 files changed, 1599 insertions(+), 170 deletions(-) commit c1fe05d7568f925ee5390580c24aa586b9d150b9 @@ -6881,8 +6968,8 @@ Use quoting and 'test' for the inner check. - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 658544741f42794c28c2919d974f0bb89bf15775 Author: drtvasudevan @@ -6890,8 +6977,8 @@ Updated Tamil translation - po/ta.po | 376 ++++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 194 insertions(+), 182 deletions(-) + po/ta.po | 376 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 194 insertions(+), 182 deletions(-) commit 664d9317256c30a116a4b1fd29a819b6cf9399e6 Author: Callum McKenzie @@ -6904,21 +6991,21 @@ from Luis Menina (see bug 560678) with mini-commander fixes by myself. The gswitchit applet does pass yet because of libgnomekbd. - gweather/gweather-dialog.h | 2 +- - gweather/gweather-pref.h | 2 +- - mini-commander/src/about.c | 2 +- - mini-commander/src/cmd_completion.h | 2 +- - mini-commander/src/command_line.c | 130 +++++++++++++--------------- - mini-commander/src/command_line.h | 4 +- - mini-commander/src/exec.c | 8 +- - mini-commander/src/exec.h | 2 +- - mini-commander/src/macro.h | 2 +- - mini-commander/src/mc-default-macros.h | 4 +- - mini-commander/src/mini-commander_applet.c | 53 +++++------- - mini-commander/src/mini-commander_applet.h | 4 +- - mini-commander/src/preferences.h | 2 +- - multiload/global.h | 2 +- - multiload/netspeed.h | 2 +- + gweather/gweather-dialog.h | 2 +- + gweather/gweather-pref.h | 2 +- + mini-commander/src/about.c | 2 +- + mini-commander/src/cmd_completion.h | 2 +- + mini-commander/src/command_line.c | 130 +++++++++++++---------------- + mini-commander/src/command_line.h | 4 +- + mini-commander/src/exec.c | 8 +- + mini-commander/src/exec.h | 2 +- + mini-commander/src/macro.h | 2 +- + mini-commander/src/mc-default-macros.h | 4 +- + mini-commander/src/mini-commander_applet.c | 53 +++++------- + mini-commander/src/mini-commander_applet.h | 4 +- + mini-commander/src/preferences.h | 2 +- + multiload/global.h | 2 +- + multiload/netspeed.h | 2 +- 15 files changed, 102 insertions(+), 119 deletions(-) commit a4615ac3f74d31442a7bda28435befe7d179af66 @@ -6932,8 +7019,8 @@ from Luis Menina (see bug 560678) with mini-commander fixes by myself. The gswitchit applet does pass yet because of libgnomekbd. - gswitchit/gswitchit-applet.c | 2 +- - gswitchit/gswitchit-applet.h | 5 ++--- + gswitchit/gswitchit-applet.c | 2 +- + gswitchit/gswitchit-applet.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) commit 70ac17ff0d3414be0a1f2ae1bba2f8972f77153e @@ -6944,15 +7031,15 @@ Reviewed by Petr Kovar. - gweather/docs/Makefile.am | 2 +- - gweather/docs/cs/cs.po | 744 ++++++++++++++++++++ - gweather/docs/cs/figures/gweather-details.png | Bin 0 -> 45235 bytes - gweather/docs/cs/figures/gweather-menu-prefs.png | Bin 0 -> 14772 bytes - .../docs/cs/figures/gweather-prefs-general.png | Bin 0 -> 44087 bytes - .../docs/cs/figures/gweather-prefs-locations.png | Bin 0 -> 35091 bytes - 6 files changed, 745 insertions(+), 1 deletions(-) + gweather/docs/Makefile.am | 2 +- + gweather/docs/cs/cs.po | 744 +++++++++++++++++++++ + gweather/docs/cs/figures/gweather-details.png | Bin 0 -> 45235 bytes + gweather/docs/cs/figures/gweather-menu-prefs.png | Bin 0 -> 14772 bytes + .../docs/cs/figures/gweather-prefs-general.png | Bin 0 -> 44087 bytes + .../docs/cs/figures/gweather-prefs-locations.png | Bin 0 -> 35091 bytes + 6 files changed, 745 insertions(+), 1 deletion(-) -commit adfe30575d677038f37718c67f0bf8741f1ff124 +commit adfe30575d677038f37718c67f0bf8741f1ff124 (tag: GNOME_APPLETS_2_27_3) Author: Callum McKenzie Date: Wed Jun 17 23:53:18 2009 +1200 @@ -6961,12 +7048,12 @@ In addition fixes where made to the zh_CN translations for various modules to pass XML validation. - NEWS | 112 +++++++++++++++---------- - configure.in | 2 +- - mixer/docs/zh_CN/zh_CN.po | 2 +- - po/POTFILES.skip | 13 +--- - stickynotes/docs/zh_CN/stickynotes_applet.xml | 6 +- - stickynotes/docs/zh_CN/zh_CN.po | 7 +- + NEWS | 112 ++++++++++++++++---------- + configure.in | 2 +- + mixer/docs/zh_CN/zh_CN.po | 2 +- + po/POTFILES.skip | 13 +-- + stickynotes/docs/zh_CN/stickynotes_applet.xml | 6 +- + stickynotes/docs/zh_CN/zh_CN.po | 7 +- 6 files changed, 78 insertions(+), 64 deletions(-) commit 48aa903f8edeccf6dab32d96cfc478c1145f2a9f @@ -6975,18 +7062,18 @@ Added zh_CN to DOC_LINGUAS, remove superfluous figures. - charpick/help/Makefile.am | 2 +- - charpick/help/zh_CN/figures/charpalette_applet.png | Bin 1797 -> 0 bytes - .../help/zh_CN/figures/charpalette_chargroup.png | Bin 1087 -> 0 bytes - charpick/help/zh_CN/figures/charpick_applet.png | Bin 229 -> 0 bytes - .../help/zh_CN/figures/charpick_characters.png | Bin 36598 -> 0 bytes - charpick/help/zh_CN/figures/charpick_chargroup.png | Bin 238 -> 0 bytes - .../help/zh_CN/figures/cpufreq-applet-selector.png | Bin 8836 -> 0 bytes - geyes/docs/Makefile.am | 2 +- - mini-commander/help/Makefile.am | 2 +- - mixer/docs/zh_CN/figures/mixer_applet.png | Bin 1078 -> 0 bytes - mixer/docs/zh_CN/figures/volumecontrol_applet.png | Bin 987 -> 0 bytes - multiload/docs/Makefile.am | 2 +- + charpick/help/Makefile.am | 2 +- + charpick/help/zh_CN/figures/charpalette_applet.png | Bin 1797 -> 0 bytes + charpick/help/zh_CN/figures/charpalette_chargroup.png | Bin 1087 -> 0 bytes + charpick/help/zh_CN/figures/charpick_applet.png | Bin 229 -> 0 bytes + charpick/help/zh_CN/figures/charpick_characters.png | Bin 36598 -> 0 bytes + charpick/help/zh_CN/figures/charpick_chargroup.png | Bin 238 -> 0 bytes + cpufreq/help/zh_CN/figures/cpufreq-applet-selector.png | Bin 8836 -> 0 bytes + geyes/docs/Makefile.am | 2 +- + mini-commander/help/Makefile.am | 2 +- + mixer/docs/zh_CN/figures/mixer_applet.png | Bin 1078 -> 0 bytes + mixer/docs/zh_CN/figures/volumecontrol_applet.png | Bin 987 -> 0 bytes + multiload/docs/Makefile.am | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) commit b67da0ec8ae4df68c357fe0c423f44ae02ec1d3c @@ -6995,8 +7082,8 @@ Updated Bengali India Translations - po/bn_IN.po | 546 +++++++++++++++++++++++++---------------------------------- - 1 files changed, 232 insertions(+), 314 deletions(-) + po/bn_IN.po | 546 ++++++++++++++++++++++++++---------------------------------- + 1 file changed, 232 insertions(+), 314 deletions(-) commit 87dedb73be688485358c8a2230bb6f08db45b3f3 Author: Mark Krapivner @@ -7005,7 +7092,7 @@ Updated Hebrew translation po/he.po | 1015 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 484 insertions(+), 531 deletions(-) + 1 file changed, 484 insertions(+), 531 deletions(-) commit 4d55c414f803d57b5b5058e42535feb54a3addcf Author: Manoj Kumar Giri @@ -7014,7 +7101,7 @@ Updated Hindi Translation po/hi.po | 2797 +++++++++++++++++++++----------------------------------------- - 1 files changed, 950 insertions(+), 1847 deletions(-) + 1 file changed, 950 insertions(+), 1847 deletions(-) commit d3fd1eefb8b3838f75a9e73b75ff088602242ae5 Author: Kjartan Maraas @@ -7022,8 +7109,8 @@ Updated Norwegian bokmål translation. - po/nb.po | 614 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 295 insertions(+), 319 deletions(-) + po/nb.po | 614 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 295 insertions(+), 319 deletions(-) commit ee9d029440d8483bb9cd2f87a60ea8ff1b412dd5 Author: Ivar Smolin @@ -7031,8 +7118,8 @@ Updating Estonian translation - po/et.po | 142 +++++++++++++++++++++++++------------------------------------ - 1 files changed, 58 insertions(+), 84 deletions(-) + po/et.po | 142 ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 58 insertions(+), 84 deletions(-) commit 39f781aef53ab2b4a5e279b8e86de70a9dc5ea7f Author: ifelix @@ -7040,8 +7127,8 @@ Tamil translation updated - po/ta.po | 222 +++++++++++++++++++++++++++++++------------------------------ - 1 files changed, 113 insertions(+), 109 deletions(-) + po/ta.po | 222 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 113 insertions(+), 109 deletions(-) commit a088122b6d0226eccfdc2db177a31b4365b97ab8 Author: Petr Kovar @@ -7052,10 +7139,10 @@ Added Czech translation of char-palette & drivemount help by Lucas Lommer. Reviewed by Petr Kovar. - charpick/help/Makefile.am | 2 +- - charpick/help/cs/cs.po | 668 +++++++++++++++++++++++++++++++++++++++++++ - drivemount/help/Makefile.am | 2 +- - drivemount/help/cs/cs.po | 483 +++++++++++++++++++++++++++++++ + charpick/help/Makefile.am | 2 +- + charpick/help/cs/cs.po | 668 ++++++++++++++++++++++++++++++++++++++++++++ + drivemount/help/Makefile.am | 2 +- + drivemount/help/cs/cs.po | 483 ++++++++++++++++++++++++++++++++ 4 files changed, 1153 insertions(+), 2 deletions(-) commit 27e658cc1af78b1c1613b991d9b60a9cfcdb537b @@ -7069,8 +7156,8 @@ a response of GTK_RESPONSE_CLOSE (the delete signal is handled elsewhere so we can ignore GTK_RESPONSE_DELETE_EVENT). - stickynotes/stickynotes.c | 78 ++++++++++++++-------------- - stickynotes/stickynotes_applet_callbacks.c | 32 ++++++------ + stickynotes/stickynotes.c | 78 +++++++++++++++--------------- + stickynotes/stickynotes_applet_callbacks.c | 32 ++++++------ 2 files changed, 55 insertions(+), 55 deletions(-) commit 765741b65d0c69fc3de6d113aae88b32b22e6128 @@ -7079,8 +7166,8 @@ Updated Spanish translation - charpick/help/es/es.po | 57 ++++++++++++++++++++++++++++++----------------- - 1 files changed, 36 insertions(+), 21 deletions(-) + charpick/help/es/es.po | 57 +++++++++++++++++++++++++++++++------------------- + 1 file changed, 36 insertions(+), 21 deletions(-) commit 203a48c11bbf209fa8465181bd6dbc182d04ca6f Author: Callum McKenzie @@ -7091,37 +7178,37 @@ Patch from Paul Cutler. See bug 577197. It adds a tag to each document. - accessx-status/docs/C/accessx-status.xml | 2 ++ - accessx-status/docs/eu/accessx-status.xml | 2 ++ - battstat/docs/C/battstat.xml | 2 ++ - battstat/docs/de/battstat.xml | 2 ++ - battstat/docs/eu/battstat.xml | 2 ++ - charpick/help/C/char-palette.xml | 2 ++ - charpick/help/de/char-palette.xml | 2 ++ - charpick/help/eu/char-palette.xml | 2 ++ - cpufreq/help/C/cpufreq-applet.xml | 2 ++ - drivemount/help/C/drivemount.xml | 2 ++ - drivemount/help/de/drivemount.xml | 2 ++ - drivemount/help/eu/drivemount.xml | 2 ++ - geyes/docs/C/geyes.xml | 2 ++ - geyes/docs/eu/geyes.xml | 2 ++ - gswitchit/help/C/gswitchit.xml | 2 ++ - gweather/docs/C/gweather.xml | 2 ++ - gweather/docs/de/gweather.xml | 2 ++ - gweather/docs/eu/gweather.xml | 2 ++ - gweather/docs/ko/gweather.xml | 2 ++ - invest-applet/docs/C/invest-applet.xml | 2 ++ - mixer/docs/C/mixer_applet2.xml | 2 ++ - mixer/docs/de/mixer_applet2.xml | 2 ++ - mixer/docs/eu/mixer_applet2.xml | 2 ++ - multiload/docs/C/multiload.xml | 2 ++ - multiload/docs/de/multiload.xml | 2 ++ - multiload/docs/eu/multiload.xml | 2 ++ - stickynotes/docs/C/stickynotes_applet.xml | 2 ++ - stickynotes/docs/de/stickynotes_applet.xml | 2 ++ - stickynotes/docs/eu/stickynotes_applet.xml | 2 ++ - stickynotes/docs/zh_CN/stickynotes_applet.xml | 8 +++++--- - trashapplet/docs/C/trashapplet.xml | 3 +++ + accessx-status/docs/C/accessx-status.xml | 2 ++ + accessx-status/docs/eu/accessx-status.xml | 2 ++ + battstat/docs/C/battstat.xml | 2 ++ + battstat/docs/de/battstat.xml | 2 ++ + battstat/docs/eu/battstat.xml | 2 ++ + charpick/help/C/char-palette.xml | 2 ++ + charpick/help/de/char-palette.xml | 2 ++ + charpick/help/eu/char-palette.xml | 2 ++ + cpufreq/help/C/cpufreq-applet.xml | 2 ++ + drivemount/help/C/drivemount.xml | 2 ++ + drivemount/help/de/drivemount.xml | 2 ++ + drivemount/help/eu/drivemount.xml | 2 ++ + geyes/docs/C/geyes.xml | 2 ++ + geyes/docs/eu/geyes.xml | 2 ++ + gswitchit/help/C/gswitchit.xml | 2 ++ + gweather/docs/C/gweather.xml | 2 ++ + gweather/docs/de/gweather.xml | 2 ++ + gweather/docs/eu/gweather.xml | 2 ++ + gweather/docs/ko/gweather.xml | 2 ++ + invest-applet/docs/C/invest-applet.xml | 2 ++ + mixer/docs/C/mixer_applet2.xml | 2 ++ + mixer/docs/de/mixer_applet2.xml | 2 ++ + mixer/docs/eu/mixer_applet2.xml | 2 ++ + multiload/docs/C/multiload.xml | 2 ++ + multiload/docs/de/multiload.xml | 2 ++ + multiload/docs/eu/multiload.xml | 2 ++ + stickynotes/docs/C/stickynotes_applet.xml | 2 ++ + stickynotes/docs/de/stickynotes_applet.xml | 2 ++ + stickynotes/docs/eu/stickynotes_applet.xml | 2 ++ + stickynotes/docs/zh_CN/stickynotes_applet.xml | 8 +++++--- + trashapplet/docs/C/trashapplet.xml | 3 +++ 31 files changed, 66 insertions(+), 3 deletions(-) commit eb8ef5faaac3142e51772164666088dbda830aeb @@ -7135,8 +7222,8 @@ were over-quoted. Now we use quadrigraphs (@<:@ and @:>@) to avoid problems later if the quote level gets changed. - configure.in | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) + configure.in | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) commit 7bd3d0e0e2b7e2310510bbf95f1a42179c43fc15 Author: Callum McKenzie @@ -7147,8 +7234,8 @@ Patch from Romain Perier to allow explicit disabling of NetworkManager support. See bug 578951. - configure.in | 23 +++++++++++++++-------- - 1 files changed, 15 insertions(+), 8 deletions(-) + configure.in | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) commit 5c59c5a56d735e9ed5c9bf5d1f957c80d1bd15e9 Author: Callum McKenzie @@ -7159,8 +7246,8 @@ These probably shouldn't be in git since they are generated. Pushing them into git anyway until I have time to check this out. - charpick/help/de/char-palette.xml | 4 ++-- - charpick/help/eu/char-palette.xml | 4 ++-- + charpick/help/de/char-palette.xml | 4 ++-- + charpick/help/eu/char-palette.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 34f7059f786b3c64fcdaa8828f6e6b96f656b09b @@ -7172,8 +7259,8 @@ Patch from Lucas Lommer to fix the documentation about adding palettes to the applet. See bug 584238. - charpick/help/C/char-palette.xml | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + charpick/help/C/char-palette.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit f8bd8fcf39b0286556ce321763a6ea3f79b1cc8e Author: Callum McKenzie @@ -7185,8 +7272,8 @@ in gweather. See bug #579098 for details. I believe this also fixes bugs 379422, and 565751. - gweather/gweather-applet.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + gweather/gweather-applet.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) commit fb2454e1aae19b5afb45c649d90e377fb0900adb Author: Callum McKenzie @@ -7198,57 +7285,57 @@ make dist time from the git logs. Automake recipe stolen from gnome- games. Commit message guidelines stolen from GTK+. - ChangeLog | 6702 ------------------------ - ChangeLog.README | 47 + - ChangeLog.old | 6702 ++++++++++++++++++++++++ - HACKING | 144 +- - Makefile.am | 16 +- - accessx-status/ChangeLog | 394 -- - accessx-status/ChangeLog.old | 394 ++ - accessx-status/docs/ChangeLog | 199 - - accessx-status/docs/ChangeLog.old | 199 + - battstat/ChangeLog | 1720 ------- - battstat/ChangeLog.old | 1720 +++++++ - charpick/ChangeLog | 1078 ---- - charpick/ChangeLog.old | 1078 ++++ - cpufreq/ChangeLog | 839 --- - cpufreq/ChangeLog.old | 839 +++ - cpufreq/help/ChangeLog | 139 - - cpufreq/help/ChangeLog.old | 139 + - drivemount/ChangeLog | 973 ---- - drivemount/ChangeLog.old | 973 ++++ - drivemount/help/ChangeLog | 153 - - drivemount/help/ChangeLog.old | 153 + - geyes/ChangeLog | 934 ---- - geyes/ChangeLog.old | 934 ++++ - geyes/docs/ChangeLog | 147 - - geyes/docs/ChangeLog.old | 147 + - gkb-new/ChangeLog | 1464 ------ - gkb-new/ChangeLog.old | 1464 ++++++ - gswitchit/ChangeLog | 629 --- - gswitchit/ChangeLog.old | 629 +++ - gweather/ChangeLog | 3385 ------------ - gweather/ChangeLog.old | 3385 ++++++++++++ - invest-applet/ChangeLog | 384 -- - invest-applet/ChangeLog.old | 384 ++ - mini-commander/ChangeLog | 1702 ------ - mini-commander/ChangeLog.old | 1702 ++++++ - mixer/ChangeLog | 1486 ------ - mixer/ChangeLog.old | 1486 ++++++ - modemlights/ChangeLog | 930 ---- - modemlights/ChangeLog.old | 930 ++++ - multiload/ChangeLog | 1368 ----- - multiload/ChangeLog.old | 1368 +++++ - null_applet/ChangeLog | 81 - - null_applet/ChangeLog.old | 81 + - po/ChangeLog |10218 ------------------------------------- - po/ChangeLog.old |10218 +++++++++++++++++++++++++++++++++++++ - stickynotes/ChangeLog | 1431 ------ - stickynotes/ChangeLog.old | 1431 ++++++ - trashapplet/ChangeLog | 651 --- - trashapplet/ChangeLog.old | 651 +++ - trashapplet/docs/ChangeLog | 58 - - trashapplet/docs/ChangeLog.old | 58 + + ChangeLog | 6702 ----------------------- + ChangeLog.README | 47 + + ChangeLog.old | 6702 +++++++++++++++++++++++ + HACKING | 144 +- + Makefile.am | 16 +- + accessx-status/ChangeLog | 394 -- + accessx-status/ChangeLog.old | 394 ++ + accessx-status/docs/ChangeLog | 199 - + accessx-status/docs/ChangeLog.old | 199 + + battstat/ChangeLog | 1720 ------ + battstat/ChangeLog.old | 1720 ++++++ + charpick/ChangeLog | 1078 ---- + charpick/ChangeLog.old | 1078 ++++ + cpufreq/ChangeLog | 839 --- + cpufreq/ChangeLog.old | 839 +++ + cpufreq/help/ChangeLog | 139 - + cpufreq/help/ChangeLog.old | 139 + + drivemount/ChangeLog | 973 ---- + drivemount/ChangeLog.old | 973 ++++ + drivemount/help/ChangeLog | 153 - + drivemount/help/ChangeLog.old | 153 + + geyes/ChangeLog | 934 ---- + geyes/ChangeLog.old | 934 ++++ + geyes/docs/ChangeLog | 147 - + geyes/docs/ChangeLog.old | 147 + + gkb-new/ChangeLog | 1464 ------ + gkb-new/ChangeLog.old | 1464 ++++++ + gswitchit/ChangeLog | 629 --- + gswitchit/ChangeLog.old | 629 +++ + gweather/ChangeLog | 3385 ------------ + gweather/ChangeLog.old | 3385 ++++++++++++ + invest-applet/ChangeLog | 384 -- + invest-applet/ChangeLog.old | 384 ++ + mini-commander/ChangeLog | 1702 ------ + mini-commander/ChangeLog.old | 1702 ++++++ + mixer/ChangeLog | 1486 ------ + mixer/ChangeLog.old | 1486 ++++++ + modemlights/ChangeLog | 930 ---- + modemlights/ChangeLog.old | 930 ++++ + multiload/ChangeLog | 1368 ----- + multiload/ChangeLog.old | 1368 +++++ + null_applet/ChangeLog | 81 - + null_applet/ChangeLog.old | 81 + + po/ChangeLog | 10218 ------------------------------------ + po/ChangeLog.old | 10218 ++++++++++++++++++++++++++++++++++++ + stickynotes/ChangeLog | 1431 ----- + stickynotes/ChangeLog.old | 1431 +++++ + trashapplet/ChangeLog | 651 --- + trashapplet/ChangeLog.old | 651 +++ + trashapplet/docs/ChangeLog | 58 - + trashapplet/docs/ChangeLog.old | 58 + 51 files changed, 37220 insertions(+), 37117 deletions(-) commit 464aa3b5861666d42ae094210436b003b369c4a3 @@ -7257,10 +7344,10 @@ Updated Spanish translation - po/es.po | 371 ++++++++++++++++++++++++++++++++++---------------------------- - 1 files changed, 202 insertions(+), 169 deletions(-) + po/es.po | 371 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 202 insertions(+), 169 deletions(-) -commit 75621994dcde381c5a410f170845bfaeaf743022 +commit 75621994dcde381c5a410f170845bfaeaf743022 (tag: GNOME_APPLETS_2_27_2) Author: Callum McKenzie Date: Tue May 26 22:40:06 2009 +1200 @@ -7268,8 +7355,8 @@ This is still 2.27.2. make distcheck is a wonderful thing. - battstat/docs/zh_CN/zh_CN.po | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) + battstat/docs/zh_CN/zh_CN.po | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) commit 7b368aa843f61fc71e04670e6577f3e6b82cd16c Author: Callum McKenzie @@ -7277,32 +7364,32 @@ The 2.27.2 release - ChangeLog | 2 ++ - NEWS | 34 ++++++++++++++++++++++++++++++++-- - accessx-status/ChangeLog | 2 ++ - accessx-status/docs/ChangeLog | 2 ++ - battstat/ChangeLog | 2 ++ - charpick/ChangeLog | 2 ++ - configure.in | 6 +++--- - cpufreq/ChangeLog | 2 ++ - cpufreq/help/ChangeLog | 2 ++ - drivemount/ChangeLog | 2 ++ - drivemount/help/ChangeLog | 2 ++ - geyes/ChangeLog | 2 ++ - geyes/docs/ChangeLog | 2 ++ - gkb-new/ChangeLog | 2 ++ - gswitchit/ChangeLog | 2 ++ - gweather/ChangeLog | 2 ++ - invest-applet/ChangeLog | 2 ++ - mini-commander/ChangeLog | 2 ++ - mixer/ChangeLog | 2 ++ - modemlights/ChangeLog | 2 ++ - multiload/ChangeLog | 2 ++ - null_applet/ChangeLog | 2 ++ - po/ChangeLog | 2 ++ - stickynotes/ChangeLog | 2 ++ - trashapplet/ChangeLog | 2 ++ - trashapplet/docs/ChangeLog | 2 ++ + ChangeLog | 2 ++ + NEWS | 34 ++++++++++++++++++++++++++++++++-- + accessx-status/ChangeLog | 2 ++ + accessx-status/docs/ChangeLog | 2 ++ + battstat/ChangeLog | 2 ++ + charpick/ChangeLog | 2 ++ + configure.in | 6 +++--- + cpufreq/ChangeLog | 2 ++ + cpufreq/help/ChangeLog | 2 ++ + drivemount/ChangeLog | 2 ++ + drivemount/help/ChangeLog | 2 ++ + geyes/ChangeLog | 2 ++ + geyes/docs/ChangeLog | 2 ++ + gkb-new/ChangeLog | 2 ++ + gswitchit/ChangeLog | 2 ++ + gweather/ChangeLog | 2 ++ + invest-applet/ChangeLog | 2 ++ + mini-commander/ChangeLog | 2 ++ + mixer/ChangeLog | 2 ++ + modemlights/ChangeLog | 2 ++ + multiload/ChangeLog | 2 ++ + null_applet/ChangeLog | 2 ++ + po/ChangeLog | 2 ++ + stickynotes/ChangeLog | 2 ++ + trashapplet/ChangeLog | 2 ++ + trashapplet/docs/ChangeLog | 2 ++ 26 files changed, 83 insertions(+), 5 deletions(-) commit de79d68eba4fd705ca6322fe98c82fe329ffa3a9 @@ -7316,8 +7403,8 @@ be better if we keep this up, but two more entries isn't going to kill it yet. - charpick/charpick.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) + charpick/charpick.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) commit dcfb7a1eee2b62d7475c9652cce94757065f87cf Author: Callum McKenzie @@ -7330,14 +7417,14 @@ files in favour of editing the .ui files directly. battstat/battstat_applet.glade | 596 ----------------- - cpufreq/cpufreq-preferences.glade | 427 ------------ + cpufreq/cpufreq-preferences.glade | 427 ------------- gswitchit/gswitchit.glade | 82 --- invest-applet/data/financialchart.glade | 1030 ----------------------------- invest-applet/data/prefs-dialog.glade | 167 ----- mini-commander/src/mini-commander.glade | 1012 ----------------------------- modemlights/modemlights.glade | 314 --------- stickynotes/stickynotes.glade | 1067 ------------------------------- - 8 files changed, 0 insertions(+), 4695 deletions(-) + 8 files changed, 4695 deletions(-) commit be3c163704ce07a03290fc96007c8322675fa72f Author: Callum McKenzie @@ -7351,13 +7438,13 @@ this doesn't affect strings with embedded markup, only those with global markup. This should make life easier for translators. - battstat/battstat_applet.ui | 364 +++++------------ - cpufreq/cpufreq-preferences.ui | 280 ++++--------- - invest-applet/data/prefs-dialog.ui | 52 ++- - mini-commander/src/mini-commander.ui | 649 +++++++++-------------------- - modemlights/modemlights.ui | 226 ++++------- - stickynotes/stickynotes.ui | 398 ++++++++++-------- - trashapplet/trashapplet-empty-progress.ui | 152 ++++--- + battstat/battstat_applet.ui | 364 +++++------------ + cpufreq/cpufreq-preferences.ui | 280 ++++--------- + invest-applet/data/prefs-dialog.ui | 52 ++- + mini-commander/src/mini-commander.ui | 649 ++++++++++-------------------- + modemlights/modemlights.ui | 226 ++++------- + stickynotes/stickynotes.ui | 398 ++++++++++-------- + trashapplet/trashapplet-empty-progress.ui | 152 ++++--- 7 files changed, 822 insertions(+), 1299 deletions(-) commit 3147912f61bbf3cd410fee7c560b53a76489f5db @@ -7366,5 +7453,5 @@ Updated Danish translation - po/da.po | 329 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 166 insertions(+), 163 deletions(-) + po/da.po | 329 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 166 insertions(+), 163 deletions(-) diff -Nru gnome-applets-3.5.91/INSTALL gnome-applets-3.5.92/INSTALL --- gnome-applets-3.5.91/INSTALL 2011-04-05 20:45:55.000000000 +0000 +++ gnome-applets-3.5.92/INSTALL 2012-09-19 22:33:00.000000000 +0000 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -230,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -277,7 +357,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. @@ -288,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru gnome-applets-3.5.91/Makefile.in gnome-applets-3.5.92/Makefile.in --- gnome-applets-3.5.91/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/Makefile.in 2012-09-20 01:10:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -54,12 +70,18 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = gnome-applets.spec CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -69,20 +91,29 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -110,6 +141,9 @@ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -166,6 +200,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -177,6 +212,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -202,6 +238,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -317,6 +357,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -327,6 +368,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -435,7 +478,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -471,10 +514,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -499,12 +540,12 @@ -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -514,7 +555,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -528,37 +573,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -567,6 +581,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -630,8 +648,32 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -667,13 +709,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -702,35 +741,35 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -741,8 +780,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -752,7 +791,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -762,6 +801,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -785,13 +825,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -822,10 +870,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -909,13 +962,15 @@ uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic clean-libtool cscope cscopelist \ + cscopelist-recursive ctags ctags-recursive dist dist-all \ + dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff -Nru gnome-applets-3.5.91/NEWS gnome-applets-3.5.92/NEWS --- gnome-applets-3.5.91/NEWS 2012-08-30 18:36:18.000000000 +0000 +++ gnome-applets-3.5.92/NEWS 2012-09-20 01:09:08.000000000 +0000 @@ -1,10 +1,18 @@ +Changes in GNOME-Applets 3.5.92 +============================== + +General: +- Port to new gweather api (Giovanni) + +Translation Updates: + Lithuanian, Indonesian, Polish + Changes in GNOME-Applets 3.5.91 ============================== Translation Updates: Czech, Polish - Changes in GNOME-Applets 3.5.1 ============================== diff -Nru gnome-applets-3.5.91/accessx-status/Makefile.in gnome-applets-3.5.92/accessx-status/Makefile.in --- gnome-applets-3.5.91/accessx-status/Makefile.in 2012-08-30 18:36:43.000000000 +0000 +++ gnome-applets-3.5.92/accessx-status/Makefile.in 2012-09-20 01:10:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ libexec_PROGRAMS = accessx-status-applet$(EXEEXT) subdir = accessx-status -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS \ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs AUTHORS \ COPYING ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -61,9 +78,22 @@ accessx_status_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -74,22 +104,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(accessx_status_applet_SOURCES) DIST_SOURCES = $(accessx_status_applet_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -99,6 +125,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -120,6 +151,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(service_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -206,6 +243,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -217,6 +255,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -242,6 +281,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -357,6 +400,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -367,6 +411,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -460,8 +506,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -501,7 +550,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -accessx-status-applet$(EXEEXT): $(accessx_status_applet_OBJECTS) $(accessx_status_applet_DEPENDENCIES) +accessx-status-applet$(EXEEXT): $(accessx_status_applet_OBJECTS) $(accessx_status_applet_DEPENDENCIES) $(EXTRA_accessx_status_applet_DEPENDENCIES) @rm -f accessx-status-applet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(accessx_status_applet_OBJECTS) $(accessx_status_applet_LDADD) $(LIBS) @@ -516,26 +565,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -544,8 +590,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -559,13 +608,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -579,13 +629,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -599,17 +650,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -619,7 +668,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -633,37 +686,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -672,6 +694,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -735,6 +761,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -770,13 +810,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -814,10 +851,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -902,24 +944,26 @@ uninstall-am: uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-serviceDATA install-strip install-uiDATA \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-serviceDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-serviceDATA uninstall-uiDATA diff -Nru gnome-applets-3.5.91/accessx-status/docs/Makefile.in gnome-applets-3.5.92/accessx-status/docs/Makefile.in --- gnome-applets-3.5.91/accessx-status/docs/Makefile.in 2012-08-30 18:36:44.000000000 +0000 +++ gnome-applets-3.5.92/accessx-status/docs/Makefile.in 2012-09-20 01:10:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = accessx-status/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -467,6 +517,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -488,6 +539,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -536,10 +589,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -713,7 +771,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -727,7 +784,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -735,7 +792,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -774,18 +831,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -795,10 +849,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -866,7 +920,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -934,8 +1010,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -961,7 +1037,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1029,7 +1116,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/accessx-status/pixmaps/Makefile.in gnome-applets-3.5.92/accessx-status/pixmaps/Makefile.in --- gnome-applets-3.5.91/accessx-status/pixmaps/Makefile.in 2012-08-30 18:36:44.000000000 +0000 +++ gnome-applets-3.5.92/accessx-status/pixmaps/Makefile.in 2012-09-20 01:10:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -34,7 +50,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = accessx-status/pixmaps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -49,14 +66,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +106,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(accessx_status_iconsdir)" \ "$(DESTDIR)$(accessx_status_pixmapsdir)" DATA = $(accessx_status_icons_DATA) $(accessx_status_pixmaps_DATA) @@ -133,6 +167,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +179,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +205,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +324,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +335,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -404,8 +447,11 @@ -rm -rf .libs _libs install-accessx_status_iconsDATA: $(accessx_status_icons_DATA) @$(NORMAL_INSTALL) - test -z "$(accessx_status_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(accessx_status_iconsdir)" @list='$(accessx_status_icons_DATA)'; test -n "$(accessx_status_iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(accessx_status_iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(accessx_status_iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -419,13 +465,14 @@ @$(NORMAL_UNINSTALL) @list='$(accessx_status_icons_DATA)'; test -n "$(accessx_status_iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(accessx_status_iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(accessx_status_iconsdir)" && rm -f $$files + dir='$(DESTDIR)$(accessx_status_iconsdir)'; $(am__uninstall_files_from_dir) install-accessx_status_pixmapsDATA: $(accessx_status_pixmaps_DATA) @$(NORMAL_INSTALL) - test -z "$(accessx_status_pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(accessx_status_pixmapsdir)" @list='$(accessx_status_pixmaps_DATA)'; test -n "$(accessx_status_pixmapsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(accessx_status_pixmapsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(accessx_status_pixmapsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -439,15 +486,15 @@ @$(NORMAL_UNINSTALL) @list='$(accessx_status_pixmaps_DATA)'; test -n "$(accessx_status_pixmapsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(accessx_status_pixmapsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(accessx_status_pixmapsdir)" && rm -f $$files + dir='$(DESTDIR)$(accessx_status_pixmapsdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -496,10 +543,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/aclocal.m4 gnome-applets-3.5.92/aclocal.m4 --- gnome-applets-3.5.91/aclocal.m4 2012-08-30 18:36:41.000000000 +0000 +++ gnome-applets-3.5.92/aclocal.m4 2012-09-20 01:10:24.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.12.2 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,11 +13,11 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) dnl AM_GCONF_SOURCE_2 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas @@ -305,6 +305,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -639,6 +643,90 @@ AC_SUBST(WARN_CXXFLAGS) ]) +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + # nls.m4 serial 5 (gettext-0.18) dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, dnl Inc. @@ -700,7 +788,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -746,7 +835,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -794,9 +884,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -809,7 +899,7 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -820,7 +910,7 @@ _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -830,22 +920,64 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.12.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -861,22 +993,24 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.12.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -895,7 +1029,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -921,22 +1055,21 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -955,16 +1088,15 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 17 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -974,7 +1106,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -987,12 +1119,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -1000,8 +1133,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -1040,16 +1174,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -1058,16 +1192,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -1115,7 +1249,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -1125,28 +1259,34 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -1165,7 +1305,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -1177,21 +1317,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -1209,7 +1347,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -1217,8 +1355,7 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1231,14 +1368,13 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 19 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -1284,31 +1420,41 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], +[$0: two- and three-arguments forms are deprecated. For more info, see: +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -1319,28 +1465,35 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +dnl Support for Objective C++ was only introduced in Autoconf 2.65, +dnl but we still cater to Autoconf 2.62. +m4_ifdef([AC_PROG_OBJCXX], +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl ]) _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -1368,12 +1521,14 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 8 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -1387,9 +1542,9 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1413,20 +1568,19 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 7 # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -1434,13 +1588,14 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -1452,13 +1607,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MAKE_INCLUDE() # ----------------- @@ -1477,7 +1632,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -1504,14 +1659,13 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -1541,45 +1695,19 @@ am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 6 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1587,13 +1715,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1604,13 +1732,14 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 9 + # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- # Adds support for distributing Python modules and packages. To @@ -1638,8 +1767,10 @@ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl -python2.1 python2.0]) +[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl + python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) + + AC_ARG_VAR([PYTHON], [the Python interpreter]) m4_if([$1],[],[ dnl No version check is needed. @@ -1652,10 +1783,11 @@ dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies @@ -1711,9 +1843,7 @@ dnl site-packages directory, not the python standard library dnl directory like in previous automake betas. This behavior dnl is more consistent with lispdir.m4 for example. - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. + dnl Query distutils for this directory. AC_CACHE_CHECK([for $am_display_PYTHON script directory], [am_cv_python_pythondir], [if test "x$prefix" = xNONE @@ -1722,8 +1852,7 @@ else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -1749,9 +1878,7 @@ dnl pyexecdir -- directory for installing python extension modules dnl (shared libraries) - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. + dnl Query distutils for this directory. AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], [am_cv_python_pyexecdir], [if test "x$exec_prefix" = xNONE @@ -1760,8 +1887,7 @@ else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -1809,12 +1935,14 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1828,22 +1956,18 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 9 # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1854,32 +1978,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1889,70 +2021,123 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 3 # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1961,24 +2146,24 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1989,10 +2174,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -2000,7 +2186,7 @@ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in diff -Nru gnome-applets-3.5.91/battstat/Makefile.in gnome-applets-3.5.92/battstat/Makefile.in --- gnome-applets-3.5.91/battstat/Makefile.in 2012-08-30 18:36:44.000000000 +0000 +++ gnome-applets-3.5.92/battstat/Makefile.in 2012-09-20 01:10:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ libexec_PROGRAMS = battstat-applet-2$(EXEEXT) subdir = battstat -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -66,9 +83,22 @@ battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -79,22 +109,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(battstat_applet_2_SOURCES) DIST_SOURCES = $(battstat_applet_2_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -104,6 +130,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -125,6 +156,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(builder_DATA) $(schemas_DATA) $(service_DATA) \ $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -211,6 +248,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -222,6 +260,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -247,6 +286,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -362,6 +405,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -372,6 +416,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -492,8 +538,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -533,7 +582,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -battstat-applet-2$(EXEEXT): $(battstat_applet_2_OBJECTS) $(battstat_applet_2_DEPENDENCIES) +battstat-applet-2$(EXEEXT): $(battstat_applet_2_OBJECTS) $(battstat_applet_2_DEPENDENCIES) $(EXTRA_battstat_applet_2_DEPENDENCIES) @rm -f battstat-applet-2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(battstat_applet_2_OBJECTS) $(battstat_applet_2_LDADD) $(LIBS) @@ -553,26 +602,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -581,8 +627,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -596,13 +645,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-builderDATA: $(builder_DATA) @$(NORMAL_INSTALL) - test -z "$(builderdir)" || $(MKDIR_P) "$(DESTDIR)$(builderdir)" @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(builderdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(builderdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -616,13 +666,14 @@ @$(NORMAL_UNINSTALL) @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(builderdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(builderdir)" && rm -f $$files + dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -636,13 +687,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -656,13 +708,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -676,17 +729,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -696,7 +747,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -710,37 +765,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -749,6 +773,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -812,6 +840,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -847,13 +889,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -891,10 +930,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -983,28 +1027,30 @@ uninstall-libexecPROGRAMS uninstall-schemasDATA \ uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-builderDATA install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-schemasDATA install-serviceDATA install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-appletDATA \ - uninstall-builderDATA uninstall-libexecPROGRAMS \ - uninstall-schemasDATA uninstall-serviceDATA uninstall-uiDATA + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-builderDATA \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-schemasDATA \ + install-serviceDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-appletDATA uninstall-builderDATA \ + uninstall-libexecPROGRAMS uninstall-schemasDATA \ + uninstall-serviceDATA uninstall-uiDATA @INTLTOOL_SCHEMAS_RULE@ diff -Nru gnome-applets-3.5.91/battstat/apmlib/Makefile.in gnome-applets-3.5.92/battstat/apmlib/Makefile.in --- gnome-applets-3.5.91/battstat/apmlib/Makefile.in 2012-08-30 18:36:44.000000000 +0000 +++ gnome-applets-3.5.92/battstat/apmlib/Makefile.in 2012-09-20 01:10:26.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,23 @@ # VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -40,7 +56,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = battstat/apmlib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -57,44 +74,59 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru -AM_V_AR = $(am__v_AR_$(V)) -am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY)) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libapm_a_AR = $(AR) $(ARFLAGS) libapm_a_LIBADD = am_libapm_a_OBJECTS = apmlib.$(OBJEXT) libapm_a_OBJECTS = $(am_libapm_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libapm_a_SOURCES) DIST_SOURCES = $(libapm_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -149,6 +181,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -160,6 +193,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -185,6 +219,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -300,6 +338,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -310,6 +349,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -379,7 +420,7 @@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libapm.a: $(libapm_a_OBJECTS) $(libapm_a_DEPENDENCIES) +libapm.a: $(libapm_a_OBJECTS) $(libapm_a_DEPENDENCIES) $(EXTRA_libapm_a_DEPENDENCIES) $(AM_V_at)-rm -f libapm.a $(AM_V_AR)$(libapm_a_AR) libapm.a $(libapm_a_OBJECTS) $(libapm_a_LIBADD) $(AM_V_at)$(RANLIB) libapm.a @@ -395,26 +436,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -471,6 +509,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -518,10 +570,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -607,7 +664,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLIBRARIES cscopelist ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff -Nru gnome-applets-3.5.91/battstat/docs/Makefile.in gnome-applets-3.5.92/battstat/docs/Makefile.in --- gnome-applets-3.5.91/battstat/docs/Makefile.in 2012-08-30 18:36:44.000000000 +0000 +++ gnome-applets-3.5.92/battstat/docs/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = battstat/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -461,6 +511,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -482,6 +533,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -530,10 +583,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -707,7 +765,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -721,7 +778,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -729,7 +786,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -768,18 +825,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -789,10 +843,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -860,7 +914,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -928,8 +1004,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -955,7 +1031,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1023,7 +1110,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/battstat/sounds/Makefile.in gnome-applets-3.5.92/battstat/sounds/Makefile.in --- gnome-applets-3.5.91/battstat/sounds/Makefile.in 2012-08-30 18:36:44.000000000 +0000 +++ gnome-applets-3.5.92/battstat/sounds/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -34,7 +50,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = battstat/sounds -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -49,14 +66,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +106,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(soundlistdir)" DATA = $(soundlist_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -132,6 +166,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -143,6 +178,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -168,6 +204,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,6 +323,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -293,6 +334,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -363,8 +406,11 @@ -rm -rf .libs _libs install-soundlistDATA: $(soundlist_DATA) @$(NORMAL_INSTALL) - test -z "$(soundlistdir)" || $(MKDIR_P) "$(DESTDIR)$(soundlistdir)" @list='$(soundlist_DATA)'; test -n "$(soundlistdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(soundlistdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(soundlistdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -378,15 +424,15 @@ @$(NORMAL_UNINSTALL) @list='$(soundlist_DATA)'; test -n "$(soundlistdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(soundlistdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(soundlistdir)" && rm -f $$files + dir='$(DESTDIR)$(soundlistdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -435,10 +481,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/charpick/Makefile.in gnome-applets-3.5.92/charpick/Makefile.in --- gnome-applets-3.5.91/charpick/Makefile.in 2012-08-30 18:36:44.000000000 +0000 +++ gnome-applets-3.5.92/charpick/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ libexec_PROGRAMS = charpick_applet2$(EXEEXT) subdir = charpick -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -60,9 +77,22 @@ am__DEPENDENCIES_1 = charpick_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -73,22 +103,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(charpick_applet2_SOURCES) DIST_SOURCES = $(charpick_applet2_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -98,6 +124,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -119,6 +150,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(schemas_DATA) $(service_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -205,6 +242,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -216,6 +254,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -241,6 +280,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -356,6 +399,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -366,6 +410,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -460,8 +506,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -501,7 +550,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -charpick_applet2$(EXEEXT): $(charpick_applet2_OBJECTS) $(charpick_applet2_DEPENDENCIES) +charpick_applet2$(EXEEXT): $(charpick_applet2_OBJECTS) $(charpick_applet2_DEPENDENCIES) $(EXTRA_charpick_applet2_DEPENDENCIES) @rm -f charpick_applet2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(charpick_applet2_OBJECTS) $(charpick_applet2_LDADD) $(LIBS) @@ -517,26 +566,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -545,8 +591,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -560,13 +609,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -580,13 +630,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -600,13 +651,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -620,17 +672,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -640,7 +690,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -654,37 +708,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -693,6 +716,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -756,6 +783,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -791,13 +832,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -835,10 +873,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -925,22 +968,24 @@ uninstall-am: uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-schemasDATA uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-schemasDATA \ - install-serviceDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-schemasDATA install-serviceDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ diff -Nru gnome-applets-3.5.91/charpick/help/Makefile.in gnome-applets-3.5.92/charpick/help/Makefile.in --- gnome-applets-3.5.91/charpick/help/Makefile.in 2012-08-30 18:36:45.000000000 +0000 +++ gnome-applets-3.5.92/charpick/help/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = charpick/help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -460,6 +510,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -481,6 +532,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -529,10 +582,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -706,7 +764,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -720,7 +777,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -728,7 +785,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -767,18 +824,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -788,10 +842,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -859,7 +913,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -927,8 +1003,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -954,7 +1030,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1022,7 +1109,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/config.guess gnome-applets-3.5.92/config.guess --- gnome-applets-3.5.91/config.guess 2011-10-23 17:44:03.000000000 +0000 +++ gnome-applets-3.5.92/config.guess 2012-09-19 22:33:00.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -56,8 +54,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -144,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +222,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +268,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,7 +297,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -394,23 +396,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +482,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +496,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +553,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +732,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +771,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -803,15 +804,18 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -857,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,7 +877,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -878,20 +889,29 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -933,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -959,7 +979,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -967,14 +987,17 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1006,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1042,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1070,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1111,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1155,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1184,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1230,7 +1253,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1301,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1321,11 +1350,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru gnome-applets-3.5.91/config.sub gnome-applets-3.5.92/config.sub --- gnome-applets-3.5.91/config.sub 2011-10-23 17:44:03.000000000 +0000 +++ gnome-applets-3.5.92/config.sub 2012-09-19 22:33:00.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -75,8 +73,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +122,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -156,8 +160,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +177,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,17 +255,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -281,29 +296,39 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +338,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,21 +367,25 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -367,25 +411,29 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +458,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +528,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +573,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,7 +788,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -771,10 +827,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +903,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +991,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1017,6 +1088,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1147,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1218,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1318,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1293,8 +1358,9 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1407,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1456,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1435,6 +1501,8 @@ -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1525,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1540,20 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1573,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1604,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru gnome-applets-3.5.91/configure gnome-applets-3.5.92/configure --- gnome-applets-3.5.91/configure 2012-08-30 18:36:50.000000000 +0000 +++ gnome-applets-3.5.92/configure 2012-09-20 01:10:26.000000000 +0000 @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gnome-applets 3.5.91. +# Generated by GNU Autoconf 2.69 for gnome-applets 3.5.92. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -220,21 +244,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -336,6 +364,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -457,6 +493,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -491,16 +531,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -512,28 +552,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -567,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='gnome-applets' PACKAGE_TARNAME='gnome-applets' -PACKAGE_VERSION='3.5.91' -PACKAGE_STRING='gnome-applets 3.5.91' +PACKAGE_VERSION='3.5.92' +PACKAGE_STRING='gnome-applets 3.5.92' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -702,6 +722,10 @@ NETWORKMANAGER_LIBS NETWORKMANAGER_CFLAGS NETWORKMANAGER_VERSION +GSETTINGS_RULES +GLIB_COMPILE_SCHEMAS +gsettingsschemadir +GSETTINGS_DISABLE_SCHEMAS_COMPILE BUILD_LIBGWEATHER_APPLETS_FALSE BUILD_LIBGWEATHER_APPLETS_TRUE LIBGWEATHER_LIBS @@ -798,6 +822,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -836,6 +861,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -845,6 +876,8 @@ MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -926,6 +959,7 @@ enable_more_warnings enable_polkit with_hal +enable_schemas_compile enable_networkmanager enable_mixer_applet with_gconf_source @@ -955,6 +989,7 @@ PKG_CONFIG_LIBDIR CPP XMKMF +PYTHON GIT_CFLAGS GIT_LIBS GIO_CFLAGS @@ -1448,8 +1483,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1535,7 +1568,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-applets 3.5.91 to adapt to many kinds of systems. +\`configure' configures gnome-applets 3.5.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1609,7 +1642,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-applets 3.5.91:";; + short | recursive ) echo "Configuration of gnome-applets 3.5.92:";; esac cat <<\_ACEOF @@ -1617,13 +1650,16 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer --disable-nls do not use Native Language Support - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1634,6 +1670,8 @@ --enable-iso-c Try to warn if code is not ISO C --enable-more-warnings Maximum compiler warnings --enable-polkit Enable PolicyKit support [default auto] + --disable-schemas-compile + Disable regeneration of gschemas.compiled on install --enable-networkmanager Enable NetworkManager support [default=yes] --enable-mixer-applet Enable the gstreamer-based mixer applet. --disable-schemas-install @@ -1655,7 +1693,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1686,6 +1724,7 @@ path overriding pkg-config's built-in search path CPP C preprocessor XMKMF Path to xmkmf, Makefile generator for X Window System + PYTHON the Python interpreter GIT_CFLAGS C compiler flags for GIT, overriding pkg-config GIT_LIBS linker flags for GIT, overriding pkg-config GIO_CFLAGS C compiler flags for GIO, overriding pkg-config @@ -1815,10 +1854,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-applets configure 3.5.91 -generated by GNU Autoconf 2.68 +gnome-applets configure 3.5.92 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1894,7 +1933,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2283,8 +2322,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-applets $as_me 3.5.91, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by gnome-applets $as_me 3.5.92, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2635,7 +2674,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.12' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2703,7 +2742,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2761,9 +2800,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2774,32 +2810,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2811,6 +2855,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2837,8 +2891,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2850,10 +2904,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2872,7 +2926,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2912,7 +2966,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2963,7 +3017,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2992,12 +3046,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3016,7 +3064,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3102,7 +3150,7 @@ # Define the identity of the package. PACKAGE='gnome-applets' - VERSION='3.5.91' + VERSION='3.5.92' cat >>confdefs.h <<_ACEOF @@ -3130,11 +3178,17 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 @@ -3143,7 +3197,7 @@ _am_tools='gnutar plaintar pax cpio none' _am_tools=${am_cv_prog_tar_ustar-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in @@ -3229,11 +3283,38 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' @@ -3253,7 +3334,7 @@ PYGOBJECT_REQUIRED=2.26 GNOME_ICON_THEME_REQUIRED=2.15.91 LIBXML_REQUIRED=2.5.0 -GWEATHER_REQUIRED=2.91.0 +GWEATHER_REQUIRED=3.5.0 GUCHARMAP3_REQUIRED=2.33.0 POLKIT_REQUIRED=0.92 NETWORKMANAGER_REQUIRED=0.7 @@ -3316,7 +3397,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3349,6 +3430,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3381,7 +3463,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3421,7 +3503,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3474,7 +3556,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3515,7 +3597,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3573,7 +3655,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3617,7 +3699,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4063,8 +4145,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4160,8 +4241,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4195,16 +4277,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4213,16 +4295,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4287,14 +4369,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.35.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 $as_echo_n "checking for intltool >= 0.35.0... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -4319,7 +4399,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4359,7 +4439,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4399,7 +4479,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4425,25 +4505,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -4560,7 +4663,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4600,7 +4703,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4640,7 +4743,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4680,7 +4783,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4731,7 +4834,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4762,7 +4865,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -4827,6 +4930,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -4847,7 +4951,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4890,7 +4994,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4963,7 +5067,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5003,7 +5107,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5056,7 +5160,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5097,7 +5201,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -5155,7 +5259,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5199,7 +5303,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5395,8 +5499,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5492,8 +5595,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5527,16 +5631,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5545,16 +5649,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5818,7 +5922,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5884,7 +5988,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -6052,8 +6156,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -6231,7 +6335,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -6310,7 +6414,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -6566,7 +6670,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6610,7 +6714,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6768,6 +6872,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -6807,7 +6916,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -7029,7 +7138,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7069,7 +7178,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7236,7 +7345,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7375,7 +7484,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7415,7 +7524,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7518,7 +7627,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7562,7 +7671,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7687,7 +7796,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7727,7 +7836,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7786,7 +7895,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7826,7 +7935,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7876,13 +7985,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -8029,6 +8138,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -8417,7 +8527,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -8428,7 +8538,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -8461,7 +8584,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8501,7 +8624,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8581,7 +8704,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8621,7 +8744,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8673,7 +8796,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8713,7 +8836,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8765,7 +8888,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8805,7 +8928,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8857,7 +8980,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8897,7 +9020,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8949,7 +9072,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8989,7 +9112,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9068,7 +9191,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -9079,6 +9208,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -9111,6 +9241,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -9132,7 +9263,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9287,7 +9420,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -9365,6 +9513,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -9824,7 +9976,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -9915,18 +10069,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -10288,7 +10457,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -10538,8 +10706,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -10918,6 +11085,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -10963,6 +11131,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -10991,10 +11160,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -11007,7 +11172,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -11046,7 +11211,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -11670,11 +11834,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -11764,7 +11923,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -11773,7 +11932,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -11838,7 +11997,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -11977,7 +12136,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -11985,10 +12144,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -11996,7 +12151,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -12014,7 +12169,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -12034,17 +12189,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -12105,7 +12261,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -12121,7 +12277,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -12158,9 +12314,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12246,7 +12402,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -12315,7 +12471,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12340,7 +12496,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12364,7 +12520,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -12395,7 +12551,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -12405,7 +12561,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -13187,6 +13343,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -13882,10 +14040,12 @@ + + if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.4" >&5 -$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.4" >&5 +$as_echo_n "checking whether $PYTHON version is >= 2.4... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -13903,7 +14063,9 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "too old" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Python interpreter is too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -13915,7 +14077,7 @@ $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -13959,7 +14121,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14024,7 +14186,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } if ${am_cv_python_pythondir+:} false; then : $as_echo_n "(cached) " >&6 @@ -14035,8 +14197,7 @@ else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -14062,7 +14223,7 @@ pkgpythondir=\${pythondir}/$PACKAGE - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } if ${am_cv_python_pyexecdir+:} false; then : $as_echo_n "(cached) " >&6 @@ -14073,8 +14234,7 @@ else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -14464,6 +14624,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIT_CFLAGS=`$PKG_CONFIG --cflags "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14480,6 +14641,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIT_LIBS=`$PKG_CONFIG --libs "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14499,9 +14661,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>&1` + GIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>&1` else - GIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>&1` + GIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIT_PKG_ERRORS" >&5 @@ -14516,7 +14678,6 @@ Alternatively, you may set the environment variables GIT_CFLAGS and GIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14532,7 +14693,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GIT_CFLAGS=$pkg_cv_GIT_CFLAGS GIT_LIBS=$pkg_cv_GIT_LIBS @@ -14556,6 +14716,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14572,6 +14733,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14591,9 +14753,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED" 2>&1` else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 @@ -14608,7 +14770,6 @@ Alternatively, you may set the environment variables GIO_CFLAGS and GIO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14624,7 +14785,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GIO_CFLAGS=$pkg_cv_GIO_CFLAGS GIO_LIBS=$pkg_cv_GIO_LIBS @@ -14650,6 +14810,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_UNIX_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= $GIO_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14666,6 +14827,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_UNIX_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= $GIO_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14685,9 +14847,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= $GIO_REQUIRED" 2>&1` + GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= $GIO_REQUIRED" 2>&1` else - GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= $GIO_REQUIRED" 2>&1` + GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= $GIO_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_UNIX_PKG_ERRORS" >&5 @@ -14702,7 +14864,6 @@ Alternatively, you may set the environment variables GIO_UNIX_CFLAGS and GIO_UNIX_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14718,7 +14879,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GIO_UNIX_CFLAGS=$pkg_cv_GIO_UNIX_CFLAGS GIO_UNIX_LIBS=$pkg_cv_GIO_UNIX_LIBS @@ -14744,6 +14904,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14760,6 +14921,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14779,9 +14941,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -14796,7 +14958,6 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14812,7 +14973,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS @@ -14838,6 +14998,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNOME_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-4.0 >= $LIBPANEL_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14854,6 +15015,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNOME_APPLETS_LIBS=`$PKG_CONFIG --libs "libpanelapplet-4.0 >= $LIBPANEL_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14873,9 +15035,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpanelapplet-4.0 >= $LIBPANEL_REQUIRED" 2>&1` + GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpanelapplet-4.0 >= $LIBPANEL_REQUIRED" 2>&1` else - GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpanelapplet-4.0 >= $LIBPANEL_REQUIRED" 2>&1` + GNOME_APPLETS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpanelapplet-4.0 >= $LIBPANEL_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GNOME_APPLETS_PKG_ERRORS" >&5 @@ -14890,7 +15052,6 @@ Alternatively, you may set the environment variables GNOME_APPLETS_CFLAGS and GNOME_APPLETS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -14906,7 +15067,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GNOME_APPLETS_CFLAGS=$pkg_cv_GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS=$pkg_cv_GNOME_APPLETS_LIBS @@ -14935,6 +15095,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTOP_APPLETS_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14951,6 +15112,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTOP_APPLETS_LIBS=`$PKG_CONFIG --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14970,9 +15132,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>&1` + GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>&1` else - GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>&1` + GTOP_APPLETS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgtop-2.0 >= $LIBGTOP_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTOP_APPLETS_PKG_ERRORS" >&5 @@ -15017,6 +15179,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNOME_SETTINGS_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15033,6 +15196,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNOME_SETTINGS_DAEMON_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15052,9 +15216,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-settings-daemon" 2>&1` + GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-settings-daemon" 2>&1` else - GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-settings-daemon" 2>&1` + GNOME_SETTINGS_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-settings-daemon" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GNOME_SETTINGS_DAEMON_PKG_ERRORS" >&5 @@ -15095,6 +15259,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBWNCK_CFLAGS=`$PKG_CONFIG --cflags "libwnck-3.0 >= $LIBWNCK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15111,6 +15276,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBWNCK_LIBS=`$PKG_CONFIG --libs "libwnck-3.0 >= $LIBWNCK_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15130,9 +15296,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwnck-3.0 >= $LIBWNCK_REQUIRED" 2>&1` + LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwnck-3.0 >= $LIBWNCK_REQUIRED" 2>&1` else - LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwnck-3.0 >= $LIBWNCK_REQUIRED" 2>&1` + LIBWNCK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwnck-3.0 >= $LIBWNCK_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBWNCK_PKG_ERRORS" >&5 @@ -15170,6 +15336,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15186,6 +15353,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15205,9 +15373,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBNOTIFY_PKG_ERRORS" >&5 @@ -15249,6 +15417,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CPUFREQ_SELECTOR_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15265,6 +15434,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CPUFREQ_SELECTOR_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15284,9 +15454,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1` + CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1` else - CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1` + CPUFREQ_SELECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CPUFREQ_SELECTOR_PKG_ERRORS" >&5 @@ -15301,7 +15471,6 @@ Alternatively, you may set the environment variables CPUFREQ_SELECTOR_CFLAGS and CPUFREQ_SELECTOR_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -15317,7 +15486,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else CPUFREQ_SELECTOR_CFLAGS=$pkg_cv_CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS=$pkg_cv_CPUFREQ_SELECTOR_LIBS @@ -15343,6 +15511,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15359,6 +15528,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15378,9 +15548,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -15426,6 +15596,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15442,6 +15613,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15461,9 +15633,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` else - POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-gobject-1 >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$POLKIT_PKG_ERRORS" >&5 @@ -15529,6 +15701,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15545,6 +15718,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15564,9 +15738,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` + HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` else - HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` + HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$HAL_PKG_ERRORS" >&5 @@ -15613,6 +15787,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GUCHARMAP_CFLAGS=`$PKG_CONFIG --cflags "gucharmap-2.90 >= $GUCHARMAP3_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15629,6 +15804,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GUCHARMAP_LIBS=`$PKG_CONFIG --libs "gucharmap-2.90 >= $GUCHARMAP3_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15648,9 +15824,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gucharmap-2.90 >= $GUCHARMAP3_REQUIRED" 2>&1` + GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gucharmap-2.90 >= $GUCHARMAP3_REQUIRED" 2>&1` else - GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gucharmap-2.90 >= $GUCHARMAP3_REQUIRED" 2>&1` + GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gucharmap-2.90 >= $GUCHARMAP3_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUCHARMAP_PKG_ERRORS" >&5 @@ -15695,6 +15871,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "pygobject-2.0 >= $PYGOBJECT_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15711,6 +15888,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "pygobject-2.0 >= $PYGOBJECT_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15730,9 +15908,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygobject-2.0 >= $PYGOBJECT_REQUIRED" 2>&1` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pygobject-2.0 >= $PYGOBJECT_REQUIRED" 2>&1` else - PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygobject-2.0 >= $PYGOBJECT_REQUIRED" 2>&1` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pygobject-2.0 >= $PYGOBJECT_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PYGTK_PKG_ERRORS" >&5 @@ -15767,6 +15945,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15783,6 +15962,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_XML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15802,9 +15982,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1` + XML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1` else - XML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1` + XML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= $LIBXML_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XML2_PKG_ERRORS" >&5 @@ -15819,7 +15999,6 @@ Alternatively, you may set the environment variables XML2_CFLAGS and XML2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -15835,7 +16014,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else XML2_CFLAGS=$pkg_cv_XML2_CFLAGS XML2_LIBS=$pkg_cv_XML2_LIBS @@ -15862,6 +16040,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather-3.0 >= $GWEATHER_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15878,6 +16057,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather-3.0 >= $GWEATHER_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15897,9 +16077,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather-3.0 >= $GWEATHER_REQUIRED" 2>&1` + LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gweather-3.0 >= $GWEATHER_REQUIRED" 2>&1` else - LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather-3.0 >= $GWEATHER_REQUIRED" 2>&1` + LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gweather-3.0 >= $GWEATHER_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBGWEATHER_PKG_ERRORS" >&5 @@ -15929,6 +16109,239 @@ fi + + + # Check whether --enable-schemas-compile was given. +if test "${enable_schemas_compile+set}" = set; then : + enableval=$enable_schemas_compile; case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; + esac +fi + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + gsettingsschemadir=${datadir}/glib-2.0/schemas + + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + # Extract the first word of "glib-compile-schemas", so it can be a program name with args. +set dummy glib-compile-schemas; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_COMPILE_SCHEMAS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS +if test -n "$GLIB_COMPILE_SCHEMAS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5 +$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi + + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5 + else + : + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $^ > $@.tmp && mv $@.tmp $@ +endif +' + + + + + + + # Check whether --enable-networkmanager was given. if test "${enable_networkmanager+set}" = set; then : enableval=$enable_networkmanager; ENABLE_NETWORKMANAGER=$enableval @@ -15956,6 +16369,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NETWORKMANAGER_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15972,6 +16386,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NETWORKMANAGER_LIBS=`$PKG_CONFIG --libs "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15991,9 +16406,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>&1` + NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>&1` else - NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>&1` + NETWORKMANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "NetworkManager >= $NETWORKMANAGER_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$NETWORKMANAGER_PKG_ERRORS" >&5 @@ -16047,6 +16462,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MIXER_CFLAGS=`$PKG_CONFIG --cflags "$GST10_PKGS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16063,6 +16479,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MIXER_LIBS=`$PKG_CONFIG --libs "$GST10_PKGS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16082,9 +16499,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MIXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GST10_PKGS" 2>&1` + MIXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GST10_PKGS" 2>&1` else - MIXER_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GST10_PKGS" 2>&1` + MIXER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GST10_PKGS" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$MIXER_PKG_ERRORS" >&5 @@ -16106,6 +16523,7 @@ as_fn_error $? "Mixer applet explicitly requested but a compatible gstreamer version was not found" "$LINENO" 5 fi fi +MIXER_LIBS="$MIXER_LIBS -lm" if test "x$enable_mixer" = "xyes"; then BUILD_MIXER_APPLET_TRUE= BUILD_MIXER_APPLET_FALSE='#' @@ -16136,7 +16554,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16183,7 +16601,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16224,7 +16642,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16269,7 +16687,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16314,7 +16732,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16360,7 +16778,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JW="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16968,7 +17386,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17055,6 +17473,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -17180,6 +17602,11 @@ +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + gdu_cv_version_required=0.3.2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 @@ -17540,7 +17967,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SU_TOOL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18220,6 +18647,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -18630,16 +19065,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -18699,28 +19134,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -18741,8 +19164,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-applets $as_me 3.5.91, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by gnome-applets $as_me 3.5.92, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18807,11 +19230,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-applets config.status 3.5.91 -configured by $0, generated by GNU Autoconf 2.68, +gnome-applets config.status 3.5.92 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -18902,7 +19325,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -18944,6 +19367,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -19026,7 +19450,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -19082,6 +19505,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -19132,7 +19556,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -19875,7 +20298,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -19909,21 +20332,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -19977,8 +20398,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -20032,6 +20453,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -20333,10 +20757,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator diff -Nru gnome-applets-3.5.91/configure.in gnome-applets-3.5.92/configure.in --- gnome-applets-3.5.91/configure.in 2012-08-30 18:33:48.000000000 +0000 +++ gnome-applets-3.5.92/configure.in 2012-09-20 01:07:34.000000000 +0000 @@ -1,7 +1,7 @@ dnl *************************************************************************** dnl *** configure.in for GNOME-APPLETS *** dnl *************************************************************************** -AC_INIT(gnome-applets, 3.5.91) +AC_INIT(gnome-applets, 3.5.92) AC_PREREQ(2.59) AM_CONFIG_HEADER(config.h) @@ -28,7 +28,7 @@ PYGOBJECT_REQUIRED=2.26 GNOME_ICON_THEME_REQUIRED=2.15.91 LIBXML_REQUIRED=2.5.0 -GWEATHER_REQUIRED=2.91.0 +GWEATHER_REQUIRED=3.5.0 GUCHARMAP3_REQUIRED=2.33.0 POLKIT_REQUIRED=0.92 NETWORKMANAGER_REQUIRED=0.7 @@ -258,6 +258,9 @@ AC_SUBST(LIBGWEATHER_LIBS) AM_CONDITIONAL(BUILD_LIBGWEATHER_APPLETS, $build_libgweather_applets) +dnl -- check for GSettings (required for gweather applet) +GLIB_GSETTINGS + dnl -- check for NetworkManager ----------------------------------------------- AC_ARG_ENABLE([networkmanager], AC_HELP_STRING([--enable-networkmanager], @@ -294,6 +297,7 @@ AC_MSG_ERROR([Mixer applet explicitly requested but a compatible gstreamer version was not found]) fi fi +MIXER_LIBS="$MIXER_LIBS -lm" AM_CONDITIONAL(BUILD_MIXER_APPLET, test "x$enable_mixer" = "xyes") AC_SUBST(MIXER_CFLAGS) AC_SUBST(MIXER_LIBS) diff -Nru gnome-applets-3.5.91/cpufreq/Makefile.in gnome-applets-3.5.92/cpufreq/Makefile.in --- gnome-applets-3.5.91/cpufreq/Makefile.in 2012-08-30 18:36:45.000000000 +0000 +++ gnome-applets-3.5.92/cpufreq/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -35,7 +51,7 @@ host_triplet = @host@ subdir = cpufreq DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - AUTHORS + $(top_srcdir)/mkinstalldirs AUTHORS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -50,12 +66,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -65,6 +87,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -86,6 +113,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(builderdir)" \ "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(servicedir)" \ "$(DESTDIR)$(uidir)" @@ -176,6 +209,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -187,6 +221,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -212,6 +247,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -327,6 +366,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -337,6 +377,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -430,8 +472,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -445,13 +490,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-builderDATA: $(builder_DATA) @$(NORMAL_INSTALL) - test -z "$(builderdir)" || $(MKDIR_P) "$(DESTDIR)$(builderdir)" @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(builderdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(builderdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -465,13 +511,14 @@ @$(NORMAL_UNINSTALL) @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(builderdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(builderdir)" && rm -f $$files + dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -485,13 +532,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -505,13 +553,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -525,17 +574,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -545,7 +592,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -559,37 +610,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -598,6 +618,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -661,6 +685,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -696,13 +734,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -740,10 +775,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -826,19 +866,20 @@ uninstall-am: uninstall-appletDATA uninstall-builderDATA \ uninstall-schemasDATA uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-builderDATA install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-schemasDATA \ + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-appletDATA install-builderDATA install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-schemasDATA \ install-serviceDATA install-strip install-uiDATA installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ diff -Nru gnome-applets-3.5.91/cpufreq/help/Makefile.in gnome-applets-3.5.92/cpufreq/help/Makefile.in --- gnome-applets-3.5.91/cpufreq/help/Makefile.in 2012-08-30 18:36:45.000000000 +0000 +++ gnome-applets-3.5.92/cpufreq/help/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = cpufreq/help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -465,6 +515,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -486,6 +537,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -534,10 +587,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -711,7 +769,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -725,7 +782,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -733,7 +790,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -772,18 +829,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -793,10 +847,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -864,7 +918,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -932,8 +1008,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -959,7 +1035,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1027,7 +1114,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/cpufreq/pixmaps/Makefile.in gnome-applets-3.5.92/cpufreq/pixmaps/Makefile.in --- gnome-applets-3.5.91/cpufreq/pixmaps/Makefile.in 2012-08-30 18:36:45.000000000 +0000 +++ gnome-applets-3.5.92/cpufreq/pixmaps/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -34,7 +50,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = cpufreq/pixmaps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -49,14 +66,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +106,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(cpufreq_pixmapdir)" DATA = $(cpufreq_pixmap_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -132,6 +166,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -143,6 +178,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -168,6 +204,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,6 +323,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -293,6 +334,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -378,8 +421,11 @@ -rm -rf .libs _libs install-cpufreq_pixmapDATA: $(cpufreq_pixmap_DATA) @$(NORMAL_INSTALL) - test -z "$(cpufreq_pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(cpufreq_pixmapdir)" @list='$(cpufreq_pixmap_DATA)'; test -n "$(cpufreq_pixmapdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(cpufreq_pixmapdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(cpufreq_pixmapdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -393,15 +439,15 @@ @$(NORMAL_UNINSTALL) @list='$(cpufreq_pixmap_DATA)'; test -n "$(cpufreq_pixmapdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(cpufreq_pixmapdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(cpufreq_pixmapdir)" && rm -f $$files + dir='$(DESTDIR)$(cpufreq_pixmapdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -450,10 +496,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/cpufreq/src/Makefile.in gnome-applets-3.5.92/cpufreq/src/Makefile.in --- gnome-applets-3.5.91/cpufreq/src/Makefile.in 2012-08-30 18:36:45.000000000 +0000 +++ gnome-applets-3.5.92/cpufreq/src/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -35,7 +51,8 @@ host_triplet = @host@ libexec_PROGRAMS = cpufreq-applet$(EXEEXT) subdir = cpufreq/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -75,9 +92,22 @@ am__DEPENDENCIES_1 = cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -88,22 +118,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(cpufreq_applet_SOURCES) DIST_SOURCES = $(am__cpufreq_applet_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -113,6 +139,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -198,6 +229,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -209,6 +241,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -234,6 +267,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -349,6 +386,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -359,6 +397,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -448,8 +488,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -489,7 +532,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -cpufreq-applet$(EXEEXT): $(cpufreq_applet_OBJECTS) $(cpufreq_applet_DEPENDENCIES) +cpufreq-applet$(EXEEXT): $(cpufreq_applet_OBJECTS) $(cpufreq_applet_DEPENDENCIES) $(EXTRA_cpufreq_applet_DEPENDENCIES) @rm -f cpufreq-applet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(cpufreq_applet_OBJECTS) $(cpufreq_applet_LDADD) $(LIBS) @@ -514,26 +557,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -542,12 +582,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -557,7 +597,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -571,37 +615,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -610,6 +623,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -673,6 +690,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -708,13 +739,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -752,10 +780,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -838,24 +871,26 @@ uninstall-am: uninstall-libexecPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-libexecPROGRAMS + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-libexecPROGRAMS -include $(top_srcdir)/git.mk diff -Nru gnome-applets-3.5.91/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-3.5.92/cpufreq/src/cpufreq-selector/Makefile.in --- gnome-applets-3.5.91/cpufreq/src/cpufreq-selector/Makefile.in 2012-08-30 18:36:45.000000000 +0000 +++ gnome-applets-3.5.92/cpufreq/src/cpufreq-selector/Makefile.in 2012-09-20 01:10:27.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -44,7 +60,8 @@ @HAVE_POLKIT_TRUE@ $(POLKIT_LIBS) subdir = cpufreq/src/cpufreq-selector -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -85,13 +102,26 @@ @HAVE_POLKIT_TRUE@ $(am__DEPENDENCIES_1) cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = cpufreq_selector_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(cpufreq_selector_LDFLAGS) $(LDFLAGS) \ -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -102,24 +132,25 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(cpufreq_selector_SOURCES) DIST_SOURCES = $(am__cpufreq_selector_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -141,6 +172,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(dbus_conf_DATA) $(dbus_services_DATA) $(polkit_DATA) ETAGS = etags CTAGS = ctags @@ -196,6 +233,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -207,6 +245,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -232,6 +271,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -347,6 +390,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -357,6 +401,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -458,8 +504,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -499,7 +548,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -cpufreq-selector$(EXEEXT): $(cpufreq_selector_OBJECTS) $(cpufreq_selector_DEPENDENCIES) +cpufreq-selector$(EXEEXT): $(cpufreq_selector_OBJECTS) $(cpufreq_selector_DEPENDENCIES) $(EXTRA_cpufreq_selector_DEPENDENCIES) @rm -f cpufreq-selector$(EXEEXT) $(AM_V_CCLD)$(cpufreq_selector_LINK) $(cpufreq_selector_OBJECTS) $(cpufreq_selector_LDADD) $(LIBS) @@ -520,26 +569,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -548,8 +594,11 @@ -rm -rf .libs _libs install-dbus_confDATA: $(dbus_conf_DATA) @$(NORMAL_INSTALL) - test -z "$(dbus_confdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_confdir)" @list='$(dbus_conf_DATA)'; test -n "$(dbus_confdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbus_confdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbus_confdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -563,13 +612,14 @@ @$(NORMAL_UNINSTALL) @list='$(dbus_conf_DATA)'; test -n "$(dbus_confdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(dbus_confdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(dbus_confdir)" && rm -f $$files + dir='$(DESTDIR)$(dbus_confdir)'; $(am__uninstall_files_from_dir) install-dbus_servicesDATA: $(dbus_services_DATA) @$(NORMAL_INSTALL) - test -z "$(dbus_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)" @list='$(dbus_services_DATA)'; test -n "$(dbus_servicesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbus_servicesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -583,13 +633,14 @@ @$(NORMAL_UNINSTALL) @list='$(dbus_services_DATA)'; test -n "$(dbus_servicesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files + dir='$(DESTDIR)$(dbus_servicesdir)'; $(am__uninstall_files_from_dir) install-polkitDATA: $(polkit_DATA) @$(NORMAL_INSTALL) - test -z "$(polkitdir)" || $(MKDIR_P) "$(DESTDIR)$(polkitdir)" @list='$(polkit_DATA)'; test -n "$(polkitdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(polkitdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(polkitdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -603,9 +654,7 @@ @$(NORMAL_UNINSTALL) @list='$(polkit_DATA)'; test -n "$(polkitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(polkitdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(polkitdir)" && rm -f $$files + dir='$(DESTDIR)$(polkitdir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -656,6 +705,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -708,10 +771,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -801,21 +869,21 @@ .MAKE: all check install install-am install-exec-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dbus_confDATA install-dbus_servicesDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-polkitDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-dbus_confDATA uninstall-dbus_servicesDATA \ - uninstall-polkitDATA + clean-generic clean-libtool cscopelist ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dbus_confDATA \ + install-dbus_servicesDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-polkitDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-dbus_confDATA \ + uninstall-dbus_servicesDATA uninstall-polkitDATA install-exec-hook: diff -Nru gnome-applets-3.5.91/cpufreq/src/cpufreq-selector/cpufreq-selector-service-glue.h gnome-applets-3.5.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service-glue.h --- gnome-applets-3.5.91/cpufreq/src/cpufreq-selector/cpufreq-selector-service-glue.h 2012-04-30 19:50:49.000000000 +0000 +++ gnome-applets-3.5.92/cpufreq/src/cpufreq-selector/cpufreq-selector-service-glue.h 2012-09-19 21:57:44.000000000 +0000 @@ -10,7 +10,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -Nru gnome-applets-3.5.91/debian/changelog gnome-applets-3.5.92/debian/changelog --- gnome-applets-3.5.91/debian/changelog 2012-08-31 05:26:38.000000000 +0000 +++ gnome-applets-3.5.92/debian/changelog 2012-09-20 02:38:43.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-applets (3.5.92-0ubuntu1) quantal; urgency=low + + * New upstream bugfix release + * debian/patches/gweather-3.6.patch: + - Applied upstream + + -- Robert Ancell Thu, 20 Sep 2012 14:32:02 +1200 + gnome-applets (3.5.91-0ubuntu1) quantal; urgency=low * New upstream release diff -Nru gnome-applets-3.5.91/debian/patches/gweather-3.6.patch gnome-applets-3.5.92/debian/patches/gweather-3.6.patch --- gnome-applets-3.5.91/debian/patches/gweather-3.6.patch 2012-08-31 05:26:38.000000000 +0000 +++ gnome-applets-3.5.92/debian/patches/gweather-3.6.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1296 +0,0 @@ -From 8ea7d8d968715502676e4f30c3e6d1fb3904534a Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Wed, 14 Dec 2011 18:51:26 +0100 -Subject: [PATCH] gweather: port to the new libgweather - -libgweather API was broken to add introspection support, and to -remove the old dependency on GConf. Update accordingly. - -https://bugzilla.gnome.org/show_bug.cgi?id=678977 ---- - configure.in | 5 +- - gweather/Makefile.am | 9 + - gweather/gweather-applet.c | 91 ++--- - gweather/gweather-dialog.c | 185 +++------ - gweather/gweather-pref.c | 394 ++++++-------------- - gweather/gweather.h | 14 +- - gweather/main.c | 11 +- - ....gnome.applets.GWeatherApplet.gschema.xml.in.in | 29 ++ - 8 files changed, 249 insertions(+), 489 deletions(-) - create mode 100644 gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in - -diff --git a/configure.in b/configure.in -index a3d37cc..3c5db98 100644 ---- a/configure.in -+++ b/configure.in -@@ -28,7 +28,7 @@ DBUS_GLIB_REQUIRED=0.74 - PYGOBJECT_REQUIRED=2.26 - GNOME_ICON_THEME_REQUIRED=2.15.91 - LIBXML_REQUIRED=2.5.0 --GWEATHER_REQUIRED=2.91.0 -+GWEATHER_REQUIRED=3.5.0 - GUCHARMAP3_REQUIRED=2.33.0 - POLKIT_REQUIRED=0.92 - NETWORKMANAGER_REQUIRED=0.7 -@@ -258,6 +258,9 @@ AC_SUBST(LIBGWEATHER_CFLAGS) - AC_SUBST(LIBGWEATHER_LIBS) - AM_CONDITIONAL(BUILD_LIBGWEATHER_APPLETS, $build_libgweather_applets) - -+dnl -- check for GSettings (required for gweather applet) -+GLIB_GSETTINGS -+ - dnl -- check for NetworkManager ----------------------------------------------- - AC_ARG_ENABLE([networkmanager], - AC_HELP_STRING([--enable-networkmanager], -diff --git a/gweather/Makefile.am b/gweather/Makefile.am -index 1537b29..9545a1e 100644 ---- a/gweather/Makefile.am -+++ b/gweather/Makefile.am -@@ -57,6 +57,15 @@ org.gnome.panel.applet.GWeatherAppletFactory.service: $(service_in_files) - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - -+%.gschema.xml.in: %.gschema.xml.in.in -+ $(AM_V_GEN)sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|" $< > $@ -+ -+@INTLTOOL_XML_NOMERGE_RULE@ -+ -+@GSETTINGS_RULES@ -+ -+gsettings_SCHEMAS = org.gnome.applets.GWeatherApplet.gschema.xml -+ - CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) - - EXTRA_DIST = \ -diff --git a/gweather/gweather-applet.c b/gweather/gweather-applet.c -index c906eef..9c9c243 100644 ---- a/gweather/gweather-applet.c -+++ b/gweather/gweather-applet.c -@@ -150,7 +150,7 @@ static void place_widgets (GWeatherApplet *gw_applet) - } - - /* Create the weather icon */ -- icon_name = weather_info_get_icon_name (gw_applet->gweather_info); -+ icon_name = gweather_info_get_icon_name (gw_applet->gweather_info); - gw_applet->image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON); - - if (icon_name != NULL) { -@@ -165,7 +165,7 @@ static void place_widgets (GWeatherApplet *gw_applet) - gw_applet->label = gtk_label_new("--"); - - /* Update temperature text */ -- temp = weather_info_get_temp_summary(gw_applet->gweather_info); -+ temp = gweather_info_get_temp_summary(gw_applet->gweather_info); - if (temp) - gtk_label_set_text(GTK_LABEL(gw_applet->label), temp); - -@@ -294,11 +294,10 @@ applet_destroy (GtkWidget *widget, GWeatherApplet *gw_applet) - gw_applet->suncalc_timeout_tag = 0; - } - -- if (gw_applet->gconf) { -- gweather_gconf_free (gw_applet->gconf); -- } -+ g_clear_object (&gw_applet->lib_settings); -+ g_clear_object (&gw_applet->applet_settings); - -- weather_info_abort (gw_applet->gweather_info); -+ gweather_info_abort (gw_applet->gweather_info); - } - - #ifdef HAVE_NETWORKMANAGER -@@ -311,16 +310,6 @@ void gweather_applet_create (GWeatherApplet *gw_applet) - gchar *ui_path; - AtkObject *atk_obj; - -- gw_applet->gweather_pref.location = NULL; -- gw_applet->gweather_pref.update_interval = 1800; -- gw_applet->gweather_pref.update_enabled = TRUE; -- gw_applet->gweather_pref.detailed = FALSE; -- gw_applet->gweather_pref.radar_enabled = TRUE; -- gw_applet->gweather_pref.temperature_unit = TEMP_UNIT_INVALID; -- gw_applet->gweather_pref.speed_unit = SPEED_UNIT_INVALID; -- gw_applet->gweather_pref.pressure_unit = PRESSURE_UNIT_INVALID; -- gw_applet->gweather_pref.distance_unit = DISTANCE_UNIT_INVALID; -- - panel_applet_set_flags (gw_applet->applet, PANEL_APPLET_EXPAND_MINOR); - - panel_applet_set_background_widget(gw_applet->applet, -@@ -389,7 +378,7 @@ gint timeout_cb (gpointer data) - } - - static void --update_finish (WeatherInfo *info, gpointer data) -+update_finish (GWeatherInfo *info, gpointer data) - { - static int gw_fault_counter = 0; - #ifdef HAVE_LIBNOTIFY -@@ -403,33 +392,32 @@ update_finish (WeatherInfo *info, gpointer data) - /* Update timer */ - if (gw_applet->timeout_tag > 0) - g_source_remove(gw_applet->timeout_tag); -- if (gw_applet->gweather_pref.update_enabled) -+ if (g_settings_get_boolean (gw_applet->applet_settings, "auto-update")) - { - gw_applet->timeout_tag = -- g_timeout_add_seconds ( -- gw_applet->gweather_pref.update_interval, -- timeout_cb, gw_applet); -+ g_timeout_add_seconds (g_settings_get_int (gw_applet->applet_settings, "auto-update-interval"), -+ timeout_cb, gw_applet); - -- nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info); -+ nxtSunEvent = gweather_info_next_sun_event(gw_applet->gweather_info); - if (nxtSunEvent >= 0) - gw_applet->suncalc_timeout_tag = - g_timeout_add_seconds (nxtSunEvent, - suncalc_timeout_cb, gw_applet); - } - -- if ((TRUE == weather_info_is_valid (info)) || -+ if ((TRUE == gweather_info_is_valid (info)) || - (gw_fault_counter >= MAX_CONSECUTIVE_FAULTS)) - { - gw_fault_counter = 0; -- icon_name = weather_info_get_icon_name (gw_applet->gweather_info); -+ icon_name = gweather_info_get_icon_name (gw_applet->gweather_info); - gtk_image_set_from_icon_name (GTK_IMAGE(gw_applet->image), - icon_name, GTK_ICON_SIZE_BUTTON); - - gtk_label_set_text (GTK_LABEL (gw_applet->label), -- weather_info_get_temp_summary( -+ gweather_info_get_temp_summary( - gw_applet->gweather_info)); - -- s = weather_info_get_weather_summary (gw_applet->gweather_info); -+ s = gweather_info_get_weather_summary (gw_applet->gweather_info); - gtk_widget_set_tooltip_text (GTK_WIDGET (gw_applet->applet), s); - g_free (s); - -@@ -442,8 +430,7 @@ update_finish (WeatherInfo *info, gpointer data) - place_widgets(gw_applet); - - #ifdef HAVE_LIBNOTIFY -- if (panel_applet_gconf_get_bool (gw_applet->applet, -- "show_notifications", NULL)) -+ if (g_settings_get_boolean (gw_applet->applet_settings, "show-notifications")) - { - NotifyNotification *n; - -@@ -458,15 +445,15 @@ update_finish (WeatherInfo *info, gpointer data) - - /* Show notification */ - message = g_strdup_printf ("%s: %s", -- weather_info_get_location_name (info), -- weather_info_get_sky (info)); -+ gweather_info_get_location_name (info), -+ gweather_info_get_sky (info)); - detail = g_strdup_printf ( - _("City: %s\nSky: %s\nTemperature: %s"), -- weather_info_get_location_name (info), -- weather_info_get_sky (info), -- weather_info_get_temp_summary (info)); -+ gweather_info_get_location_name (info), -+ gweather_info_get_sky (info), -+ gweather_info_get_temp_summary (info)); - -- icon = weather_info_get_icon_name (gw_applet->gweather_info); -+ icon = gweather_info_get_icon_name (gw_applet->gweather_info); - if (icon == NULL) - icon = "stock-unknown"; - -@@ -496,7 +483,7 @@ update_finish (WeatherInfo *info, gpointer data) - - gint suncalc_timeout_cb (gpointer data) - { -- WeatherInfo *info = ((GWeatherApplet *)data)->gweather_info; -+ GWeatherInfo *info = ((GWeatherApplet *)data)->gweather_info; - update_finish(info, data); - return 0; /* Do not repeat timeout (will be re-set by update_finish) */ - } -@@ -504,41 +491,23 @@ gint suncalc_timeout_cb (gpointer data) - - void gweather_update (GWeatherApplet *gw_applet) - { -- WeatherPrefs prefs; - const gchar *icon_name; -+ GWeatherForecastType type; - -- icon_name = weather_info_get_icon_name(gw_applet->gweather_info); -+ icon_name = gweather_info_get_icon_name(gw_applet->gweather_info); - gtk_image_set_from_icon_name (GTK_IMAGE (gw_applet->image), - icon_name, GTK_ICON_SIZE_BUTTON); - gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("Updating...")); - - /* Set preferred forecast type */ -- prefs.type = gw_applet->gweather_pref.detailed ? FORECAST_ZONE : FORECAST_STATE; -- -- /* Set radar map retrieval option */ -- prefs.radar = gw_applet->gweather_pref.radar_enabled; -- prefs.radar_custom_url = (gw_applet->gweather_pref.use_custom_radar_url && -- gw_applet->gweather_pref.radar) ? -- gw_applet->gweather_pref.radar : NULL; -- -- /* Set the units */ -- prefs.temperature_unit = gw_applet->gweather_pref.temperature_unit; -- prefs.speed_unit = gw_applet->gweather_pref.speed_unit; -- prefs.pressure_unit = gw_applet->gweather_pref.pressure_unit; -- prefs.distance_unit = gw_applet->gweather_pref.distance_unit; -+ type = g_settings_get_boolean (gw_applet->applet_settings, "detailed") ? -+ GWEATHER_FORECAST_ZONE : GWEATHER_FORECAST_STATE; - - /* Update current conditions */ -- if (gw_applet->gweather_info && -- weather_location_equal(weather_info_get_location(gw_applet->gweather_info), -- gw_applet->gweather_pref.location)) { -- weather_info_update(gw_applet->gweather_info, &prefs, -- update_finish, gw_applet); -- } else { -- weather_info_free(gw_applet->gweather_info); -- gw_applet->gweather_info = weather_info_new(gw_applet->gweather_pref.location, -- &prefs, -- update_finish, gw_applet); -- } -+ g_object_unref(gw_applet->gweather_info); -+ gw_applet->gweather_info = gweather_info_new(NULL, /* default location */ -+ type); -+ g_signal_connect(gw_applet->gweather_info, "updated", G_CALLBACK (update_finish), gw_applet); - } - - #ifdef HAVE_NETWORKMANAGER -diff --git a/gweather/gweather-dialog.c b/gweather/gweather-dialog.c -index 94ab4bf..4912b0e 100644 ---- a/gweather/gweather-dialog.c -+++ b/gweather/gweather-dialog.c -@@ -61,64 +61,6 @@ G_DEFINE_TYPE (GWeatherDialog, gweather_dialog, GTK_TYPE_DIALOG); - #define MONOSPACE_FONT_KEY MONOSPACE_FONT_DIR "/monospace_font_name" - - static void --gweather_dialog_save_geometry (GWeatherDialog *dialog) --{ -- GWeatherGConf *gconf; -- int w, h, x, y; -- -- gconf = dialog->priv->applet->gconf; -- -- gtk_window_get_position (GTK_WINDOW (dialog), &x, &y); -- gtk_window_get_size (GTK_WINDOW (dialog), &w, &h); -- -- gweather_gconf_set_int (gconf, "dialog_width", w, NULL); -- gweather_gconf_set_int (gconf, "dialog_height", h, NULL); -- gweather_gconf_set_int (gconf, "dialog_x", x, NULL); -- gweather_gconf_set_int (gconf, "dialog_y", y, NULL); --} -- --static void --gweather_dialog_load_geometry (GWeatherDialog *dialog) --{ -- GWeatherGConf *gconf; -- int w, h, x, y; -- GError *error; -- -- gconf = dialog->priv->applet->gconf; -- error = NULL; -- -- w = gweather_gconf_get_int (gconf, "dialog_width", &error); -- if (error) { -- g_message ("gweather: no spatial information available"); -- g_error_free (error); -- return; -- } -- h = gweather_gconf_get_int (gconf, "dialog_height", &error); -- if (error) { -- g_message ("gweather: no spatial information available"); -- g_error_free (error); -- return; -- } -- x = gweather_gconf_get_int (gconf, "dialog_x", &error); -- if (error) { -- g_message ("gweather: no spatial information available"); -- g_error_free (error); -- return; -- } -- y = gweather_gconf_get_int (gconf, "dialog_y", &error); -- if (error) { -- g_message ("gweather: no spatial information available"); -- g_error_free (error); -- return; -- } -- -- if (w > 0 && h > 0) { -- gtk_window_resize (GTK_WINDOW (dialog), w, h); -- } -- gtk_window_move (GTK_WINDOW (dialog), x, y); --} -- --static void - response_cb (GWeatherDialog *dialog, - gint id, - gpointer data) -@@ -220,14 +162,13 @@ gweather_dialog_create (GWeatherDialog *dialog) - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - -- if (gw_applet->gweather_pref.radar_enabled) -+ if (g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map")) - gtk_window_set_default_size (GTK_WINDOW (dialog), 570,440); - else - gtk_window_set_default_size (GTK_WINDOW (dialog), 590, 340); - - gtk_window_set_screen (GTK_WINDOW (dialog), - gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet))); -- gweather_dialog_load_geometry (dialog); - - /* Must come after load geometry, otherwise it will get reset. */ - gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); -@@ -486,36 +427,32 @@ gweather_dialog_create (GWeatherDialog *dialog) - gtk_widget_show (current_note_lbl); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (weather_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (weather_notebook), 0), current_note_lbl); - -- if (gw_applet->gweather_pref.location->zone_valid) { -- -- forecast_hbox = gtk_hbox_new(FALSE, 0); -- gtk_container_set_border_width (GTK_CONTAINER (forecast_hbox), 12); -- gtk_widget_show (forecast_hbox); -+ forecast_hbox = gtk_hbox_new(FALSE, 0); -+ gtk_container_set_border_width (GTK_CONTAINER (forecast_hbox), 12); -+ gtk_widget_show (forecast_hbox); - -- scrolled_window = gtk_scrolled_window_new (NULL, NULL); -- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), -- GTK_SHADOW_ETCHED_IN); -+ scrolled_window = gtk_scrolled_window_new (NULL, NULL); -+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), -+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), -+ GTK_SHADOW_ETCHED_IN); - -- priv->forecast_text = gtk_text_view_new (); -- set_access_namedesc (priv->forecast_text, _("Forecast Report"), _("See the ForeCast Details")); -- gtk_container_add (GTK_CONTAINER (scrolled_window), priv->forecast_text); -- gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->forecast_text), FALSE); -- gtk_text_view_set_left_margin (GTK_TEXT_VIEW (priv->forecast_text), 6); -- gtk_widget_show (priv->forecast_text); -- gtk_widget_show (scrolled_window); -- gtk_box_pack_start (GTK_BOX (forecast_hbox), scrolled_window, TRUE, TRUE, 0); -+ priv->forecast_text = gtk_text_view_new (); -+ set_access_namedesc (priv->forecast_text, _("Forecast Report"), _("See the ForeCast Details")); -+ gtk_container_add (GTK_CONTAINER (scrolled_window), priv->forecast_text); -+ gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->forecast_text), FALSE); -+ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (priv->forecast_text), 6); -+ gtk_widget_show (priv->forecast_text); -+ gtk_widget_show (scrolled_window); -+ gtk_box_pack_start (GTK_BOX (forecast_hbox), scrolled_window, TRUE, TRUE, 0); - -- gtk_container_add (GTK_CONTAINER (weather_notebook), forecast_hbox); -+ gtk_container_add (GTK_CONTAINER (weather_notebook), forecast_hbox); - -- forecast_note_lbl = gtk_label_new (_("Forecast")); -- gtk_widget_show (forecast_note_lbl); -- gtk_notebook_set_tab_label (GTK_NOTEBOOK (weather_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (weather_notebook), 1), forecast_note_lbl); -- -- } -+ forecast_note_lbl = gtk_label_new (_("Forecast")); -+ gtk_widget_show (forecast_note_lbl); -+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (weather_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (weather_notebook), 1), forecast_note_lbl); - -- if (gw_applet->gweather_pref.radar_enabled) { -+ if (g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map")) { - - radar_note_lbl = gtk_label_new_with_mnemonic (_("Radar Map")); - gtk_widget_show (radar_note_lbl); -@@ -548,12 +485,12 @@ gweather_dialog_create (GWeatherDialog *dialog) - gtk_widget_show (radar_link_alignment); - gtk_box_pack_start (GTK_BOX (radar_vbox), radar_link_alignment, FALSE, FALSE, 0); - -+ /* XXX: weather.com? is this an advert? */ - radar_link_btn = gtk_button_new_with_mnemonic (_("_Visit Weather.com")); - set_access_namedesc (radar_link_btn, _("Visit Weather.com"), _("Click to Enter Weather.com")); - gtk_widget_set_size_request (radar_link_btn, 450, -2); - gtk_widget_show (radar_link_btn); -- if (!gweather_gconf_get_bool (gw_applet->gconf, "use_custom_radar_url", NULL)) -- gtk_container_add (GTK_CONTAINER (radar_link_alignment), radar_link_btn); -+ gtk_container_add (GTK_CONTAINER (radar_link_alignment), radar_link_btn); - - g_signal_connect (G_OBJECT (radar_link_btn), "clicked", - G_CALLBACK (link_cb), NULL); -@@ -600,49 +537,47 @@ void gweather_dialog_update (GWeatherDialog *dialog) - return; - - /* Update icon */ -- icon_name = weather_info_get_icon_name (gw_applet->gweather_info); -+ icon_name = gweather_info_get_icon_name (gw_applet->gweather_info); - gtk_image_set_from_icon_name (GTK_IMAGE (priv->cond_image), - icon_name, GTK_ICON_SIZE_DIALOG); - - /* Update current condition fields and forecast */ -- gtk_label_set_text(GTK_LABEL(priv->cond_location), weather_info_get_location_name(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_update), weather_info_get_update(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_cond), weather_info_get_conditions(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_sky), weather_info_get_sky(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_temp), weather_info_get_temp(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_apparent), weather_info_get_apparent(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_dew), weather_info_get_dew(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_humidity), weather_info_get_humidity(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_wind), weather_info_get_wind(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_pressure), weather_info_get_pressure(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_vis), weather_info_get_visibility(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_sunrise), weather_info_get_sunrise(gw_applet->gweather_info)); -- gtk_label_set_text(GTK_LABEL(priv->cond_sunset), weather_info_get_sunset(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_location), gweather_info_get_location_name(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_update), gweather_info_get_update(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_cond), gweather_info_get_conditions(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_sky), gweather_info_get_sky(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_temp), gweather_info_get_temp(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_apparent), gweather_info_get_apparent(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_dew), gweather_info_get_dew(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_humidity), gweather_info_get_humidity(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_wind), gweather_info_get_wind(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_pressure), gweather_info_get_pressure(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_vis), gweather_info_get_visibility(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_sunrise), gweather_info_get_sunrise(gw_applet->gweather_info)); -+ gtk_label_set_text(GTK_LABEL(priv->cond_sunset), gweather_info_get_sunset(gw_applet->gweather_info)); - - /* Update forecast */ -- if (gw_applet->gweather_pref.location->zone_valid) { -- font_desc = get_system_monospace_font (); -- if (font_desc) { -- gtk_widget_modify_font (priv->forecast_text, font_desc); -- pango_font_description_free (font_desc); -- } -+ font_desc = get_system_monospace_font (); -+ if (font_desc) { -+ gtk_widget_modify_font (priv->forecast_text, font_desc); -+ pango_font_description_free (font_desc); -+ } - -- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->forecast_text)); -- forecast = g_strdup(weather_info_get_forecast(gw_applet->gweather_info)); -- if (forecast) { -- forecast = g_strstrip(replace_multiple_new_lines(forecast)); -- gtk_text_buffer_set_text(buffer, forecast, -1); -- g_free(forecast); -- } else { -- gtk_text_buffer_set_text(buffer, _("Forecast not currently available for this location."), -1); -- } -+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->forecast_text)); -+ forecast = g_strdup(gweather_info_get_forecast(gw_applet->gweather_info)); -+ if (forecast) { -+ forecast = g_strstrip(replace_multiple_new_lines(forecast)); -+ gtk_text_buffer_set_text(buffer, forecast, -1); -+ g_free(forecast); -+ } else { -+ gtk_text_buffer_set_text(buffer, _("Forecast not currently available for this location."), -1); - } - - /* Update radar map */ -- if (gw_applet->gweather_pref.radar_enabled) { -+ if (g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map")) { - GdkPixbufAnimation *radar; - -- radar = weather_info_get_radar (gw_applet->gweather_info); -+ radar = gweather_info_get_radar (gw_applet->gweather_info); - if (radar) { - gtk_image_set_from_animation (GTK_IMAGE (priv->radar_image), radar); - } -@@ -716,30 +651,16 @@ gweather_dialog_new (GWeatherApplet *applet) - NULL); - } - -- --static void --gweather_dialog_unrealize (GtkWidget *widget) --{ -- GWeatherDialog *self = GWEATHER_DIALOG (widget); -- -- gweather_dialog_save_geometry (self); -- -- GTK_WIDGET_CLASS (gweather_dialog_parent_class)->unrealize (widget); --} -- -- - static void - gweather_dialog_class_init (GWeatherDialogClass *klass) - { - GObjectClass *object_class = G_OBJECT_CLASS (klass); -- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - gweather_dialog_parent_class = g_type_class_peek_parent (klass); - - object_class->set_property = gweather_dialog_set_property; - object_class->get_property = gweather_dialog_get_property; - object_class->constructor = gweather_dialog_constructor; -- widget_class->unrealize = gweather_dialog_unrealize; - - /* This becomes an OBJECT property when GWeatherApplet is redone */ - g_object_class_install_property (object_class, -diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c -index 7327373..f30bc31 100644 ---- a/gweather/gweather-pref.c -+++ b/gweather/gweather-pref.c -@@ -70,47 +70,6 @@ enum - G_DEFINE_TYPE (GWeatherPref, gweather_pref, GTK_TYPE_DIALOG); - #define GWEATHER_PREF_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GWEATHER_TYPE_PREF, GWeatherPrefPrivate)) - -- --/* set sensitive and setup NEVER_SENSITIVE appropriately */ --static void --hard_set_sensitive (GtkWidget *w, gboolean sensitivity) --{ -- gtk_widget_set_sensitive (w, sensitivity); -- g_object_set_data (G_OBJECT (w), NEVER_SENSITIVE, -- GINT_TO_POINTER ( ! sensitivity)); --} -- -- --/* set sensitive, but always insensitive if NEVER_SENSITIVE is set */ --static void --soft_set_sensitive (GtkWidget *w, gboolean sensitivity) --{ -- if (g_object_get_data (G_OBJECT (w), NEVER_SENSITIVE)) -- gtk_widget_set_sensitive (w, FALSE); -- else -- gtk_widget_set_sensitive (w, sensitivity); --} -- -- --static gboolean --key_writable (GWeatherPref *pref, const char *key) --{ -- GWeatherApplet *applet = pref->priv->applet; -- gboolean writable; -- char *fullkey; -- static GConfClient *client = NULL; -- if (client == NULL) -- client = gconf_client_get_default (); -- -- fullkey = gweather_gconf_get_full_key (applet->gconf, key); -- -- writable = gconf_client_key_is_writable (client, fullkey, NULL); -- -- g_free (fullkey); -- -- return writable; --} -- - /* sets up ATK Relation between the widgets */ - - static void -@@ -174,65 +133,75 @@ static void gweather_pref_set_accessibility (GWeatherPref *pref) - - } - -+static gboolean -+bind_update_interval_get (GValue *value, -+ GVariant *variant, -+ gpointer user_data) -+{ -+ g_value_set_double (value, g_variant_get_int32 (variant) / 60); -+ return TRUE; -+} -+ -+static GVariant* -+bind_update_interval_set (const GValue *value, -+ const GVariantType *variant, -+ gpointer user_data) -+{ -+ return g_variant_new_int32 (g_value_get_double (value) * 60); -+} - - /* Update pref dialog from gweather_pref */ - static gboolean update_dialog (GWeatherPref *pref) - { - GWeatherApplet *gw_applet = pref->priv->applet; -+ gchar *radar_url; -+ gboolean has_radar, has_custom_radar; - -- g_return_val_if_fail(gw_applet->gweather_pref.location != NULL, FALSE); -+ g_settings_bind_with_mapping (gw_applet->applet_settings, "auto-update-interval", -+ pref->priv->basic_update_spin, "value", -+ G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY, -+ bind_update_interval_get, -+ bind_update_interval_set, -+ NULL, NULL); - -- gtk_spin_button_set_value(GTK_SPIN_BUTTON(pref->priv->basic_update_spin), -- gw_applet->gweather_pref.update_interval / 60); -- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_update_btn), -- gw_applet->gweather_pref.update_enabled); -- soft_set_sensitive(pref->priv->basic_update_spin, -- gw_applet->gweather_pref.update_enabled); -+ g_settings_bind (gw_applet->applet_settings, "auto-update", -+ pref->priv->basic_update_btn, "active", -+ G_SETTINGS_BIND_DEFAULT); - -- if ( gw_applet->gweather_pref.use_temperature_default) { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_temp_combo), 0); -- } else { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_temp_combo), -- gw_applet->gweather_pref.temperature_unit -1); -- } -- -- if ( gw_applet->gweather_pref.use_speed_default) { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_speed_combo), 0); -- } else { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_speed_combo), -- gw_applet->gweather_pref.speed_unit -1); -- } -- -- if ( gw_applet->gweather_pref.use_pressure_default) { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_pres_combo), 0); -- } else { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_pres_combo), -- gw_applet->gweather_pref.pressure_unit -1); -- } -- if ( gw_applet->gweather_pref.use_distance_default) { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_dist_combo), 0); -- } else { -- gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_dist_combo), -- gw_applet->gweather_pref.distance_unit -1); -- } -+ gtk_widget_set_sensitive(pref->priv->basic_update_spin, -+ g_settings_get_boolean (gw_applet->applet_settings, "auto-update")); -+ -+ g_settings_bind (gw_applet->lib_settings, "temperature-unit", -+ pref->priv->basic_temp_combo, "active", -+ G_SETTINGS_BIND_DEFAULT); -+ -+ g_settings_bind (gw_applet->lib_settings, "speed-unit", -+ pref->priv->basic_speed_combo, "active", -+ G_SETTINGS_BIND_DEFAULT); -+ -+ g_settings_bind (gw_applet->lib_settings, "pressure-unit", -+ pref->priv->basic_pres_combo, "active", -+ G_SETTINGS_BIND_DEFAULT); -+ -+ g_settings_bind (gw_applet->lib_settings, "distance-unit", -+ pref->priv->basic_dist_combo, "active", -+ G_SETTINGS_BIND_DEFAULT); - --#if 0 -- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_detailed_btn), -- gw_applet->gweather_pref.detailed); --#endif - #ifdef RADARMAP -+ has_radar = g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map"); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_radar_btn), -- gw_applet->gweather_pref.radar_enabled); -+ has_radar); -+ -+ radar_url = g_settings_get_string (gw_applet->lib_settings, "radar"); -+ has_custom_radar = radar_url && *radar_url; - -- soft_set_sensitive (pref->priv->basic_radar_url_btn, -- gw_applet->gweather_pref.radar_enabled); -- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_radar_url_btn), -- gw_applet->gweather_pref.use_custom_radar_url); -- soft_set_sensitive (pref->priv->basic_radar_url_hbox, -- gw_applet->gweather_pref.radar_enabled); -- if (gw_applet->gweather_pref.radar) -+ gtk_widget_set_sensitive (pref->priv->basic_radar_url_btn, has_radar); -+ gtk_widget_set_sensitive (pref->priv->basic_radar_url_hbox, has_radar && has_custom_radar); -+ if (radar_url) - gtk_entry_set_text (GTK_ENTRY (pref->priv->basic_radar_url_entry), -- gw_applet->gweather_pref.radar); -+ radar_url); -+ -+ g_free(radar_url); - #endif /* RADARMAP */ - - -@@ -243,27 +212,31 @@ static void row_selected_cb (GtkTreeSelection *selection, GWeatherPref *pref) - { - GWeatherApplet *gw_applet = pref->priv->applet; - GtkTreeModel *model; -- WeatherLocation *loc = NULL; - GtkTreeIter iter; -+ gchar *name, *code; -+ gboolean has_latlon; -+ gdouble latitude, longitude; - - if (!gtk_tree_selection_get_selected (selection, &model, &iter)) - return; - -- gtk_tree_model_get (model, &iter, GWEATHER_XML_COL_POINTER, &loc, -1); -+ gtk_tree_model_get (model, &iter, GWEATHER_XML_COL_METAR_CODE, &code, -1); - -- if (!loc) -+ if (!code) - return; - -- gweather_gconf_set_string(gw_applet->gconf, "location1", loc->code, NULL); -- gweather_gconf_set_string(gw_applet->gconf, "location2", loc->zone, NULL); -- gweather_gconf_set_string(gw_applet->gconf, "location3", loc->radar, NULL); -- gweather_gconf_set_string(gw_applet->gconf, "location4", loc->name, NULL); -- gweather_gconf_set_string(gw_applet->gconf, "coordinates", loc->coordinates, NULL); -- -- if (gw_applet->gweather_pref.location) { -- weather_location_free (gw_applet->gweather_pref.location); -- } -- gw_applet->gweather_pref.location = gweather_gconf_get_location (gw_applet->gconf); -+ gtk_tree_model_get (model, &iter, -+ GWEATHER_XML_COL_LOCATION_NAME, &name, -+ GWEATHER_XML_COL_LATLON_VALID, &has_latlon, -+ GWEATHER_XML_COL_LATITUDE, &latitude, -+ GWEATHER_XML_COL_LONGITUDE, &longitude, -+ -1); -+ -+ g_settings_set (gw_applet->lib_settings, "default-location", "(ssm(dd))", -+ name, code, has_latlon, latitude, longitude); -+ -+ g_free (name); -+ g_free (code); - - gweather_update (gw_applet); - } -@@ -275,21 +248,31 @@ compare_location (GtkTreeModel *model, - gpointer user_data) - { - GWeatherPref *pref = user_data; -- WeatherLocation *loc; - GtkTreeView *view; -+ gchar *name = NULL; -+ gchar *default_loc = NULL; -+ gboolean retval = FALSE; - -- gtk_tree_model_get (model, iter, GWEATHER_XML_COL_POINTER, &loc, -1); -- if (!loc) -- return FALSE; -+ gtk_tree_model_get (model, iter, GWEATHER_XML_COL_LOCATION_NAME, &name, -1); -+ if (!name) -+ retval = FALSE; - -- if (!weather_location_equal (loc, pref->priv->applet->gweather_pref.location)) -- return FALSE; -+ g_settings_get (pref->priv->applet->lib_settings, "default-location", "(ssm(dd))", -+ &default_loc, NULL, NULL); - -- view = GTK_TREE_VIEW (pref->priv->tree); -- gtk_tree_view_expand_to_path (view, path); -- gtk_tree_view_set_cursor (view, path, NULL, FALSE); -- gtk_tree_view_scroll_to_cell (view, path, NULL, TRUE, 0.5, 0.5); -- return TRUE; -+ if (strcmp(name, default_loc)) -+ retval = FALSE; -+ -+ if (retval) { -+ view = GTK_TREE_VIEW (pref->priv->tree); -+ gtk_tree_view_expand_to_path (view, path); -+ gtk_tree_view_set_cursor (view, path, NULL, FALSE); -+ gtk_tree_view_scroll_to_cell (view, path, NULL, TRUE, 0.5, 0.5); -+ } -+ -+ g_free(name); -+ g_free(default_loc); -+ return retval; - } - - static void load_locations (GWeatherPref *pref) -@@ -301,7 +284,7 @@ static void load_locations (GWeatherPref *pref) - /* Add a colum for the locations */ - cell_renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("not used", cell_renderer, -- "text", GWEATHER_XML_COL_LOC, NULL); -+ "text", GWEATHER_XML_COL_LOCATION_NAME, NULL); - gtk_tree_view_append_column (tree, column); - gtk_tree_view_set_expander_column (GTK_TREE_VIEW (tree), column); - -@@ -320,10 +303,8 @@ static void load_locations (GWeatherPref *pref) - } - gtk_tree_view_set_model (tree, pref->priv->model); - -- if (pref->priv->applet->gweather_pref.location) { -- /* Select the current (default) location */ -- gtk_tree_model_foreach (GTK_TREE_MODEL (pref->priv->model), compare_location, pref); -- } -+ /* Select the current (default) location */ -+ gtk_tree_model_foreach (GTK_TREE_MODEL (pref->priv->model), compare_location, pref); - } - - static void -@@ -334,18 +315,15 @@ auto_update_toggled (GtkToggleButton *button, GWeatherPref *pref) - gint nxtSunEvent; - - toggled = gtk_toggle_button_get_active(button); -- gw_applet->gweather_pref.update_enabled = toggled; -- soft_set_sensitive (pref->priv->basic_update_spin, toggled); -- gweather_gconf_set_bool(gw_applet->gconf, "auto_update", toggled, NULL); -+ gtk_widget_set_sensitive (pref->priv->basic_update_spin, toggled); - if (gw_applet->timeout_tag > 0) - g_source_remove(gw_applet->timeout_tag); - if (gw_applet->suncalc_timeout_tag > 0) - g_source_remove(gw_applet->suncalc_timeout_tag); -- if (gw_applet->gweather_pref.update_enabled) { -- gw_applet->timeout_tag = g_timeout_add_seconds ( -- gw_applet->gweather_pref.update_interval, -- timeout_cb, gw_applet); -- nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info); -+ if (toggled) { -+ gw_applet->timeout_tag = g_timeout_add_seconds (g_settings_get_int (gw_applet->applet_settings, "auto-update-interval"), -+ timeout_cb, gw_applet); -+ nxtSunEvent = gweather_info_next_sun_event(gw_applet->gweather_info); - if (nxtSunEvent >= 0) - gw_applet->suncalc_timeout_tag = g_timeout_add_seconds ( - nxtSunEvent, -@@ -371,29 +349,9 @@ detailed_toggled (GtkToggleButton *button, GWeatherPref *pref) - static void temp_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) - { - GWeatherApplet *gw_applet = pref->priv->applet; -- TempUnit new_unit, old_unit; -- -- g_return_if_fail(gw_applet != NULL); -- -- new_unit = gtk_combo_box_get_active(combo) + 1; -- -- if (gw_applet->gweather_pref.use_temperature_default) -- old_unit = TEMP_UNIT_DEFAULT; -- else -- old_unit = gw_applet->gweather_pref.temperature_unit; -- -- if (new_unit == old_unit) -- return; -- -- gw_applet->gweather_pref.use_temperature_default = new_unit == TEMP_UNIT_DEFAULT; -- gw_applet->gweather_pref.temperature_unit = new_unit; -- -- gweather_gconf_set_string(gw_applet->gconf, GCONF_TEMP_UNIT, -- gweather_prefs_temp_enum_to_string (new_unit), -- NULL); - - gtk_label_set_text(GTK_LABEL(gw_applet->label), -- weather_info_get_temp_summary(gw_applet->gweather_info)); -+ gweather_info_get_temp_summary(gw_applet->gweather_info)); - - if (gw_applet->details_dialog) - gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); -@@ -402,26 +360,6 @@ static void temp_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) - static void speed_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) - { - GWeatherApplet *gw_applet = pref->priv->applet; -- SpeedUnit new_unit, old_unit; -- -- g_return_if_fail(gw_applet != NULL); -- -- new_unit = gtk_combo_box_get_active(combo) + 1; -- -- if (gw_applet->gweather_pref.use_speed_default) -- old_unit = SPEED_UNIT_DEFAULT; -- else -- old_unit = gw_applet->gweather_pref.speed_unit; -- -- if (new_unit == old_unit) -- return; -- -- gw_applet->gweather_pref.use_speed_default = new_unit == SPEED_UNIT_DEFAULT; -- gw_applet->gweather_pref.speed_unit = new_unit; -- -- gweather_gconf_set_string(gw_applet->gconf, GCONF_SPEED_UNIT, -- gweather_prefs_speed_enum_to_string (new_unit), -- NULL); - - if (gw_applet->details_dialog) - gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); -@@ -430,26 +368,6 @@ static void speed_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) - static void pres_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) - { - GWeatherApplet *gw_applet = pref->priv->applet; -- PressureUnit new_unit, old_unit; -- -- g_return_if_fail(gw_applet != NULL); -- -- new_unit = gtk_combo_box_get_active(combo) + 1; -- -- if (gw_applet->gweather_pref.use_pressure_default) -- old_unit = PRESSURE_UNIT_DEFAULT; -- else -- old_unit = gw_applet->gweather_pref.pressure_unit; -- -- if (new_unit == old_unit) -- return; -- -- gw_applet->gweather_pref.use_pressure_default = new_unit == PRESSURE_UNIT_DEFAULT; -- gw_applet->gweather_pref.pressure_unit = new_unit; -- -- gweather_gconf_set_string(gw_applet->gconf, GCONF_PRESSURE_UNIT, -- gweather_prefs_pressure_enum_to_string (new_unit), -- NULL); - - if (gw_applet->details_dialog) - gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); -@@ -458,26 +376,6 @@ static void pres_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) - static void dist_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) - { - GWeatherApplet *gw_applet = pref->priv->applet; -- DistanceUnit new_unit, old_unit; -- -- g_return_if_fail(gw_applet != NULL); -- -- new_unit = gtk_combo_box_get_active(combo) + 1; -- -- if (gw_applet->gweather_pref.use_distance_default) -- old_unit = DISTANCE_UNIT_DEFAULT; -- else -- old_unit = gw_applet->gweather_pref.distance_unit; -- -- if (new_unit == old_unit) -- return; -- -- gw_applet->gweather_pref.use_distance_default = new_unit == DISTANCE_UNIT_DEFAULT; -- gw_applet->gweather_pref.distance_unit = new_unit; -- -- gweather_gconf_set_string(gw_applet->gconf, GCONF_DISTANCE_UNIT, -- gweather_prefs_distance_enum_to_string (new_unit), -- NULL); - - if (gw_applet->details_dialog) - gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); -@@ -490,11 +388,12 @@ radar_toggled (GtkToggleButton *button, GWeatherPref *pref) - gboolean toggled; - - toggled = gtk_toggle_button_get_active(button); -- gw_applet->gweather_pref.radar_enabled = toggled; -- gweather_gconf_set_bool(gw_applet->gconf, "enable_radar_map", toggled, NULL); -- soft_set_sensitive (pref->priv->basic_radar_url_btn, toggled); -+ -+ if (toggled) -+ g_settings_set_boolean (gw_applet->applet_settings, "enable-radar-map", toggled); -+ gtk_widget_set_sensitive (pref->priv->basic_radar_url_btn, toggled); - if (toggled == FALSE || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (pref->priv->basic_radar_url_btn)) == TRUE) -- soft_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); -+ gtk_widget_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); - } - - static void -@@ -504,9 +403,10 @@ use_radar_url_toggled (GtkToggleButton *button, GWeatherPref *pref) - gboolean toggled; - - toggled = gtk_toggle_button_get_active(button); -- gw_applet->gweather_pref.use_custom_radar_url = toggled; -- gweather_gconf_set_bool(gw_applet->gconf, "use_custom_radar_url", toggled, NULL); -- soft_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); -+ -+ if (!toggled) -+ g_settings_set_string (gw_applet->lib_settings, "radar", ""); -+ gtk_widget_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); - } - - static gboolean -@@ -517,18 +417,7 @@ radar_url_changed (GtkWidget *widget, GdkEventFocus *event, GWeatherPref *pref) - - text = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1); - -- if (gw_applet->gweather_pref.radar) -- g_free (gw_applet->gweather_pref.radar); -- -- if (text) { -- gw_applet->gweather_pref.radar = g_strdup (text); -- g_free (text); -- } -- else -- gw_applet->gweather_pref.radar = NULL; -- -- gweather_gconf_set_string (gw_applet->gconf, "radar", -- gw_applet->gweather_pref.radar, NULL); -+ g_settings_set_string (gw_applet->lib_settings, "radar", text); - - return FALSE; - -@@ -539,32 +428,14 @@ update_interval_changed (GtkSpinButton *button, GWeatherPref *pref) - { - GWeatherApplet *gw_applet = pref->priv->applet; - -- gw_applet->gweather_pref.update_interval = gtk_spin_button_get_value_as_int(button)*60; -- gweather_gconf_set_int(gw_applet->gconf, "auto_update_interval", -- gw_applet->gweather_pref.update_interval, NULL); - if (gw_applet->timeout_tag > 0) - g_source_remove(gw_applet->timeout_tag); -- if (gw_applet->gweather_pref.update_enabled) -+ if (g_settings_get_boolean (gw_applet->applet_settings, "auto-update")) - gw_applet->timeout_tag = -- g_timeout_add_seconds (gw_applet->gweather_pref.update_interval, -+ g_timeout_add_seconds (g_settings_get_int (gw_applet->applet_settings, "auto-update-interval"), - timeout_cb, gw_applet); - } - --static gboolean --free_data (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) --{ -- WeatherLocation *location; -- -- gtk_tree_model_get (model, iter, GWEATHER_XML_COL_POINTER, &location, -1); -- if (!location) -- return FALSE; -- -- weather_location_free (location); -- -- return FALSE; --} -- -- - static GtkWidget * - create_hig_catagory (GtkWidget *main_box, gchar *title) - { -@@ -611,7 +482,7 @@ find_location (GtkTreeModel *model, GtkTreeIter *iter, const gchar *location, gb - - do { - -- gtk_tree_model_get (model, iter, GWEATHER_XML_COL_LOC, &aux_loc, -1); -+ gtk_tree_model_get (model, iter, GWEATHER_XML_COL_LOCATION_NAME, &aux_loc, -1); - - if (g_ascii_strncasecmp (aux_loc, location, len) == 0) { - g_free (aux_loc); -@@ -838,8 +709,6 @@ gweather_pref_create (GWeatherPref *pref) - gtk_container_add (GTK_CONTAINER (pref_basic_update_alignment), pref->priv->basic_update_btn); - g_signal_connect (G_OBJECT (pref->priv->basic_update_btn), "toggled", - G_CALLBACK (auto_update_toggled), pref); -- if ( ! key_writable (pref, "auto_update")) -- hard_set_sensitive (pref->priv->basic_update_btn, FALSE); - - /* - * Units settings page. -@@ -855,15 +724,11 @@ gweather_pref_create (GWeatherPref *pref) - temp_combo = gtk_combo_box_text_new (); - pref->priv->basic_temp_combo = temp_combo; - gtk_label_set_mnemonic_widget (GTK_LABEL (temp_label), temp_combo); -- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Default")); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Kelvin")); - /* TRANSLATORS: Celsius is sometimes referred Centigrade */ - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Celsius")); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Fahrenheit")); - gtk_widget_show (temp_combo); -- -- if ( ! key_writable (pref, GCONF_TEMP_UNIT)) -- hard_set_sensitive (pref->priv->basic_temp_combo, FALSE); - - /* Speed Unit */ - speed_label = gtk_label_new_with_mnemonic (_("_Wind speed unit:")); -@@ -875,7 +740,6 @@ gweather_pref_create (GWeatherPref *pref) - speed_combo = gtk_combo_box_text_new (); - pref->priv->basic_speed_combo = speed_combo; - gtk_label_set_mnemonic_widget (GTK_LABEL (speed_label), speed_combo); -- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (speed_combo), _("Default")); - /* TRANSLATOR: The wind speed unit "meters per second" */ - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (speed_combo), _("m/s")); - /* TRANSLATOR: The wind speed unit "kilometers per hour" */ -@@ -888,9 +752,6 @@ gweather_pref_create (GWeatherPref *pref) - _("Beaufort scale")); - gtk_widget_show (speed_combo); - -- if ( ! key_writable (pref, GCONF_SPEED_UNIT)) -- hard_set_sensitive (pref->priv->basic_speed_combo, FALSE); -- - /* Pressure Unit */ - pres_label = gtk_label_new_with_mnemonic (_("_Pressure unit:")); - gtk_label_set_use_markup (GTK_LABEL (pres_label), TRUE); -@@ -901,7 +762,6 @@ gweather_pref_create (GWeatherPref *pref) - pres_combo = gtk_combo_box_text_new (); - pref->priv->basic_pres_combo = pres_combo; - gtk_label_set_mnemonic_widget (GTK_LABEL (pres_label), pres_combo); -- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pres_combo), _("Default")); - /* TRANSLATOR: The pressure unit "kiloPascals" */ - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pres_combo), _("kPa")); - /* TRANSLATOR: The pressure unit "hectoPascals" */ -@@ -916,9 +776,6 @@ gweather_pref_create (GWeatherPref *pref) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pres_combo), _("atm")); - gtk_widget_show (pres_combo); - -- if ( ! key_writable (pref, GCONF_PRESSURE_UNIT)) -- hard_set_sensitive (pref->priv->basic_pres_combo, FALSE); -- - /* Distance Unit */ - dist_label = gtk_label_new_with_mnemonic (_("_Visibility unit:")); - gtk_label_set_use_markup (GTK_LABEL (dist_label), TRUE); -@@ -929,7 +786,6 @@ gweather_pref_create (GWeatherPref *pref) - dist_combo = gtk_combo_box_text_new (); - pref->priv->basic_dist_combo = dist_combo; - gtk_label_set_mnemonic_widget (GTK_LABEL (dist_label), dist_combo); -- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dist_combo), _("Default")); - /* TRANSLATOR: The distance unit "meters" */ - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dist_combo), _("meters")); - /* TRANSLATOR: The distance unit "kilometers" */ -@@ -938,9 +794,6 @@ gweather_pref_create (GWeatherPref *pref) - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dist_combo), _("miles")); - gtk_widget_show (dist_combo); - -- if ( ! key_writable (pref, GCONF_DISTANCE_UNIT)) -- hard_set_sensitive (pref->priv->basic_dist_combo, FALSE); -- - unit_table = gtk_table_new(5, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(unit_table), 6); - gtk_table_set_col_spacings(GTK_TABLE(unit_table), 12); -@@ -973,8 +826,6 @@ gweather_pref_create (GWeatherPref *pref) - gtk_widget_show (pref->priv->basic_radar_btn); - g_signal_connect (G_OBJECT (pref->priv->basic_radar_btn), "toggled", - G_CALLBACK (radar_toggled), pref); -- if ( ! key_writable (pref, "enable_radar_map")) -- hard_set_sensitive (pref->priv->basic_radar_btn, FALSE); - - radar_toggle_hbox = gtk_hbox_new (FALSE, 12); - gtk_widget_show (radar_toggle_hbox); -@@ -989,8 +840,6 @@ gweather_pref_create (GWeatherPref *pref) - - g_signal_connect (G_OBJECT (pref->priv->basic_radar_url_btn), "toggled", - G_CALLBACK (use_radar_url_toggled), pref); -- if ( ! key_writable (pref, "use_custom_radar_url")) -- hard_set_sensitive (pref->priv->basic_radar_url_btn, FALSE); - - pref->priv->basic_radar_url_hbox = gtk_hbox_new (FALSE, 12); - gtk_widget_show (pref->priv->basic_radar_url_hbox); -@@ -1010,8 +859,6 @@ gweather_pref_create (GWeatherPref *pref) - pref->priv->basic_radar_url_entry, TRUE, TRUE, 0); - g_signal_connect (G_OBJECT (pref->priv->basic_radar_url_entry), "focus_out_event", - G_CALLBACK (radar_url_changed), pref); -- if ( ! key_writable (pref, "radar")) -- hard_set_sensitive (pref->priv->basic_radar_url_entry, FALSE); - #endif /* RADARMAP */ - - frame = create_hig_catagory (pref_basic_vbox, _("Update")); -@@ -1040,10 +887,6 @@ gweather_pref_create (GWeatherPref *pref) - - pref_basic_update_sec_lbl = gtk_label_new (_("minutes")); - gtk_widget_show (pref_basic_update_sec_lbl); -- if ( ! key_writable (pref, "auto_update_interval")) { -- hard_set_sensitive (pref->priv->basic_update_spin, FALSE); -- hard_set_sensitive (pref_basic_update_sec_lbl, FALSE); -- } - - value_hbox = gtk_hbox_new (FALSE, 6); - -@@ -1132,10 +975,6 @@ gweather_pref_create (GWeatherPref *pref) - - gtk_box_pack_start (GTK_BOX (pref_loc_hbox), pref_find_hbox, FALSE, FALSE, 0); - -- if ( ! key_writable (pref, "location0")) { -- hard_set_sensitive (scrolled_window, FALSE); -- } -- - pref_loc_note_lbl = gtk_label_new (_("Location")); - gtk_widget_show (pref_loc_note_lbl); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (pref_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (pref_notebook), 1), pref_loc_note_lbl); -@@ -1222,7 +1061,6 @@ gweather_pref_finalize (GObject *object) - { - GWeatherPref *self = GWEATHER_PREF (object); - -- gtk_tree_model_foreach (self->priv->model, free_data, NULL); - g_object_unref (G_OBJECT (self->priv->model)); - - G_OBJECT_CLASS (gweather_pref_parent_class)->finalize(object); -diff --git a/gweather/gweather.h b/gweather/gweather.h -index db4f8f8..5953b2f 100644 ---- a/gweather/gweather.h -+++ b/gweather/gweather.h -@@ -12,11 +12,9 @@ - */ - #include - --#include -- --#include --#include -+#include - -+#include - - /* Radar map on by default. */ - #define RADARMAP -@@ -28,9 +26,10 @@ typedef struct _GWeatherApplet GWeatherApplet; - struct _GWeatherApplet - { - PanelApplet *applet; -- WeatherInfo *gweather_info; -+ GWeatherInfo *gweather_info; - -- GWeatherGConf *gconf; -+ GSettings *lib_settings; -+ GSettings *applet_settings; - - GtkWidget *container; - GtkWidget *box; -@@ -42,9 +41,6 @@ struct _GWeatherApplet - gint timeout_tag; - gint suncalc_timeout_tag; - -- /* preferences */ -- GWeatherPrefs gweather_pref; -- - GtkWidget *pref_dialog; - - /* dialog stuff */ -diff --git a/gweather/main.c b/gweather/main.c -index 70d1b18..ba77cc4 100644 ---- a/gweather/main.c -+++ b/gweather/main.c -@@ -14,12 +14,10 @@ - #include - #include - #include -+#include - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - --#include --#include -- - #include "gweather.h" - #include "gweather-pref.h" - #include "gweather-dialog.h" -@@ -33,18 +31,15 @@ gweather_applet_new(PanelApplet *applet, const gchar *iid, gpointer data) - - char *prefs_key = panel_applet_get_preferences_key(applet); - -- panel_applet_add_preferences(applet, "/schemas/apps/gweather/prefs", NULL); -- - gw_applet = g_new0(GWeatherApplet, 1); - - gw_applet->applet = applet; - gw_applet->gweather_info = NULL; -- gw_applet->gconf = gweather_gconf_new(prefs_key); -+ gw_applet->lib_settings = g_settings_new("org.gnome.GWeather"); -+ gw_applet->applet_settings = panel_applet_settings_new(applet, "org.gnome.applets.GWeatherApplet"); - g_free (prefs_key); - gweather_applet_create(gw_applet); - -- gweather_prefs_load(&gw_applet->gweather_pref, gw_applet->gconf); -- - gweather_update(gw_applet); - - return TRUE; -diff --git a/gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in b/gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in -new file mode 100644 -index 0000000..e4a312b ---- /dev/null -+++ b/gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in -@@ -0,0 +1,29 @@ -+ -+ -+ -+ true -+ <_summary>Update the data automatically -+ <_description>Determines whether the applet automatically updates its weather statistics or not. -+ -+ -+ 1800 -+ <_summary>Update interval -+ <_description>The interval, in seconds, between automatic updates. -+ -+ -+ false -+ <_summary>Display radar map -+ <_description>Fetch a radar map on each update. -+ -+ -+ false -+ <_summary>Show notification -+ <_description>Show notifications for critical weather conditions -+ -+ -+ false -+ <_summary>Show detailed forecast -+ <_description>If true, additional details about weather will be downloaded and shown. -+ -+ -+ --- -1.7.10.4 \ No newline at end of file diff -Nru gnome-applets-3.5.91/debian/patches/series gnome-applets-3.5.92/debian/patches/series --- gnome-applets-3.5.91/debian/patches/series 2012-08-31 05:26:38.000000000 +0000 +++ gnome-applets-3.5.92/debian/patches/series 2012-09-20 02:38:43.000000000 +0000 @@ -2,4 +2,3 @@ 80_correct_minicommander_install.patch 81_silent_applet_cleaning.patch 86_deprecate_applets.patch -gweather-3.6.patch diff -Nru gnome-applets-3.5.91/depcomp gnome-applets-3.5.92/depcomp --- gnome-applets-3.5.91/depcomp 2011-10-23 17:44:09.000000000 +0000 +++ gnome-applets-3.5.92/depcomp 2012-09-19 22:33:05.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +27,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +95,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +167,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +213,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +233,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +273,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +288,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +316,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +366,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +381,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +429,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +499,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +519,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +579,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +602,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +671,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru gnome-applets-3.5.91/drivemount/Makefile.in gnome-applets-3.5.92/drivemount/Makefile.in --- gnome-applets-3.5.91/drivemount/Makefile.in 2012-08-30 18:36:45.000000000 +0000 +++ gnome-applets-3.5.92/drivemount/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ libexec_PROGRAMS = drivemount_applet2$(EXEEXT) subdir = drivemount -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs AUTHORS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -61,9 +78,22 @@ am__DEPENDENCIES_1 = drivemount_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -74,22 +104,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(drivemount_applet2_SOURCES) DIST_SOURCES = $(drivemount_applet2_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -99,6 +125,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -120,6 +151,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(schemas_DATA) $(service_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -206,6 +243,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -217,6 +255,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -242,6 +281,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -357,6 +400,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -367,6 +411,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -464,8 +510,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -505,7 +554,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -drivemount_applet2$(EXEEXT): $(drivemount_applet2_OBJECTS) $(drivemount_applet2_DEPENDENCIES) +drivemount_applet2$(EXEEXT): $(drivemount_applet2_OBJECTS) $(drivemount_applet2_DEPENDENCIES) $(EXTRA_drivemount_applet2_DEPENDENCIES) @rm -f drivemount_applet2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(drivemount_applet2_OBJECTS) $(drivemount_applet2_LDADD) $(LIBS) @@ -522,26 +571,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -550,8 +596,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -565,13 +614,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -585,13 +635,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -605,13 +656,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -625,17 +677,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -645,7 +695,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -659,37 +713,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -698,6 +721,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -761,6 +788,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -796,13 +837,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -840,10 +878,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -929,22 +972,24 @@ uninstall-am: uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-schemasDATA uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-schemasDATA \ - install-serviceDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-schemasDATA install-serviceDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ diff -Nru gnome-applets-3.5.91/drivemount/help/Makefile.in gnome-applets-3.5.92/drivemount/help/Makefile.in --- gnome-applets-3.5.91/drivemount/help/Makefile.in 2012-08-30 18:36:46.000000000 +0000 +++ gnome-applets-3.5.92/drivemount/help/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = drivemount/help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -461,6 +511,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -482,6 +533,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -530,10 +583,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -707,7 +765,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -721,7 +778,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -729,7 +786,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -768,18 +825,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -789,10 +843,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -860,7 +914,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -928,8 +1004,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -955,7 +1031,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1023,7 +1110,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/geyes/Makefile.in gnome-applets-3.5.92/geyes/Makefile.in --- gnome-applets-3.5.91/geyes/Makefile.in 2012-08-30 18:36:46.000000000 +0000 +++ gnome-applets-3.5.92/geyes/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -37,7 +53,7 @@ libexec_PROGRAMS = geyes_applet2$(EXEEXT) subdir = geyes DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - AUTHORS NEWS + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs AUTHORS NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -61,9 +77,22 @@ am__DEPENDENCIES_1 = geyes_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -74,22 +103,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(geyes_applet2_SOURCES) DIST_SOURCES = $(geyes_applet2_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -99,6 +124,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -120,6 +150,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(schemas_DATA) $(service_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -206,6 +242,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -217,6 +254,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -242,6 +280,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -357,6 +399,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -367,6 +410,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -474,8 +519,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -515,7 +563,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -geyes_applet2$(EXEEXT): $(geyes_applet2_OBJECTS) $(geyes_applet2_DEPENDENCIES) +geyes_applet2$(EXEEXT): $(geyes_applet2_OBJECTS) $(geyes_applet2_DEPENDENCIES) $(EXTRA_geyes_applet2_DEPENDENCIES) @rm -f geyes_applet2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(geyes_applet2_OBJECTS) $(geyes_applet2_LDADD) $(LIBS) @@ -531,26 +579,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -559,8 +604,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -574,13 +622,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -594,13 +643,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -614,13 +664,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -634,17 +685,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -654,7 +703,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -668,37 +721,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -707,6 +729,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -770,6 +796,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -805,13 +845,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -849,10 +886,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -939,22 +981,24 @@ uninstall-local uninstall-schemasDATA uninstall-serviceDATA \ uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-schemasDATA \ - install-serviceDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-schemasDATA install-serviceDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ diff -Nru gnome-applets-3.5.91/geyes/docs/Makefile.in gnome-applets-3.5.92/geyes/docs/Makefile.in --- gnome-applets-3.5.91/geyes/docs/Makefile.in 2012-08-30 18:36:46.000000000 +0000 +++ gnome-applets-3.5.92/geyes/docs/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = geyes/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -456,6 +506,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -477,6 +528,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -525,10 +578,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -702,7 +760,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -716,7 +773,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -724,7 +781,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -763,18 +820,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -784,10 +838,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -855,7 +909,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -923,8 +999,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -950,7 +1026,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1018,7 +1105,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/geyes/themes/Makefile.in gnome-applets-3.5.92/geyes/themes/Makefile.in --- gnome-applets-3.5.91/geyes/themes/Makefile.in 2012-08-30 18:36:46.000000000 +0000 +++ gnome-applets-3.5.92/geyes/themes/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,23 @@ #SUBDIRS = Default Default-tiny Bizarre Bloodshot Horrid VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = geyes/themes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -51,14 +68,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -80,6 +108,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(Bizarredir)" \ "$(DESTDIR)$(Bloodshotdir)" "$(DESTDIR)$(Defaultdir)" \ "$(DESTDIR)$(Default_tinydir)" "$(DESTDIR)$(Horriddir)" \ @@ -138,6 +172,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -149,6 +184,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -174,6 +210,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -289,6 +329,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -299,6 +340,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -397,8 +440,11 @@ -rm -rf .libs _libs install-BizarreDATA: $(Bizarre_DATA) @$(NORMAL_INSTALL) - test -z "$(Bizarredir)" || $(MKDIR_P) "$(DESTDIR)$(Bizarredir)" @list='$(Bizarre_DATA)'; test -n "$(Bizarredir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(Bizarredir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(Bizarredir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -412,13 +458,14 @@ @$(NORMAL_UNINSTALL) @list='$(Bizarre_DATA)'; test -n "$(Bizarredir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(Bizarredir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(Bizarredir)" && rm -f $$files + dir='$(DESTDIR)$(Bizarredir)'; $(am__uninstall_files_from_dir) install-BloodshotDATA: $(Bloodshot_DATA) @$(NORMAL_INSTALL) - test -z "$(Bloodshotdir)" || $(MKDIR_P) "$(DESTDIR)$(Bloodshotdir)" @list='$(Bloodshot_DATA)'; test -n "$(Bloodshotdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(Bloodshotdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(Bloodshotdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -432,13 +479,14 @@ @$(NORMAL_UNINSTALL) @list='$(Bloodshot_DATA)'; test -n "$(Bloodshotdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(Bloodshotdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(Bloodshotdir)" && rm -f $$files + dir='$(DESTDIR)$(Bloodshotdir)'; $(am__uninstall_files_from_dir) install-DefaultDATA: $(Default_DATA) @$(NORMAL_INSTALL) - test -z "$(Defaultdir)" || $(MKDIR_P) "$(DESTDIR)$(Defaultdir)" @list='$(Default_DATA)'; test -n "$(Defaultdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(Defaultdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(Defaultdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -452,13 +500,14 @@ @$(NORMAL_UNINSTALL) @list='$(Default_DATA)'; test -n "$(Defaultdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(Defaultdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(Defaultdir)" && rm -f $$files + dir='$(DESTDIR)$(Defaultdir)'; $(am__uninstall_files_from_dir) install-Default_tinyDATA: $(Default_tiny_DATA) @$(NORMAL_INSTALL) - test -z "$(Default_tinydir)" || $(MKDIR_P) "$(DESTDIR)$(Default_tinydir)" @list='$(Default_tiny_DATA)'; test -n "$(Default_tinydir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(Default_tinydir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(Default_tinydir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -472,13 +521,14 @@ @$(NORMAL_UNINSTALL) @list='$(Default_tiny_DATA)'; test -n "$(Default_tinydir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(Default_tinydir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(Default_tinydir)" && rm -f $$files + dir='$(DESTDIR)$(Default_tinydir)'; $(am__uninstall_files_from_dir) install-HorridDATA: $(Horrid_DATA) @$(NORMAL_INSTALL) - test -z "$(Horriddir)" || $(MKDIR_P) "$(DESTDIR)$(Horriddir)" @list='$(Horrid_DATA)'; test -n "$(Horriddir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(Horriddir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(Horriddir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -492,13 +542,14 @@ @$(NORMAL_UNINSTALL) @list='$(Horrid_DATA)'; test -n "$(Horriddir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(Horriddir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(Horriddir)" && rm -f $$files + dir='$(DESTDIR)$(Horriddir)'; $(am__uninstall_files_from_dir) install-TangoDATA: $(Tango_DATA) @$(NORMAL_INSTALL) - test -z "$(Tangodir)" || $(MKDIR_P) "$(DESTDIR)$(Tangodir)" @list='$(Tango_DATA)'; test -n "$(Tangodir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(Tangodir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(Tangodir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -512,15 +563,15 @@ @$(NORMAL_UNINSTALL) @list='$(Tango_DATA)'; test -n "$(Tangodir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(Tangodir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(Tangodir)" && rm -f $$files + dir='$(DESTDIR)$(Tangodir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -569,10 +620,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/gnome-applets.spec gnome-applets-3.5.92/gnome-applets.spec --- gnome-applets-3.5.91/gnome-applets.spec 2012-08-30 18:37:03.000000000 +0000 +++ gnome-applets-3.5.92/gnome-applets.spec 2012-09-20 01:10:52.000000000 +0000 @@ -1,5 +1,5 @@ %define name gnome-applets -%define ver 3.5.91 +%define ver 3.5.92 %define RELEASE 1 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} diff -Nru gnome-applets-3.5.91/gnome-doc-utils.make gnome-applets-3.5.92/gnome-doc-utils.make --- gnome-applets-3.5.91/gnome-doc-utils.make 2011-10-23 17:43:55.000000000 +0000 +++ gnome-applets-3.5.92/gnome-doc-utils.make 2012-09-19 22:32:54.000000000 +0000 @@ -135,7 +135,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -149,6 +148,24 @@ ################################################################################ +## Support for automake silent-rules +GDU_V_XML2PO=$(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0=@echo " XML2PO" $@; + +GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0=@echo " MSGFMT" $@; + +GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0=@echo " DB2OMF" $@; + +GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0=@echo " DB2HTM" $@; + +################################################################################ ## @@ Rules for OMF Files db2omf_args = \ @@ -180,7 +197,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_HTML ## The OMF files for HTML output @@ -195,7 +212,7 @@ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } endif - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_ALL ## All OMF output files to be built @@ -340,18 +357,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -365,7 +379,7 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ ################################################################################ @@ -379,7 +393,7 @@ _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -459,7 +473,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -530,8 +566,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -562,7 +598,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -633,7 +680,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/gweather/Makefile.am gnome-applets-3.5.92/gweather/Makefile.am --- gnome-applets-3.5.91/gweather/Makefile.am 2011-05-08 00:18:20.000000000 +0000 +++ gnome-applets-3.5.92/gweather/Makefile.am 2012-09-20 01:07:34.000000000 +0000 @@ -57,10 +57,20 @@ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ +%.gschema.xml.in: %.gschema.xml.in.in + $(AM_V_GEN)sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|" $< > $@ + +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ + +gsettings_SCHEMAS = $(builddir)/org.gnome.applets.GWeatherApplet.gschema.xml + CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) EXTRA_DIST = \ org.gnome.applets.GWeatherApplet.panel-applet.in.in \ + org.gnome.applets.GWeatherApplet.gschema.xml \ $(service_in_files) \ $(ui_DATA) diff -Nru gnome-applets-3.5.91/gweather/Makefile.in gnome-applets-3.5.92/gweather/Makefile.in --- gnome-applets-3.5.91/gweather/Makefile.in 2012-08-30 18:36:46.000000000 +0000 +++ gnome-applets-3.5.92/gweather/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ libexec_PROGRAMS = gweather-applet-2$(EXEEXT) subdir = gweather -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs AUTHORS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -63,9 +80,22 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -76,22 +106,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(gweather_applet_2_SOURCES) DIST_SOURCES = $(gweather_applet_2_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -101,6 +127,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -122,6 +153,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(service_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -208,6 +245,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -219,6 +257,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -244,6 +283,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -359,6 +402,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -369,6 +413,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -431,9 +477,11 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gnome.panel.applet.GWeatherAppletFactory.service.in service_DATA = $(service_in_files:.service.in=.service) +gsettings_SCHEMAS = $(builddir)/org.gnome.applets.GWeatherApplet.gschema.xml CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) EXTRA_DIST = \ org.gnome.applets.GWeatherApplet.panel-applet.in.in \ + org.gnome.applets.GWeatherApplet.gschema.xml \ $(service_in_files) \ $(ui_DATA) @@ -473,8 +521,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -514,7 +565,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -gweather-applet-2$(EXEEXT): $(gweather_applet_2_OBJECTS) $(gweather_applet_2_DEPENDENCIES) +gweather-applet-2$(EXEEXT): $(gweather_applet_2_OBJECTS) $(gweather_applet_2_DEPENDENCIES) $(EXTRA_gweather_applet_2_DEPENDENCIES) @rm -f gweather-applet-2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gweather_applet_2_OBJECTS) $(gweather_applet_2_LDADD) $(LIBS) @@ -533,26 +584,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -561,8 +609,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -576,13 +627,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -596,13 +648,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -616,17 +669,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -636,7 +687,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -650,37 +705,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -689,6 +713,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -752,6 +780,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -787,13 +829,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -831,10 +870,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -919,24 +963,26 @@ uninstall-am: uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-serviceDATA install-strip install-uiDATA \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-serviceDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-serviceDATA uninstall-uiDATA @@ -954,6 +1000,13 @@ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ +%.gschema.xml.in: %.gschema.xml.in.in + $(AM_V_GEN)sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|" $< > $@ + +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ + -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gnome-applets-3.5.91/gweather/docs/Makefile.in gnome-applets-3.5.92/gweather/docs/Makefile.in --- gnome-applets-3.5.91/gweather/docs/Makefile.in 2012-08-30 18:36:46.000000000 +0000 +++ gnome-applets-3.5.92/gweather/docs/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = gweather/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -470,6 +520,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -491,6 +542,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -539,10 +592,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -716,7 +774,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -730,7 +787,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -738,7 +795,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -777,18 +834,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -798,10 +852,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -869,7 +923,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -937,8 +1013,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -964,7 +1040,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1032,7 +1119,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/gweather/gweather-applet.c gnome-applets-3.5.92/gweather/gweather-applet.c --- gnome-applets-3.5.91/gweather/gweather-applet.c 2011-07-23 18:07:56.000000000 +0000 +++ gnome-applets-3.5.92/gweather/gweather-applet.c 2012-09-20 01:07:34.000000000 +0000 @@ -150,7 +150,7 @@ } /* Create the weather icon */ - icon_name = weather_info_get_icon_name (gw_applet->gweather_info); + icon_name = gweather_info_get_icon_name (gw_applet->gweather_info); gw_applet->image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON); if (icon_name != NULL) { @@ -165,7 +165,7 @@ gw_applet->label = gtk_label_new("--"); /* Update temperature text */ - temp = weather_info_get_temp_summary(gw_applet->gweather_info); + temp = gweather_info_get_temp_summary(gw_applet->gweather_info); if (temp) gtk_label_set_text(GTK_LABEL(gw_applet->label), temp); @@ -294,11 +294,10 @@ gw_applet->suncalc_timeout_tag = 0; } - if (gw_applet->gconf) { - gweather_gconf_free (gw_applet->gconf); - } + g_clear_object (&gw_applet->lib_settings); + g_clear_object (&gw_applet->applet_settings); - weather_info_abort (gw_applet->gweather_info); + gweather_info_abort (gw_applet->gweather_info); } #ifdef HAVE_NETWORKMANAGER @@ -311,16 +310,6 @@ gchar *ui_path; AtkObject *atk_obj; - gw_applet->gweather_pref.location = NULL; - gw_applet->gweather_pref.update_interval = 1800; - gw_applet->gweather_pref.update_enabled = TRUE; - gw_applet->gweather_pref.detailed = FALSE; - gw_applet->gweather_pref.radar_enabled = TRUE; - gw_applet->gweather_pref.temperature_unit = TEMP_UNIT_INVALID; - gw_applet->gweather_pref.speed_unit = SPEED_UNIT_INVALID; - gw_applet->gweather_pref.pressure_unit = PRESSURE_UNIT_INVALID; - gw_applet->gweather_pref.distance_unit = DISTANCE_UNIT_INVALID; - panel_applet_set_flags (gw_applet->applet, PANEL_APPLET_EXPAND_MINOR); panel_applet_set_background_widget(gw_applet->applet, @@ -389,7 +378,7 @@ } static void -update_finish (WeatherInfo *info, gpointer data) +update_finish (GWeatherInfo *info, gpointer data) { static int gw_fault_counter = 0; #ifdef HAVE_LIBNOTIFY @@ -403,33 +392,32 @@ /* Update timer */ if (gw_applet->timeout_tag > 0) g_source_remove(gw_applet->timeout_tag); - if (gw_applet->gweather_pref.update_enabled) + if (g_settings_get_boolean (gw_applet->applet_settings, "auto-update")) { gw_applet->timeout_tag = - g_timeout_add_seconds ( - gw_applet->gweather_pref.update_interval, - timeout_cb, gw_applet); + g_timeout_add_seconds (g_settings_get_int (gw_applet->applet_settings, "auto-update-interval"), + timeout_cb, gw_applet); - nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info); + nxtSunEvent = gweather_info_next_sun_event(gw_applet->gweather_info); if (nxtSunEvent >= 0) gw_applet->suncalc_timeout_tag = g_timeout_add_seconds (nxtSunEvent, suncalc_timeout_cb, gw_applet); } - if ((TRUE == weather_info_is_valid (info)) || + if ((TRUE == gweather_info_is_valid (info)) || (gw_fault_counter >= MAX_CONSECUTIVE_FAULTS)) { gw_fault_counter = 0; - icon_name = weather_info_get_icon_name (gw_applet->gweather_info); + icon_name = gweather_info_get_icon_name (gw_applet->gweather_info); gtk_image_set_from_icon_name (GTK_IMAGE(gw_applet->image), icon_name, GTK_ICON_SIZE_BUTTON); gtk_label_set_text (GTK_LABEL (gw_applet->label), - weather_info_get_temp_summary( + gweather_info_get_temp_summary( gw_applet->gweather_info)); - s = weather_info_get_weather_summary (gw_applet->gweather_info); + s = gweather_info_get_weather_summary (gw_applet->gweather_info); gtk_widget_set_tooltip_text (GTK_WIDGET (gw_applet->applet), s); g_free (s); @@ -442,8 +430,7 @@ place_widgets(gw_applet); #ifdef HAVE_LIBNOTIFY - if (panel_applet_gconf_get_bool (gw_applet->applet, - "show_notifications", NULL)) + if (g_settings_get_boolean (gw_applet->applet_settings, "show-notifications")) { NotifyNotification *n; @@ -458,15 +445,15 @@ /* Show notification */ message = g_strdup_printf ("%s: %s", - weather_info_get_location_name (info), - weather_info_get_sky (info)); + gweather_info_get_location_name (info), + gweather_info_get_sky (info)); detail = g_strdup_printf ( _("City: %s\nSky: %s\nTemperature: %s"), - weather_info_get_location_name (info), - weather_info_get_sky (info), - weather_info_get_temp_summary (info)); + gweather_info_get_location_name (info), + gweather_info_get_sky (info), + gweather_info_get_temp_summary (info)); - icon = weather_info_get_icon_name (gw_applet->gweather_info); + icon = gweather_info_get_icon_name (gw_applet->gweather_info); if (icon == NULL) icon = "stock-unknown"; @@ -496,7 +483,7 @@ gint suncalc_timeout_cb (gpointer data) { - WeatherInfo *info = ((GWeatherApplet *)data)->gweather_info; + GWeatherInfo *info = ((GWeatherApplet *)data)->gweather_info; update_finish(info, data); return 0; /* Do not repeat timeout (will be re-set by update_finish) */ } @@ -504,41 +491,23 @@ void gweather_update (GWeatherApplet *gw_applet) { - WeatherPrefs prefs; const gchar *icon_name; + GWeatherForecastType type; - icon_name = weather_info_get_icon_name(gw_applet->gweather_info); + icon_name = gweather_info_get_icon_name(gw_applet->gweather_info); gtk_image_set_from_icon_name (GTK_IMAGE (gw_applet->image), icon_name, GTK_ICON_SIZE_BUTTON); gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("Updating...")); /* Set preferred forecast type */ - prefs.type = gw_applet->gweather_pref.detailed ? FORECAST_ZONE : FORECAST_STATE; - - /* Set radar map retrieval option */ - prefs.radar = gw_applet->gweather_pref.radar_enabled; - prefs.radar_custom_url = (gw_applet->gweather_pref.use_custom_radar_url && - gw_applet->gweather_pref.radar) ? - gw_applet->gweather_pref.radar : NULL; - - /* Set the units */ - prefs.temperature_unit = gw_applet->gweather_pref.temperature_unit; - prefs.speed_unit = gw_applet->gweather_pref.speed_unit; - prefs.pressure_unit = gw_applet->gweather_pref.pressure_unit; - prefs.distance_unit = gw_applet->gweather_pref.distance_unit; + type = g_settings_get_boolean (gw_applet->applet_settings, "detailed") ? + GWEATHER_FORECAST_ZONE : GWEATHER_FORECAST_STATE; /* Update current conditions */ - if (gw_applet->gweather_info && - weather_location_equal(weather_info_get_location(gw_applet->gweather_info), - gw_applet->gweather_pref.location)) { - weather_info_update(gw_applet->gweather_info, &prefs, - update_finish, gw_applet); - } else { - weather_info_free(gw_applet->gweather_info); - gw_applet->gweather_info = weather_info_new(gw_applet->gweather_pref.location, - &prefs, - update_finish, gw_applet); - } + g_object_unref(gw_applet->gweather_info); + gw_applet->gweather_info = gweather_info_new(NULL, /* default location */ + type); + g_signal_connect(gw_applet->gweather_info, "updated", G_CALLBACK (update_finish), gw_applet); } #ifdef HAVE_NETWORKMANAGER diff -Nru gnome-applets-3.5.91/gweather/gweather-dialog.c gnome-applets-3.5.92/gweather/gweather-dialog.c --- gnome-applets-3.5.91/gweather/gweather-dialog.c 2011-04-05 20:45:34.000000000 +0000 +++ gnome-applets-3.5.92/gweather/gweather-dialog.c 2012-09-20 01:07:34.000000000 +0000 @@ -61,64 +61,6 @@ #define MONOSPACE_FONT_KEY MONOSPACE_FONT_DIR "/monospace_font_name" static void -gweather_dialog_save_geometry (GWeatherDialog *dialog) -{ - GWeatherGConf *gconf; - int w, h, x, y; - - gconf = dialog->priv->applet->gconf; - - gtk_window_get_position (GTK_WINDOW (dialog), &x, &y); - gtk_window_get_size (GTK_WINDOW (dialog), &w, &h); - - gweather_gconf_set_int (gconf, "dialog_width", w, NULL); - gweather_gconf_set_int (gconf, "dialog_height", h, NULL); - gweather_gconf_set_int (gconf, "dialog_x", x, NULL); - gweather_gconf_set_int (gconf, "dialog_y", y, NULL); -} - -static void -gweather_dialog_load_geometry (GWeatherDialog *dialog) -{ - GWeatherGConf *gconf; - int w, h, x, y; - GError *error; - - gconf = dialog->priv->applet->gconf; - error = NULL; - - w = gweather_gconf_get_int (gconf, "dialog_width", &error); - if (error) { - g_message ("gweather: no spatial information available"); - g_error_free (error); - return; - } - h = gweather_gconf_get_int (gconf, "dialog_height", &error); - if (error) { - g_message ("gweather: no spatial information available"); - g_error_free (error); - return; - } - x = gweather_gconf_get_int (gconf, "dialog_x", &error); - if (error) { - g_message ("gweather: no spatial information available"); - g_error_free (error); - return; - } - y = gweather_gconf_get_int (gconf, "dialog_y", &error); - if (error) { - g_message ("gweather: no spatial information available"); - g_error_free (error); - return; - } - - if (w > 0 && h > 0) { - gtk_window_resize (GTK_WINDOW (dialog), w, h); - } - gtk_window_move (GTK_WINDOW (dialog), x, y); -} - -static void response_cb (GWeatherDialog *dialog, gint id, gpointer data) @@ -220,14 +162,13 @@ gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - if (gw_applet->gweather_pref.radar_enabled) + if (g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map")) gtk_window_set_default_size (GTK_WINDOW (dialog), 570,440); else gtk_window_set_default_size (GTK_WINDOW (dialog), 590, 340); gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (gw_applet->applet))); - gweather_dialog_load_geometry (dialog); /* Must come after load geometry, otherwise it will get reset. */ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); @@ -486,36 +427,32 @@ gtk_widget_show (current_note_lbl); gtk_notebook_set_tab_label (GTK_NOTEBOOK (weather_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (weather_notebook), 0), current_note_lbl); - if (gw_applet->gweather_pref.location->zone_valid) { - - forecast_hbox = gtk_hbox_new(FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (forecast_hbox), 12); - gtk_widget_show (forecast_hbox); - - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_SHADOW_ETCHED_IN); - - priv->forecast_text = gtk_text_view_new (); - set_access_namedesc (priv->forecast_text, _("Forecast Report"), _("See the ForeCast Details")); - gtk_container_add (GTK_CONTAINER (scrolled_window), priv->forecast_text); - gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->forecast_text), FALSE); - gtk_text_view_set_left_margin (GTK_TEXT_VIEW (priv->forecast_text), 6); - gtk_widget_show (priv->forecast_text); - gtk_widget_show (scrolled_window); - gtk_box_pack_start (GTK_BOX (forecast_hbox), scrolled_window, TRUE, TRUE, 0); - - gtk_container_add (GTK_CONTAINER (weather_notebook), forecast_hbox); - - forecast_note_lbl = gtk_label_new (_("Forecast")); - gtk_widget_show (forecast_note_lbl); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (weather_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (weather_notebook), 1), forecast_note_lbl); - - } + forecast_hbox = gtk_hbox_new(FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (forecast_hbox), 12); + gtk_widget_show (forecast_hbox); + + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_SHADOW_ETCHED_IN); + + priv->forecast_text = gtk_text_view_new (); + set_access_namedesc (priv->forecast_text, _("Forecast Report"), _("See the ForeCast Details")); + gtk_container_add (GTK_CONTAINER (scrolled_window), priv->forecast_text); + gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->forecast_text), FALSE); + gtk_text_view_set_left_margin (GTK_TEXT_VIEW (priv->forecast_text), 6); + gtk_widget_show (priv->forecast_text); + gtk_widget_show (scrolled_window); + gtk_box_pack_start (GTK_BOX (forecast_hbox), scrolled_window, TRUE, TRUE, 0); + + gtk_container_add (GTK_CONTAINER (weather_notebook), forecast_hbox); + + forecast_note_lbl = gtk_label_new (_("Forecast")); + gtk_widget_show (forecast_note_lbl); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (weather_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (weather_notebook), 1), forecast_note_lbl); - if (gw_applet->gweather_pref.radar_enabled) { + if (g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map")) { radar_note_lbl = gtk_label_new_with_mnemonic (_("Radar Map")); gtk_widget_show (radar_note_lbl); @@ -548,12 +485,12 @@ gtk_widget_show (radar_link_alignment); gtk_box_pack_start (GTK_BOX (radar_vbox), radar_link_alignment, FALSE, FALSE, 0); + /* XXX: weather.com? is this an advert? */ radar_link_btn = gtk_button_new_with_mnemonic (_("_Visit Weather.com")); set_access_namedesc (radar_link_btn, _("Visit Weather.com"), _("Click to Enter Weather.com")); gtk_widget_set_size_request (radar_link_btn, 450, -2); gtk_widget_show (radar_link_btn); - if (!gweather_gconf_get_bool (gw_applet->gconf, "use_custom_radar_url", NULL)) - gtk_container_add (GTK_CONTAINER (radar_link_alignment), radar_link_btn); + gtk_container_add (GTK_CONTAINER (radar_link_alignment), radar_link_btn); g_signal_connect (G_OBJECT (radar_link_btn), "clicked", G_CALLBACK (link_cb), NULL); @@ -600,49 +537,47 @@ return; /* Update icon */ - icon_name = weather_info_get_icon_name (gw_applet->gweather_info); + icon_name = gweather_info_get_icon_name (gw_applet->gweather_info); gtk_image_set_from_icon_name (GTK_IMAGE (priv->cond_image), icon_name, GTK_ICON_SIZE_DIALOG); /* Update current condition fields and forecast */ - gtk_label_set_text(GTK_LABEL(priv->cond_location), weather_info_get_location_name(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_update), weather_info_get_update(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_cond), weather_info_get_conditions(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_sky), weather_info_get_sky(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_temp), weather_info_get_temp(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_apparent), weather_info_get_apparent(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_dew), weather_info_get_dew(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_humidity), weather_info_get_humidity(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_wind), weather_info_get_wind(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_pressure), weather_info_get_pressure(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_vis), weather_info_get_visibility(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_sunrise), weather_info_get_sunrise(gw_applet->gweather_info)); - gtk_label_set_text(GTK_LABEL(priv->cond_sunset), weather_info_get_sunset(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_location), gweather_info_get_location_name(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_update), gweather_info_get_update(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_cond), gweather_info_get_conditions(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_sky), gweather_info_get_sky(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_temp), gweather_info_get_temp(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_apparent), gweather_info_get_apparent(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_dew), gweather_info_get_dew(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_humidity), gweather_info_get_humidity(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_wind), gweather_info_get_wind(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_pressure), gweather_info_get_pressure(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_vis), gweather_info_get_visibility(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_sunrise), gweather_info_get_sunrise(gw_applet->gweather_info)); + gtk_label_set_text(GTK_LABEL(priv->cond_sunset), gweather_info_get_sunset(gw_applet->gweather_info)); /* Update forecast */ - if (gw_applet->gweather_pref.location->zone_valid) { - font_desc = get_system_monospace_font (); - if (font_desc) { - gtk_widget_modify_font (priv->forecast_text, font_desc); - pango_font_description_free (font_desc); - } + font_desc = get_system_monospace_font (); + if (font_desc) { + gtk_widget_modify_font (priv->forecast_text, font_desc); + pango_font_description_free (font_desc); + } - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->forecast_text)); - forecast = g_strdup(weather_info_get_forecast(gw_applet->gweather_info)); - if (forecast) { - forecast = g_strstrip(replace_multiple_new_lines(forecast)); - gtk_text_buffer_set_text(buffer, forecast, -1); - g_free(forecast); - } else { - gtk_text_buffer_set_text(buffer, _("Forecast not currently available for this location."), -1); - } + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->forecast_text)); + forecast = g_strdup(gweather_info_get_forecast(gw_applet->gweather_info)); + if (forecast) { + forecast = g_strstrip(replace_multiple_new_lines(forecast)); + gtk_text_buffer_set_text(buffer, forecast, -1); + g_free(forecast); + } else { + gtk_text_buffer_set_text(buffer, _("Forecast not currently available for this location."), -1); } /* Update radar map */ - if (gw_applet->gweather_pref.radar_enabled) { + if (g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map")) { GdkPixbufAnimation *radar; - radar = weather_info_get_radar (gw_applet->gweather_info); + radar = gweather_info_get_radar (gw_applet->gweather_info); if (radar) { gtk_image_set_from_animation (GTK_IMAGE (priv->radar_image), radar); } @@ -716,30 +651,16 @@ NULL); } - -static void -gweather_dialog_unrealize (GtkWidget *widget) -{ - GWeatherDialog *self = GWEATHER_DIALOG (widget); - - gweather_dialog_save_geometry (self); - - GTK_WIDGET_CLASS (gweather_dialog_parent_class)->unrealize (widget); -} - - static void gweather_dialog_class_init (GWeatherDialogClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); gweather_dialog_parent_class = g_type_class_peek_parent (klass); object_class->set_property = gweather_dialog_set_property; object_class->get_property = gweather_dialog_get_property; object_class->constructor = gweather_dialog_constructor; - widget_class->unrealize = gweather_dialog_unrealize; /* This becomes an OBJECT property when GWeatherApplet is redone */ g_object_class_install_property (object_class, diff -Nru gnome-applets-3.5.91/gweather/gweather-pref.c gnome-applets-3.5.92/gweather/gweather-pref.c --- gnome-applets-3.5.91/gweather/gweather-pref.c 2011-04-05 20:45:39.000000000 +0000 +++ gnome-applets-3.5.92/gweather/gweather-pref.c 2012-09-20 01:07:34.000000000 +0000 @@ -70,47 +70,6 @@ G_DEFINE_TYPE (GWeatherPref, gweather_pref, GTK_TYPE_DIALOG); #define GWEATHER_PREF_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GWEATHER_TYPE_PREF, GWeatherPrefPrivate)) - -/* set sensitive and setup NEVER_SENSITIVE appropriately */ -static void -hard_set_sensitive (GtkWidget *w, gboolean sensitivity) -{ - gtk_widget_set_sensitive (w, sensitivity); - g_object_set_data (G_OBJECT (w), NEVER_SENSITIVE, - GINT_TO_POINTER ( ! sensitivity)); -} - - -/* set sensitive, but always insensitive if NEVER_SENSITIVE is set */ -static void -soft_set_sensitive (GtkWidget *w, gboolean sensitivity) -{ - if (g_object_get_data (G_OBJECT (w), NEVER_SENSITIVE)) - gtk_widget_set_sensitive (w, FALSE); - else - gtk_widget_set_sensitive (w, sensitivity); -} - - -static gboolean -key_writable (GWeatherPref *pref, const char *key) -{ - GWeatherApplet *applet = pref->priv->applet; - gboolean writable; - char *fullkey; - static GConfClient *client = NULL; - if (client == NULL) - client = gconf_client_get_default (); - - fullkey = gweather_gconf_get_full_key (applet->gconf, key); - - writable = gconf_client_key_is_writable (client, fullkey, NULL); - - g_free (fullkey); - - return writable; -} - /* sets up ATK Relation between the widgets */ static void @@ -174,65 +133,75 @@ } +static gboolean +bind_update_interval_get (GValue *value, + GVariant *variant, + gpointer user_data) +{ + g_value_set_double (value, g_variant_get_int32 (variant) / 60); + return TRUE; +} + +static GVariant* +bind_update_interval_set (const GValue *value, + const GVariantType *variant, + gpointer user_data) +{ + return g_variant_new_int32 (g_value_get_double (value) * 60); +} /* Update pref dialog from gweather_pref */ static gboolean update_dialog (GWeatherPref *pref) { GWeatherApplet *gw_applet = pref->priv->applet; + gchar *radar_url; + gboolean has_radar, has_custom_radar; - g_return_val_if_fail(gw_applet->gweather_pref.location != NULL, FALSE); - - gtk_spin_button_set_value(GTK_SPIN_BUTTON(pref->priv->basic_update_spin), - gw_applet->gweather_pref.update_interval / 60); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_update_btn), - gw_applet->gweather_pref.update_enabled); - soft_set_sensitive(pref->priv->basic_update_spin, - gw_applet->gweather_pref.update_enabled); - - if ( gw_applet->gweather_pref.use_temperature_default) { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_temp_combo), 0); - } else { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_temp_combo), - gw_applet->gweather_pref.temperature_unit -1); - } - - if ( gw_applet->gweather_pref.use_speed_default) { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_speed_combo), 0); - } else { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_speed_combo), - gw_applet->gweather_pref.speed_unit -1); - } - - if ( gw_applet->gweather_pref.use_pressure_default) { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_pres_combo), 0); - } else { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_pres_combo), - gw_applet->gweather_pref.pressure_unit -1); - } - if ( gw_applet->gweather_pref.use_distance_default) { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_dist_combo), 0); - } else { - gtk_combo_box_set_active (GTK_COMBO_BOX(pref->priv->basic_dist_combo), - gw_applet->gweather_pref.distance_unit -1); - } + g_settings_bind_with_mapping (gw_applet->applet_settings, "auto-update-interval", + pref->priv->basic_update_spin, "value", + G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY, + bind_update_interval_get, + bind_update_interval_set, + NULL, NULL); + + g_settings_bind (gw_applet->applet_settings, "auto-update", + pref->priv->basic_update_btn, "active", + G_SETTINGS_BIND_DEFAULT); + + gtk_widget_set_sensitive(pref->priv->basic_update_spin, + g_settings_get_boolean (gw_applet->applet_settings, "auto-update")); + + g_settings_bind (gw_applet->lib_settings, "temperature-unit", + pref->priv->basic_temp_combo, "active", + G_SETTINGS_BIND_DEFAULT); + + g_settings_bind (gw_applet->lib_settings, "speed-unit", + pref->priv->basic_speed_combo, "active", + G_SETTINGS_BIND_DEFAULT); + + g_settings_bind (gw_applet->lib_settings, "pressure-unit", + pref->priv->basic_pres_combo, "active", + G_SETTINGS_BIND_DEFAULT); + + g_settings_bind (gw_applet->lib_settings, "distance-unit", + pref->priv->basic_dist_combo, "active", + G_SETTINGS_BIND_DEFAULT); -#if 0 - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_detailed_btn), - gw_applet->gweather_pref.detailed); -#endif #ifdef RADARMAP + has_radar = g_settings_get_boolean (gw_applet->applet_settings, "enable-radar-map"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_radar_btn), - gw_applet->gweather_pref.radar_enabled); + has_radar); + + radar_url = g_settings_get_string (gw_applet->lib_settings, "radar"); + has_custom_radar = radar_url && *radar_url; - soft_set_sensitive (pref->priv->basic_radar_url_btn, - gw_applet->gweather_pref.radar_enabled); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pref->priv->basic_radar_url_btn), - gw_applet->gweather_pref.use_custom_radar_url); - soft_set_sensitive (pref->priv->basic_radar_url_hbox, - gw_applet->gweather_pref.radar_enabled); - if (gw_applet->gweather_pref.radar) + gtk_widget_set_sensitive (pref->priv->basic_radar_url_btn, has_radar); + gtk_widget_set_sensitive (pref->priv->basic_radar_url_hbox, has_radar && has_custom_radar); + if (radar_url) gtk_entry_set_text (GTK_ENTRY (pref->priv->basic_radar_url_entry), - gw_applet->gweather_pref.radar); + radar_url); + + g_free(radar_url); #endif /* RADARMAP */ @@ -243,27 +212,31 @@ { GWeatherApplet *gw_applet = pref->priv->applet; GtkTreeModel *model; - WeatherLocation *loc = NULL; GtkTreeIter iter; + gchar *name, *code; + gboolean has_latlon; + gdouble latitude, longitude; if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return; - gtk_tree_model_get (model, &iter, GWEATHER_XML_COL_POINTER, &loc, -1); + gtk_tree_model_get (model, &iter, GWEATHER_XML_COL_METAR_CODE, &code, -1); - if (!loc) + if (!code) return; - gweather_gconf_set_string(gw_applet->gconf, "location1", loc->code, NULL); - gweather_gconf_set_string(gw_applet->gconf, "location2", loc->zone, NULL); - gweather_gconf_set_string(gw_applet->gconf, "location3", loc->radar, NULL); - gweather_gconf_set_string(gw_applet->gconf, "location4", loc->name, NULL); - gweather_gconf_set_string(gw_applet->gconf, "coordinates", loc->coordinates, NULL); - - if (gw_applet->gweather_pref.location) { - weather_location_free (gw_applet->gweather_pref.location); - } - gw_applet->gweather_pref.location = gweather_gconf_get_location (gw_applet->gconf); + gtk_tree_model_get (model, &iter, + GWEATHER_XML_COL_LOCATION_NAME, &name, + GWEATHER_XML_COL_LATLON_VALID, &has_latlon, + GWEATHER_XML_COL_LATITUDE, &latitude, + GWEATHER_XML_COL_LONGITUDE, &longitude, + -1); + + g_settings_set (gw_applet->lib_settings, "default-location", "(ssm(dd))", + name, code, has_latlon, latitude, longitude); + + g_free (name); + g_free (code); gweather_update (gw_applet); } @@ -275,21 +248,31 @@ gpointer user_data) { GWeatherPref *pref = user_data; - WeatherLocation *loc; GtkTreeView *view; + gchar *name = NULL; + gchar *default_loc = NULL; + gboolean retval = FALSE; + + gtk_tree_model_get (model, iter, GWEATHER_XML_COL_LOCATION_NAME, &name, -1); + if (!name) + retval = FALSE; + + g_settings_get (pref->priv->applet->lib_settings, "default-location", "(ssm(dd))", + &default_loc, NULL, NULL); + + if (strcmp(name, default_loc)) + retval = FALSE; + + if (retval) { + view = GTK_TREE_VIEW (pref->priv->tree); + gtk_tree_view_expand_to_path (view, path); + gtk_tree_view_set_cursor (view, path, NULL, FALSE); + gtk_tree_view_scroll_to_cell (view, path, NULL, TRUE, 0.5, 0.5); + } - gtk_tree_model_get (model, iter, GWEATHER_XML_COL_POINTER, &loc, -1); - if (!loc) - return FALSE; - - if (!weather_location_equal (loc, pref->priv->applet->gweather_pref.location)) - return FALSE; - - view = GTK_TREE_VIEW (pref->priv->tree); - gtk_tree_view_expand_to_path (view, path); - gtk_tree_view_set_cursor (view, path, NULL, FALSE); - gtk_tree_view_scroll_to_cell (view, path, NULL, TRUE, 0.5, 0.5); - return TRUE; + g_free(name); + g_free(default_loc); + return retval; } static void load_locations (GWeatherPref *pref) @@ -301,7 +284,7 @@ /* Add a colum for the locations */ cell_renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("not used", cell_renderer, - "text", GWEATHER_XML_COL_LOC, NULL); + "text", GWEATHER_XML_COL_LOCATION_NAME, NULL); gtk_tree_view_append_column (tree, column); gtk_tree_view_set_expander_column (GTK_TREE_VIEW (tree), column); @@ -320,10 +303,8 @@ } gtk_tree_view_set_model (tree, pref->priv->model); - if (pref->priv->applet->gweather_pref.location) { - /* Select the current (default) location */ - gtk_tree_model_foreach (GTK_TREE_MODEL (pref->priv->model), compare_location, pref); - } + /* Select the current (default) location */ + gtk_tree_model_foreach (GTK_TREE_MODEL (pref->priv->model), compare_location, pref); } static void @@ -334,18 +315,15 @@ gint nxtSunEvent; toggled = gtk_toggle_button_get_active(button); - gw_applet->gweather_pref.update_enabled = toggled; - soft_set_sensitive (pref->priv->basic_update_spin, toggled); - gweather_gconf_set_bool(gw_applet->gconf, "auto_update", toggled, NULL); + gtk_widget_set_sensitive (pref->priv->basic_update_spin, toggled); if (gw_applet->timeout_tag > 0) g_source_remove(gw_applet->timeout_tag); if (gw_applet->suncalc_timeout_tag > 0) g_source_remove(gw_applet->suncalc_timeout_tag); - if (gw_applet->gweather_pref.update_enabled) { - gw_applet->timeout_tag = g_timeout_add_seconds ( - gw_applet->gweather_pref.update_interval, - timeout_cb, gw_applet); - nxtSunEvent = weather_info_next_sun_event(gw_applet->gweather_info); + if (toggled) { + gw_applet->timeout_tag = g_timeout_add_seconds (g_settings_get_int (gw_applet->applet_settings, "auto-update-interval"), + timeout_cb, gw_applet); + nxtSunEvent = gweather_info_next_sun_event(gw_applet->gweather_info); if (nxtSunEvent >= 0) gw_applet->suncalc_timeout_tag = g_timeout_add_seconds ( nxtSunEvent, @@ -371,29 +349,9 @@ static void temp_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) { GWeatherApplet *gw_applet = pref->priv->applet; - TempUnit new_unit, old_unit; - - g_return_if_fail(gw_applet != NULL); - - new_unit = gtk_combo_box_get_active(combo) + 1; - - if (gw_applet->gweather_pref.use_temperature_default) - old_unit = TEMP_UNIT_DEFAULT; - else - old_unit = gw_applet->gweather_pref.temperature_unit; - - if (new_unit == old_unit) - return; - - gw_applet->gweather_pref.use_temperature_default = new_unit == TEMP_UNIT_DEFAULT; - gw_applet->gweather_pref.temperature_unit = new_unit; - - gweather_gconf_set_string(gw_applet->gconf, GCONF_TEMP_UNIT, - gweather_prefs_temp_enum_to_string (new_unit), - NULL); gtk_label_set_text(GTK_LABEL(gw_applet->label), - weather_info_get_temp_summary(gw_applet->gweather_info)); + gweather_info_get_temp_summary(gw_applet->gweather_info)); if (gw_applet->details_dialog) gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); @@ -402,26 +360,6 @@ static void speed_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) { GWeatherApplet *gw_applet = pref->priv->applet; - SpeedUnit new_unit, old_unit; - - g_return_if_fail(gw_applet != NULL); - - new_unit = gtk_combo_box_get_active(combo) + 1; - - if (gw_applet->gweather_pref.use_speed_default) - old_unit = SPEED_UNIT_DEFAULT; - else - old_unit = gw_applet->gweather_pref.speed_unit; - - if (new_unit == old_unit) - return; - - gw_applet->gweather_pref.use_speed_default = new_unit == SPEED_UNIT_DEFAULT; - gw_applet->gweather_pref.speed_unit = new_unit; - - gweather_gconf_set_string(gw_applet->gconf, GCONF_SPEED_UNIT, - gweather_prefs_speed_enum_to_string (new_unit), - NULL); if (gw_applet->details_dialog) gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); @@ -430,26 +368,6 @@ static void pres_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) { GWeatherApplet *gw_applet = pref->priv->applet; - PressureUnit new_unit, old_unit; - - g_return_if_fail(gw_applet != NULL); - - new_unit = gtk_combo_box_get_active(combo) + 1; - - if (gw_applet->gweather_pref.use_pressure_default) - old_unit = PRESSURE_UNIT_DEFAULT; - else - old_unit = gw_applet->gweather_pref.pressure_unit; - - if (new_unit == old_unit) - return; - - gw_applet->gweather_pref.use_pressure_default = new_unit == PRESSURE_UNIT_DEFAULT; - gw_applet->gweather_pref.pressure_unit = new_unit; - - gweather_gconf_set_string(gw_applet->gconf, GCONF_PRESSURE_UNIT, - gweather_prefs_pressure_enum_to_string (new_unit), - NULL); if (gw_applet->details_dialog) gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); @@ -458,26 +376,6 @@ static void dist_combo_changed_cb (GtkComboBox *combo, GWeatherPref *pref) { GWeatherApplet *gw_applet = pref->priv->applet; - DistanceUnit new_unit, old_unit; - - g_return_if_fail(gw_applet != NULL); - - new_unit = gtk_combo_box_get_active(combo) + 1; - - if (gw_applet->gweather_pref.use_distance_default) - old_unit = DISTANCE_UNIT_DEFAULT; - else - old_unit = gw_applet->gweather_pref.distance_unit; - - if (new_unit == old_unit) - return; - - gw_applet->gweather_pref.use_distance_default = new_unit == DISTANCE_UNIT_DEFAULT; - gw_applet->gweather_pref.distance_unit = new_unit; - - gweather_gconf_set_string(gw_applet->gconf, GCONF_DISTANCE_UNIT, - gweather_prefs_distance_enum_to_string (new_unit), - NULL); if (gw_applet->details_dialog) gweather_dialog_update (GWEATHER_DIALOG (gw_applet->details_dialog)); @@ -490,11 +388,12 @@ gboolean toggled; toggled = gtk_toggle_button_get_active(button); - gw_applet->gweather_pref.radar_enabled = toggled; - gweather_gconf_set_bool(gw_applet->gconf, "enable_radar_map", toggled, NULL); - soft_set_sensitive (pref->priv->basic_radar_url_btn, toggled); + + if (toggled) + g_settings_set_boolean (gw_applet->applet_settings, "enable-radar-map", toggled); + gtk_widget_set_sensitive (pref->priv->basic_radar_url_btn, toggled); if (toggled == FALSE || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (pref->priv->basic_radar_url_btn)) == TRUE) - soft_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); + gtk_widget_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); } static void @@ -504,9 +403,10 @@ gboolean toggled; toggled = gtk_toggle_button_get_active(button); - gw_applet->gweather_pref.use_custom_radar_url = toggled; - gweather_gconf_set_bool(gw_applet->gconf, "use_custom_radar_url", toggled, NULL); - soft_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); + + if (!toggled) + g_settings_set_string (gw_applet->lib_settings, "radar", ""); + gtk_widget_set_sensitive (pref->priv->basic_radar_url_hbox, toggled); } static gboolean @@ -517,18 +417,7 @@ text = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1); - if (gw_applet->gweather_pref.radar) - g_free (gw_applet->gweather_pref.radar); - - if (text) { - gw_applet->gweather_pref.radar = g_strdup (text); - g_free (text); - } - else - gw_applet->gweather_pref.radar = NULL; - - gweather_gconf_set_string (gw_applet->gconf, "radar", - gw_applet->gweather_pref.radar, NULL); + g_settings_set_string (gw_applet->lib_settings, "radar", text); return FALSE; @@ -539,32 +428,14 @@ { GWeatherApplet *gw_applet = pref->priv->applet; - gw_applet->gweather_pref.update_interval = gtk_spin_button_get_value_as_int(button)*60; - gweather_gconf_set_int(gw_applet->gconf, "auto_update_interval", - gw_applet->gweather_pref.update_interval, NULL); if (gw_applet->timeout_tag > 0) g_source_remove(gw_applet->timeout_tag); - if (gw_applet->gweather_pref.update_enabled) + if (g_settings_get_boolean (gw_applet->applet_settings, "auto-update")) gw_applet->timeout_tag = - g_timeout_add_seconds (gw_applet->gweather_pref.update_interval, + g_timeout_add_seconds (g_settings_get_int (gw_applet->applet_settings, "auto-update-interval"), timeout_cb, gw_applet); } -static gboolean -free_data (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) -{ - WeatherLocation *location; - - gtk_tree_model_get (model, iter, GWEATHER_XML_COL_POINTER, &location, -1); - if (!location) - return FALSE; - - weather_location_free (location); - - return FALSE; -} - - static GtkWidget * create_hig_catagory (GtkWidget *main_box, gchar *title) { @@ -611,7 +482,7 @@ do { - gtk_tree_model_get (model, iter, GWEATHER_XML_COL_LOC, &aux_loc, -1); + gtk_tree_model_get (model, iter, GWEATHER_XML_COL_LOCATION_NAME, &aux_loc, -1); if (g_ascii_strncasecmp (aux_loc, location, len) == 0) { g_free (aux_loc); @@ -838,8 +709,6 @@ gtk_container_add (GTK_CONTAINER (pref_basic_update_alignment), pref->priv->basic_update_btn); g_signal_connect (G_OBJECT (pref->priv->basic_update_btn), "toggled", G_CALLBACK (auto_update_toggled), pref); - if ( ! key_writable (pref, "auto_update")) - hard_set_sensitive (pref->priv->basic_update_btn, FALSE); /* * Units settings page. @@ -855,15 +724,11 @@ temp_combo = gtk_combo_box_text_new (); pref->priv->basic_temp_combo = temp_combo; gtk_label_set_mnemonic_widget (GTK_LABEL (temp_label), temp_combo); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Default")); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Kelvin")); /* TRANSLATORS: Celsius is sometimes referred Centigrade */ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Celsius")); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (temp_combo), _("Fahrenheit")); gtk_widget_show (temp_combo); - - if ( ! key_writable (pref, GCONF_TEMP_UNIT)) - hard_set_sensitive (pref->priv->basic_temp_combo, FALSE); /* Speed Unit */ speed_label = gtk_label_new_with_mnemonic (_("_Wind speed unit:")); @@ -875,7 +740,6 @@ speed_combo = gtk_combo_box_text_new (); pref->priv->basic_speed_combo = speed_combo; gtk_label_set_mnemonic_widget (GTK_LABEL (speed_label), speed_combo); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (speed_combo), _("Default")); /* TRANSLATOR: The wind speed unit "meters per second" */ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (speed_combo), _("m/s")); /* TRANSLATOR: The wind speed unit "kilometers per hour" */ @@ -888,9 +752,6 @@ _("Beaufort scale")); gtk_widget_show (speed_combo); - if ( ! key_writable (pref, GCONF_SPEED_UNIT)) - hard_set_sensitive (pref->priv->basic_speed_combo, FALSE); - /* Pressure Unit */ pres_label = gtk_label_new_with_mnemonic (_("_Pressure unit:")); gtk_label_set_use_markup (GTK_LABEL (pres_label), TRUE); @@ -901,7 +762,6 @@ pres_combo = gtk_combo_box_text_new (); pref->priv->basic_pres_combo = pres_combo; gtk_label_set_mnemonic_widget (GTK_LABEL (pres_label), pres_combo); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pres_combo), _("Default")); /* TRANSLATOR: The pressure unit "kiloPascals" */ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pres_combo), _("kPa")); /* TRANSLATOR: The pressure unit "hectoPascals" */ @@ -916,9 +776,6 @@ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pres_combo), _("atm")); gtk_widget_show (pres_combo); - if ( ! key_writable (pref, GCONF_PRESSURE_UNIT)) - hard_set_sensitive (pref->priv->basic_pres_combo, FALSE); - /* Distance Unit */ dist_label = gtk_label_new_with_mnemonic (_("_Visibility unit:")); gtk_label_set_use_markup (GTK_LABEL (dist_label), TRUE); @@ -929,7 +786,6 @@ dist_combo = gtk_combo_box_text_new (); pref->priv->basic_dist_combo = dist_combo; gtk_label_set_mnemonic_widget (GTK_LABEL (dist_label), dist_combo); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dist_combo), _("Default")); /* TRANSLATOR: The distance unit "meters" */ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dist_combo), _("meters")); /* TRANSLATOR: The distance unit "kilometers" */ @@ -938,9 +794,6 @@ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dist_combo), _("miles")); gtk_widget_show (dist_combo); - if ( ! key_writable (pref, GCONF_DISTANCE_UNIT)) - hard_set_sensitive (pref->priv->basic_dist_combo, FALSE); - unit_table = gtk_table_new(5, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(unit_table), 6); gtk_table_set_col_spacings(GTK_TABLE(unit_table), 12); @@ -973,8 +826,6 @@ gtk_widget_show (pref->priv->basic_radar_btn); g_signal_connect (G_OBJECT (pref->priv->basic_radar_btn), "toggled", G_CALLBACK (radar_toggled), pref); - if ( ! key_writable (pref, "enable_radar_map")) - hard_set_sensitive (pref->priv->basic_radar_btn, FALSE); radar_toggle_hbox = gtk_hbox_new (FALSE, 12); gtk_widget_show (radar_toggle_hbox); @@ -989,8 +840,6 @@ g_signal_connect (G_OBJECT (pref->priv->basic_radar_url_btn), "toggled", G_CALLBACK (use_radar_url_toggled), pref); - if ( ! key_writable (pref, "use_custom_radar_url")) - hard_set_sensitive (pref->priv->basic_radar_url_btn, FALSE); pref->priv->basic_radar_url_hbox = gtk_hbox_new (FALSE, 12); gtk_widget_show (pref->priv->basic_radar_url_hbox); @@ -1010,8 +859,6 @@ pref->priv->basic_radar_url_entry, TRUE, TRUE, 0); g_signal_connect (G_OBJECT (pref->priv->basic_radar_url_entry), "focus_out_event", G_CALLBACK (radar_url_changed), pref); - if ( ! key_writable (pref, "radar")) - hard_set_sensitive (pref->priv->basic_radar_url_entry, FALSE); #endif /* RADARMAP */ frame = create_hig_catagory (pref_basic_vbox, _("Update")); @@ -1040,10 +887,6 @@ pref_basic_update_sec_lbl = gtk_label_new (_("minutes")); gtk_widget_show (pref_basic_update_sec_lbl); - if ( ! key_writable (pref, "auto_update_interval")) { - hard_set_sensitive (pref->priv->basic_update_spin, FALSE); - hard_set_sensitive (pref_basic_update_sec_lbl, FALSE); - } value_hbox = gtk_hbox_new (FALSE, 6); @@ -1132,10 +975,6 @@ gtk_box_pack_start (GTK_BOX (pref_loc_hbox), pref_find_hbox, FALSE, FALSE, 0); - if ( ! key_writable (pref, "location0")) { - hard_set_sensitive (scrolled_window, FALSE); - } - pref_loc_note_lbl = gtk_label_new (_("Location")); gtk_widget_show (pref_loc_note_lbl); gtk_notebook_set_tab_label (GTK_NOTEBOOK (pref_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (pref_notebook), 1), pref_loc_note_lbl); @@ -1222,7 +1061,6 @@ { GWeatherPref *self = GWEATHER_PREF (object); - gtk_tree_model_foreach (self->priv->model, free_data, NULL); g_object_unref (G_OBJECT (self->priv->model)); G_OBJECT_CLASS (gweather_pref_parent_class)->finalize(object); diff -Nru gnome-applets-3.5.91/gweather/gweather.h gnome-applets-3.5.92/gweather/gweather.h --- gnome-applets-3.5.91/gweather/gweather.h 2011-04-05 20:45:39.000000000 +0000 +++ gnome-applets-3.5.92/gweather/gweather.h 2012-09-20 01:07:34.000000000 +0000 @@ -12,11 +12,9 @@ */ #include -#include - -#include -#include +#include +#include /* Radar map on by default. */ #define RADARMAP @@ -28,9 +26,10 @@ struct _GWeatherApplet { PanelApplet *applet; - WeatherInfo *gweather_info; + GWeatherInfo *gweather_info; - GWeatherGConf *gconf; + GSettings *lib_settings; + GSettings *applet_settings; GtkWidget *container; GtkWidget *box; @@ -42,9 +41,6 @@ gint timeout_tag; gint suncalc_timeout_tag; - /* preferences */ - GWeatherPrefs gweather_pref; - GtkWidget *pref_dialog; /* dialog stuff */ diff -Nru gnome-applets-3.5.91/gweather/main.c gnome-applets-3.5.92/gweather/main.c --- gnome-applets-3.5.91/gweather/main.c 2011-04-05 20:45:34.000000000 +0000 +++ gnome-applets-3.5.92/gweather/main.c 2012-09-20 01:07:34.000000000 +0000 @@ -14,12 +14,10 @@ #include #include #include +#include #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE -#include -#include - #include "gweather.h" #include "gweather-pref.h" #include "gweather-dialog.h" @@ -33,18 +31,15 @@ char *prefs_key = panel_applet_get_preferences_key(applet); - panel_applet_add_preferences(applet, "/schemas/apps/gweather/prefs", NULL); - gw_applet = g_new0(GWeatherApplet, 1); gw_applet->applet = applet; gw_applet->gweather_info = NULL; - gw_applet->gconf = gweather_gconf_new(prefs_key); + gw_applet->lib_settings = g_settings_new("org.gnome.GWeather"); + gw_applet->applet_settings = panel_applet_settings_new(applet, "org.gnome.applets.GWeatherApplet"); g_free (prefs_key); gweather_applet_create(gw_applet); - gweather_prefs_load(&gw_applet->gweather_pref, gw_applet->gconf); - gweather_update(gw_applet); return TRUE; diff -Nru gnome-applets-3.5.91/gweather/org.gnome.applets.GWeatherApplet.gschema.xml gnome-applets-3.5.92/gweather/org.gnome.applets.GWeatherApplet.gschema.xml --- gnome-applets-3.5.91/gweather/org.gnome.applets.GWeatherApplet.gschema.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-applets-3.5.92/gweather/org.gnome.applets.GWeatherApplet.gschema.xml 2012-09-20 01:11:18.000000000 +0000 @@ -0,0 +1,30 @@ + + + + + true + Update the data automatically + Determines whether the applet automatically updates its weather statistics or not. + + + 1800 + Update interval + The interval, in seconds, between automatic updates. + + + false + Display radar map + Fetch a radar map on each update. + + + false + Show notification + Show notifications for critical weather conditions + + + false + Show detailed forecast + If true, additional details about weather will be downloaded and shown. + + + \ No newline at end of file diff -Nru gnome-applets-3.5.91/install-sh gnome-applets-3.5.92/install-sh --- gnome-applets-3.5.91/install-sh 2011-10-23 17:44:03.000000000 +0000 +++ gnome-applets-3.5.92/install-sh 2012-09-19 22:33:00.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru gnome-applets-3.5.91/invest-applet/Makefile.in gnome-applets-3.5.92/invest-applet/Makefile.in --- gnome-applets-3.5.91/invest-applet/Makefile.in 2012-08-30 18:36:46.000000000 +0000 +++ gnome-applets-3.5.92/invest-applet/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -33,7 +49,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = invest-applet -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -48,12 +65,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -63,6 +86,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -148,6 +176,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -159,6 +188,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -184,6 +214,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -299,6 +333,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -309,6 +344,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -375,12 +412,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -390,7 +427,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -404,37 +445,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -443,6 +453,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -506,6 +520,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -541,13 +569,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -582,10 +607,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -663,22 +693,23 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru gnome-applets-3.5.91/invest-applet/data/Makefile.in gnome-applets-3.5.92/invest-applet/data/Makefile.in --- gnome-applets-3.5.91/invest-applet/data/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/invest-applet/data/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -34,7 +50,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = invest-applet/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -49,12 +66,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -64,6 +87,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -85,6 +113,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(builderdir)" \ "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)" DATA = $(applet_DATA) $(builder_DATA) $(service_DATA) $(ui_DATA) @@ -173,6 +207,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -184,6 +219,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -209,6 +245,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -324,6 +364,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,6 +375,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -434,8 +477,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -449,13 +495,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-builderDATA: $(builder_DATA) @$(NORMAL_INSTALL) - test -z "$(builderdir)" || $(MKDIR_P) "$(DESTDIR)$(builderdir)" @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(builderdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(builderdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -469,13 +516,14 @@ @$(NORMAL_UNINSTALL) @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(builderdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(builderdir)" && rm -f $$files + dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -489,13 +537,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -509,17 +558,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -529,7 +576,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -543,37 +594,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -582,6 +602,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -645,6 +669,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -680,13 +718,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -724,10 +759,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -809,24 +849,26 @@ uninstall-am: uninstall-appletDATA uninstall-builderDATA \ uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-builderDATA install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-serviceDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-appletDATA \ - uninstall-builderDATA uninstall-serviceDATA uninstall-uiDATA + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-appletDATA install-builderDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-serviceDATA install-strip \ + install-uiDATA installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-appletDATA uninstall-builderDATA \ + uninstall-serviceDATA uninstall-uiDATA org.gnome.panel.applet.InvestAppletFactory.service: $(service_in_files) diff -Nru gnome-applets-3.5.91/invest-applet/data/art/Makefile.in gnome-applets-3.5.92/invest-applet/data/art/Makefile.in --- gnome-applets-3.5.91/invest-applet/data/art/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/invest-applet/data/art/Makefile.in 2012-09-20 01:10:28.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -34,7 +50,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = invest-applet/data/art -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -49,14 +66,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +106,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(artdir)" DATA = $(art_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -132,6 +166,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -143,6 +178,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -168,6 +204,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,6 +323,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -293,6 +334,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -373,8 +416,11 @@ -rm -rf .libs _libs install-artDATA: $(art_DATA) @$(NORMAL_INSTALL) - test -z "$(artdir)" || $(MKDIR_P) "$(DESTDIR)$(artdir)" @list='$(art_DATA)'; test -n "$(artdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(artdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(artdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -388,15 +434,15 @@ @$(NORMAL_UNINSTALL) @list='$(art_DATA)'; test -n "$(artdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(artdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(artdir)" && rm -f $$files + dir='$(DESTDIR)$(artdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -445,10 +491,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/invest-applet/docs/Makefile.in gnome-applets-3.5.92/invest-applet/docs/Makefile.in --- gnome-applets-3.5.91/invest-applet/docs/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/invest-applet/docs/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = invest-applet/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -456,6 +506,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -477,6 +528,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -525,10 +578,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -702,7 +760,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -716,7 +773,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -724,7 +781,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -763,18 +820,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -784,10 +838,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -855,7 +909,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -923,8 +999,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -950,7 +1026,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1018,7 +1105,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/invest-applet/invest/Makefile.in gnome-applets-3.5.92/invest-applet/invest/Makefile.in --- gnome-applets-3.5.91/invest-applet/invest/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/invest-applet/invest/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -35,7 +51,8 @@ host_triplet = @host@ subdir = invest-applet/invest DIST_COMMON = $(invest_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/defs.py.in + $(srcdir)/Makefile.in $(srcdir)/defs.py.in \ + $(top_srcdir)/mkinstalldirs $(top_srcdir)/py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -71,17 +88,35 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(investdir)" "$(DESTDIR)$(investdir)" SCRIPTS = $(bin_SCRIPTS) $(libexec_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) py_compile = $(top_srcdir)/py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ @@ -135,6 +170,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -146,6 +182,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -171,6 +208,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -286,6 +327,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -296,6 +338,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -392,8 +436,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -421,13 +468,14 @@ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -455,9 +503,7 @@ @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -466,8 +512,11 @@ -rm -rf .libs _libs install-investPYTHON: $(invest_PYTHON) @$(NORMAL_INSTALL) - test -z "$(investdir)" || $(MKDIR_P) "$(DESTDIR)$(investdir)" @list='$(invest_PYTHON)'; dlist=; list2=; test -n "$(investdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(investdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(investdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ @@ -482,11 +531,8 @@ $(INSTALL_DATA) $$files "$(DESTDIR)$(investdir)" || exit $$?; \ done || exit $$?; \ if test -n "$$dlist"; then \ - if test -z "$(DESTDIR)"; then \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(investdir)" $$dlist; \ - else \ - PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(investdir)" $$dlist; \ - fi; \ + $(am__py_compile) --destdir "$(DESTDIR)" \ + --basedir "$(investdir)" $$dlist; \ else :; fi uninstall-investPYTHON: @@ -494,18 +540,21 @@ @list='$(invest_PYTHON)'; test -n "$(investdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ + dir='$(DESTDIR)$(investdir)'; \ filesc=`echo "$$files" | sed 's|$$|c|'`; \ fileso=`echo "$$files" | sed 's|$$|o|'`; \ - echo " ( cd '$(DESTDIR)$(investdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(investdir)" && rm -f $$files || exit $$?; \ - echo " ( cd '$(DESTDIR)$(investdir)' && rm -f" $$filesc ")"; \ - cd "$(DESTDIR)$(investdir)" && rm -f $$filesc || exit $$?; \ - echo " ( cd '$(DESTDIR)$(investdir)' && rm -f" $$fileso ")"; \ - cd "$(DESTDIR)$(investdir)" && rm -f $$fileso + st=0; \ + for files in "$$files" "$$filesc" "$$fileso"; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done; \ + exit $$st install-nodist_investPYTHON: $(nodist_invest_PYTHON) @$(NORMAL_INSTALL) - test -z "$(investdir)" || $(MKDIR_P) "$(DESTDIR)$(investdir)" @list='$(nodist_invest_PYTHON)'; dlist=; list2=; test -n "$(investdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(investdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(investdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ @@ -520,11 +569,8 @@ $(INSTALL_DATA) $$files "$(DESTDIR)$(investdir)" || exit $$?; \ done || exit $$?; \ if test -n "$$dlist"; then \ - if test -z "$(DESTDIR)"; then \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(investdir)" $$dlist; \ - else \ - PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(investdir)" $$dlist; \ - fi; \ + $(am__py_compile) --destdir "$(DESTDIR)" \ + --basedir "$(investdir)" $$dlist; \ else :; fi uninstall-nodist_investPYTHON: @@ -532,20 +578,22 @@ @list='$(nodist_invest_PYTHON)'; test -n "$(investdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ + dir='$(DESTDIR)$(investdir)'; \ filesc=`echo "$$files" | sed 's|$$|c|'`; \ fileso=`echo "$$files" | sed 's|$$|o|'`; \ - echo " ( cd '$(DESTDIR)$(investdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(investdir)" && rm -f $$files || exit $$?; \ - echo " ( cd '$(DESTDIR)$(investdir)' && rm -f" $$filesc ")"; \ - cd "$(DESTDIR)$(investdir)" && rm -f $$filesc || exit $$?; \ - echo " ( cd '$(DESTDIR)$(investdir)' && rm -f" $$fileso ")"; \ - cd "$(DESTDIR)$(investdir)" && rm -f $$fileso + st=0; \ + for files in "$$files" "$$filesc" "$$fileso"; do \ + $(am__uninstall_files_from_dir) || st=$$?; \ + done; \ + exit $$st tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -596,10 +644,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/ltmain.sh gnome-applets-3.5.92/ltmain.sh --- gnome-applets-3.5.91/ltmain.sh 2011-10-23 17:43:54.000000000 +0000 +++ gnome-applets-3.5.92/ltmain.sh 2012-09-19 22:32:52.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru gnome-applets-3.5.91/m4/gnome-doc-utils.m4 gnome-applets-3.5.92/m4/gnome-doc-utils.m4 --- gnome-applets-3.5.91/m4/gnome-doc-utils.m4 2011-10-23 17:43:55.000000000 +0000 +++ gnome-applets-3.5.92/m4/gnome-doc-utils.m4 2012-09-19 22:32:54.000000000 +0000 @@ -38,6 +38,11 @@ AC_DEFUN([GNOME_DOC_INIT], [AC_REQUIRE([AC_PROG_LN_S])dnl +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) diff -Nru gnome-applets-3.5.91/m4/intltool.m4 gnome-applets-3.5.92/m4/intltool.m4 --- gnome-applets-3.5.91/m4/intltool.m4 2011-10-23 17:43:55.000000000 +0000 +++ gnome-applets-3.5.92/m4/intltool.m4 2012-09-19 22:32:54.000000000 +0000 @@ -23,7 +23,7 @@ ## the same distribution terms that you use for the rest of that program. dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -36,13 +36,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -55,25 +53,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -119,7 +140,7 @@ if test $? -ne 0; then AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then diff -Nru gnome-applets-3.5.91/m4/libtool.m4 gnome-applets-3.5.92/m4/libtool.m4 --- gnome-applets-3.5.91/m4/libtool.m4 2011-10-23 17:43:54.000000000 +0000 +++ gnome-applets-3.5.92/m4/libtool.m4 2012-09-19 22:32:52.000000000 +0000 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2513,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2648,7 +2707,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2717,7 +2776,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2742,7 +2801,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2766,7 +2825,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2797,7 +2856,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2807,7 +2866,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3229,7 +3288,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3649,6 +3708,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4233,7 +4293,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4325,18 +4387,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4496,7 +4573,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4521,7 +4600,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4772,8 +4850,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5068,6 +5145,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5114,10 +5192,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5130,7 +5204,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5169,7 +5243,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5611,9 +5684,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5771,7 +5841,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6141,7 +6210,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6902,12 +6971,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7104,7 +7179,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7237,7 +7311,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7424,6 +7497,77 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7493,6 +7637,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff -Nru gnome-applets-3.5.91/m4/ltoptions.m4 gnome-applets-3.5.92/m4/ltoptions.m4 --- gnome-applets-3.5.91/m4/ltoptions.m4 2011-10-23 17:43:54.000000000 +0000 +++ gnome-applets-3.5.92/m4/ltoptions.m4 2012-09-19 22:32:52.000000000 +0000 @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -Nru gnome-applets-3.5.91/m4/ltversion.m4 gnome-applets-3.5.92/m4/ltversion.m4 --- gnome-applets-3.5.91/m4/ltversion.m4 2011-10-23 17:43:54.000000000 +0000 +++ gnome-applets-3.5.92/m4/ltversion.m4 2012-09-19 22:32:53.000000000 +0000 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru gnome-applets-3.5.91/man/Makefile.in gnome-applets-3.5.92/man/Makefile.in --- gnome-applets-3.5.91/man/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/man/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -33,7 +49,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -48,14 +65,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -77,6 +105,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff @@ -133,6 +167,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +179,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +205,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +324,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +335,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -376,11 +419,18 @@ -rm -rf .libs _libs install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -409,15 +459,15 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @list='$(MANS)'; if test -n "$$list"; then \ @@ -426,10 +476,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -479,10 +529,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/mini-commander/Makefile.in gnome-applets-3.5.92/mini-commander/Makefile.in --- gnome-applets-3.5.91/mini-commander/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/mini-commander/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -35,7 +51,7 @@ host_triplet = @host@ subdir = mini-commander DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - AUTHORS NEWS TODO + $(top_srcdir)/mkinstalldirs AUTHORS NEWS TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -50,12 +66,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -65,6 +87,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -86,6 +113,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(serverdir)" DATA = $(server_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -172,6 +205,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -183,6 +217,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -208,6 +243,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -323,6 +362,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -333,6 +373,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -408,8 +450,11 @@ -rm -rf .libs _libs install-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) - test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(serverdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(serverdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -423,17 +468,15 @@ @$(NORMAL_UNINSTALL) @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(serverdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(serverdir)" && rm -f $$files + dir='$(DESTDIR)$(serverdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -443,7 +486,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -457,37 +504,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -496,6 +512,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -559,6 +579,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -594,13 +628,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -638,10 +669,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -720,23 +756,24 @@ uninstall-am: uninstall-serverDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-serverDATA install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-serverDATA + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-serverDATA install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-serverDATA @BUILD_MINICOMMANDER_APPLET_FALSE@@INTLTOOL_SERVER_RULE@ diff -Nru gnome-applets-3.5.91/mini-commander/help/Makefile.in gnome-applets-3.5.92/mini-commander/help/Makefile.in --- gnome-applets-3.5.91/mini-commander/help/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/mini-commander/help/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = mini-commander/help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -459,6 +509,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -480,6 +531,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -528,10 +581,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -705,7 +763,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -719,7 +776,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -727,7 +784,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -766,18 +823,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -787,10 +841,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -858,7 +912,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -926,8 +1002,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -953,7 +1029,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1021,7 +1108,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/mini-commander/src/Makefile.in gnome-applets-3.5.92/mini-commander/src/Makefile.in --- gnome-applets-3.5.91/mini-commander/src/Makefile.in 2012-08-30 18:36:47.000000000 +0000 +++ gnome-applets-3.5.92/mini-commander/src/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -37,7 +53,8 @@ libexec_PROGRAMS = mini_commander_applet$(EXEEXT) tool_PROGRAMS = mc-install-default-macros$(EXEEXT) subdir = mini-commander/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -63,15 +80,28 @@ $(am_mc_install_default_macros_OBJECTS) am__DEPENDENCIES_1 = mc_install_default_macros_DEPENDENCIES = $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am_mini_commander_applet_OBJECTS = about.$(OBJEXT) \ cmd_completion.$(OBJEXT) command_line.$(OBJEXT) exec.$(OBJEXT) \ mini-commander_applet.$(OBJEXT) help.$(OBJEXT) \ history.$(OBJEXT) macro.$(OBJEXT) preferences.$(OBJEXT) mini_commander_applet_OBJECTS = $(am_mini_commander_applet_OBJECTS) mini_commander_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -82,26 +112,27 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(mc_install_default_macros_SOURCES) \ $(mini_commander_applet_SOURCES) DIST_SOURCES = $(mc_install_default_macros_SOURCES) \ $(mini_commander_applet_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -123,6 +154,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(builder_DATA) $(desktop_icons_DATA) \ $(schemas_DATA) $(service_DATA) $(ui_DATA) ETAGS = etags @@ -179,6 +216,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -190,6 +228,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -215,6 +254,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -330,6 +373,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -340,6 +384,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -469,8 +515,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -512,8 +561,11 @@ rm -f $$list install-toolPROGRAMS: $(tool_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(tooldir)" || $(MKDIR_P) "$(DESTDIR)$(tooldir)" @list='$(tool_PROGRAMS)'; test -n "$(tooldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tooldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tooldir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -553,10 +605,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -mc-install-default-macros$(EXEEXT): $(mc_install_default_macros_OBJECTS) $(mc_install_default_macros_DEPENDENCIES) +mc-install-default-macros$(EXEEXT): $(mc_install_default_macros_OBJECTS) $(mc_install_default_macros_DEPENDENCIES) $(EXTRA_mc_install_default_macros_DEPENDENCIES) @rm -f mc-install-default-macros$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mc_install_default_macros_OBJECTS) $(mc_install_default_macros_LDADD) $(LIBS) -mini_commander_applet$(EXEEXT): $(mini_commander_applet_OBJECTS) $(mini_commander_applet_DEPENDENCIES) +mini_commander_applet$(EXEEXT): $(mini_commander_applet_OBJECTS) $(mini_commander_applet_DEPENDENCIES) $(EXTRA_mini_commander_applet_DEPENDENCIES) @rm -f mini_commander_applet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mini_commander_applet_OBJECTS) $(mini_commander_applet_LDADD) $(LIBS) @@ -580,26 +632,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -608,8 +657,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -623,13 +675,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-builderDATA: $(builder_DATA) @$(NORMAL_INSTALL) - test -z "$(builderdir)" || $(MKDIR_P) "$(DESTDIR)$(builderdir)" @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(builderdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(builderdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -643,13 +696,14 @@ @$(NORMAL_UNINSTALL) @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(builderdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(builderdir)" && rm -f $$files + dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir) install-desktop_iconsDATA: $(desktop_icons_DATA) @$(NORMAL_INSTALL) - test -z "$(desktop_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)" @list='$(desktop_icons_DATA)'; test -n "$(desktop_iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktop_iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -663,13 +717,14 @@ @$(NORMAL_UNINSTALL) @list='$(desktop_icons_DATA)'; test -n "$(desktop_iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(desktop_iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(desktop_iconsdir)" && rm -f $$files + dir='$(DESTDIR)$(desktop_iconsdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -683,13 +738,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -703,13 +759,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -723,9 +780,7 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -776,6 +831,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -826,10 +895,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -925,8 +999,8 @@ .MAKE: install-am install-data-am install-strip uninstall-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool clean-toolPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ + clean-libexecPROGRAMS clean-libtool clean-toolPROGRAMS \ + cscopelist ctags distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-appletDATA \ install-builderDATA install-data install-data-am \ diff -Nru gnome-applets-3.5.91/missing gnome-applets-3.5.92/missing --- gnome-applets-3.5.91/missing 2011-10-23 17:44:03.000000000 +0000 +++ gnome-applets-3.5.92/missing 2012-09-19 22:33:00.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' sed_minuso='s/.* -o \([^ ]*\).*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac diff -Nru gnome-applets-3.5.91/mixer/Makefile.in gnome-applets-3.5.92/mixer/Makefile.in --- gnome-applets-3.5.91/mixer/Makefile.in 2012-08-30 18:36:48.000000000 +0000 +++ gnome-applets-3.5.92/mixer/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -38,7 +54,8 @@ libexec_PROGRAMS = mixer_applet2$(EXEEXT) subdir = mixer DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in AUTHORS + $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs AUTHORS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -63,9 +80,22 @@ am__DEPENDENCIES_1 = mixer_applet2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -76,22 +106,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(mixer_applet2_SOURCES) DIST_SOURCES = $(mixer_applet2_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -101,6 +127,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -122,6 +153,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(schemas_DATA) $(service_DATA) $(ui_DATA) HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -209,6 +246,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -220,6 +258,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -245,6 +284,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -360,6 +403,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -370,6 +414,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -471,8 +517,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -512,7 +561,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -mixer_applet2$(EXEEXT): $(mixer_applet2_OBJECTS) $(mixer_applet2_DEPENDENCIES) +mixer_applet2$(EXEEXT): $(mixer_applet2_OBJECTS) $(mixer_applet2_DEPENDENCIES) $(EXTRA_mixer_applet2_DEPENDENCIES) @rm -f mixer_applet2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mixer_applet2_OBJECTS) $(mixer_applet2_LDADD) $(LIBS) @@ -530,26 +579,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -558,8 +604,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -573,13 +622,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -593,13 +643,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -613,13 +664,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -633,17 +685,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -653,7 +703,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -667,37 +721,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -706,6 +729,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -769,6 +796,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -804,13 +845,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -848,10 +886,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -938,22 +981,24 @@ uninstall-am: uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-schemasDATA uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-schemasDATA \ - install-serviceDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-schemasDATA install-serviceDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ diff -Nru gnome-applets-3.5.91/mixer/docs/Makefile.in gnome-applets-3.5.92/mixer/docs/Makefile.in --- gnome-applets-3.5.91/mixer/docs/Makefile.in 2012-08-30 18:36:48.000000000 +0000 +++ gnome-applets-3.5.92/mixer/docs/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = mixer/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -456,6 +506,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -477,6 +528,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -525,10 +578,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -702,7 +760,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -716,7 +773,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -724,7 +781,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -763,18 +820,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -784,10 +838,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -855,7 +909,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -923,8 +999,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -950,7 +1026,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1018,7 +1105,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/mkinstalldirs gnome-applets-3.5.92/mkinstalldirs --- gnome-applets-3.5.91/mkinstalldirs 2011-10-23 17:44:09.000000000 +0000 +++ gnome-applets-3.5.92/mkinstalldirs 2012-09-19 22:33:05.000000000 +0000 @@ -81,9 +81,9 @@ echo "mkdir -p -- $*" exec mkdir -p -- "$@" else - # On NextStep and OpenStep, the `mkdir' command does not + # On NextStep and OpenStep, the 'mkdir' command does not # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already + # directories to create, and then abort because '.' already # exists. test -d ./-p && rmdir ./-p test -d ./--version && rmdir ./--version diff -Nru gnome-applets-3.5.91/modemlights/Makefile.in gnome-applets-3.5.92/modemlights/Makefile.in --- gnome-applets-3.5.91/modemlights/Makefile.in 2012-08-30 18:36:48.000000000 +0000 +++ gnome-applets-3.5.92/modemlights/Makefile.in 2012-09-20 01:10:29.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,6 +18,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -38,7 +54,8 @@ host_triplet = @host@ libexec_PROGRAMS = modem_applet$(EXEEXT) subdir = modemlights -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs AUTHORS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -61,9 +78,22 @@ modem_applet_OBJECTS = $(am_modem_applet_OBJECTS) am__DEPENDENCIES_1 = modem_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -74,24 +104,25 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(modem_applet_SOURCES) DIST_SOURCES = $(modem_applet_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -113,6 +144,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(builder_DATA) $(service_DATA) $(ui_DATA) ETAGS = etags CTAGS = ctags @@ -168,6 +205,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -179,6 +217,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -204,6 +243,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -319,6 +362,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -329,6 +373,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -427,8 +473,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -468,7 +517,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -modem_applet$(EXEEXT): $(modem_applet_OBJECTS) $(modem_applet_DEPENDENCIES) +modem_applet$(EXEEXT): $(modem_applet_OBJECTS) $(modem_applet_DEPENDENCIES) $(EXTRA_modem_applet_DEPENDENCIES) @rm -f modem_applet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(modem_applet_OBJECTS) $(modem_applet_LDADD) $(LIBS) @@ -483,26 +532,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -511,8 +557,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -526,13 +575,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-builderDATA: $(builder_DATA) @$(NORMAL_INSTALL) - test -z "$(builderdir)" || $(MKDIR_P) "$(DESTDIR)$(builderdir)" @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(builderdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(builderdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -546,13 +596,14 @@ @$(NORMAL_UNINSTALL) @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(builderdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(builderdir)" && rm -f $$files + dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -566,13 +617,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -586,9 +638,7 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -639,6 +689,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -689,10 +753,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -782,7 +851,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ + clean-libexecPROGRAMS clean-libtool cscopelist ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-appletDATA install-builderDATA \ diff -Nru gnome-applets-3.5.91/multiload/Makefile.in gnome-applets-3.5.92/multiload/Makefile.in --- gnome-applets-3.5.91/multiload/Makefile.in 2012-08-30 18:36:48.000000000 +0000 +++ gnome-applets-3.5.92/multiload/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ libexec_PROGRAMS = multiload-applet-2$(EXEEXT) subdir = multiload -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in AUTHORS +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs AUTHORS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -63,9 +80,22 @@ multiload_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -76,22 +106,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(multiload_applet_2_SOURCES) DIST_SOURCES = $(multiload_applet_2_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -101,6 +127,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -122,6 +153,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(schemas_DATA) $(service_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -208,6 +245,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -219,6 +257,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -244,6 +283,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -359,6 +402,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -369,6 +413,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -473,8 +519,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -514,7 +563,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -multiload-applet-2$(EXEEXT): $(multiload_applet_2_OBJECTS) $(multiload_applet_2_DEPENDENCIES) +multiload-applet-2$(EXEEXT): $(multiload_applet_2_OBJECTS) $(multiload_applet_2_DEPENDENCIES) $(EXTRA_multiload_applet_2_DEPENDENCIES) @rm -f multiload-applet-2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(multiload_applet_2_OBJECTS) $(multiload_applet_2_LDADD) $(LIBS) @@ -534,26 +583,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -562,8 +608,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -577,13 +626,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -597,13 +647,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -617,13 +668,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -637,17 +689,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -657,7 +707,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -671,37 +725,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -710,6 +733,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -773,6 +800,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -808,13 +849,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -852,10 +890,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -942,22 +985,24 @@ uninstall-am: uninstall-appletDATA uninstall-libexecPROGRAMS \ uninstall-schemasDATA uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-schemasDATA \ - install-serviceDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-schemasDATA install-serviceDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ diff -Nru gnome-applets-3.5.91/multiload/docs/Makefile.in gnome-applets-3.5.92/multiload/docs/Makefile.in --- gnome-applets-3.5.91/multiload/docs/Makefile.in 2012-08-30 18:36:48.000000000 +0000 +++ gnome-applets-3.5.92/multiload/docs/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = multiload/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -459,6 +509,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -480,6 +531,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -528,10 +581,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -705,7 +763,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -719,7 +776,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -727,7 +784,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -766,18 +823,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -787,10 +841,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -858,7 +912,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -926,8 +1002,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -953,7 +1029,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1021,7 +1108,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/null_applet/Makefile.in gnome-applets-3.5.92/null_applet/Makefile.in --- gnome-applets-3.5.91/null_applet/Makefile.in 2012-08-30 18:36:48.000000000 +0000 +++ gnome-applets-3.5.92/null_applet/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -36,7 +52,8 @@ host_triplet = @host@ libexec_PROGRAMS = null_applet$(EXEEXT) subdir = null_applet -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -58,9 +75,22 @@ null_applet_OBJECTS = $(am_null_applet_OBJECTS) am__DEPENDENCIES_1 = null_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -71,24 +101,25 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(null_applet_SOURCES) DIST_SOURCES = $(null_applet_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -110,6 +141,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(service_DATA) ETAGS = etags CTAGS = ctags @@ -165,6 +202,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -176,6 +214,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -201,6 +240,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -316,6 +359,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -326,6 +370,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -405,8 +451,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -446,7 +495,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -null_applet$(EXEEXT): $(null_applet_OBJECTS) $(null_applet_DEPENDENCIES) +null_applet$(EXEEXT): $(null_applet_OBJECTS) $(null_applet_DEPENDENCIES) $(EXTRA_null_applet_DEPENDENCIES) @rm -f null_applet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(null_applet_OBJECTS) $(null_applet_LDADD) $(LIBS) @@ -461,26 +510,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -489,8 +535,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -504,13 +553,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -524,9 +574,7 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -577,6 +625,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -627,10 +689,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -718,7 +785,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ + clean-libexecPROGRAMS clean-libtool cscopelist ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-appletDATA install-data \ diff -Nru gnome-applets-3.5.91/po/Makefile.in.in gnome-applets-3.5.92/po/Makefile.in.in --- gnome-applets-3.5.91/po/Makefile.in.in 2011-10-23 17:43:55.000000000 +0000 +++ gnome-applets-3.5.92/po/Makefile.in.in 2012-09-19 22:32:54.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru gnome-applets-3.5.91/po/id.po gnome-applets-3.5.92/po/id.po --- gnome-applets-3.5.91/po/id.po 2011-05-08 01:04:20.000000000 +0000 +++ gnome-applets-3.5.92/po/id.po 2012-09-20 01:07:34.000000000 +0000 @@ -5,21 +5,21 @@ # ahmad riza h nst , 2004. # Dirgita , 2010. # Dirgita , 2010. -# Andika Triwidada , 2011. +# Andika Triwidada , 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: gnome-applets.master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-applets&component=general\n" -"POT-Creation-Date: 2011-01-09 10:47+0000\n" -"PO-Revision-Date: 2011-01-11 18:30+0700\n" +"Project-Id-Version: gnome-applets master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"applets&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-22 00:02+0000\n" +"PO-Revision-Date: 2012-09-09 02:50+0700\n" "Last-Translator: Andika Triwidada \n" -"Language-Team: Indonesian \n" +"Language-Team: Indonesian \n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Indonesian\n" -"X-Poedit-Country: Indonesia\n" "X-Generator: Lokalize 1.1\n" #: ../accessx-status/applet.c:139 @@ -30,25 +30,19 @@ #. about.set_documenters([]) #. translators: These appear in the About dialog, usual format applies. #. "documenters", documenters, -#: ../accessx-status/applet.c:144 -#: ../battstat/battstat_applet.c:1203 -#: ../charpick/charpick.c:612 -#: ../cpufreq/src/cpufreq-applet.c:613 -#: ../drivemount/drivemount.c:106 -#: ../geyes/geyes.c:153 -#: ../gweather/gweather-about.c:55 -#: ../invest-applet/invest/about.py:29 -#: ../mini-commander/src/about.c:53 -#: ../mixer/applet.c:1466 -#: ../modemlights/modem-applet.c:1023 -#: ../multiload/main.c:61 +#: ../accessx-status/applet.c:144 ../battstat/battstat_applet.c:1203 +#: ../charpick/charpick.c:612 ../cpufreq/src/cpufreq-applet.c:611 +#: ../drivemount/drivemount.c:106 ../geyes/geyes.c:153 +#: ../gweather/gweather-about.c:55 ../invest-applet/invest/about.py:29 +#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1424 +#: ../modemlights/modem-applet.c:1023 ../multiload/main.c:61 #: ../stickynotes/stickynotes_applet_callbacks.c:383 #: ../trashapplet/src/trashapplet.c:431 msgid "translator-credits" msgstr "" "Ahmad Riza H Nst , 2004.\n" "Dirgita , 2010.\n" -"Andika Triwidada , 2011." +"Andika Triwidada , 2011, 2012." #: ../accessx-status/applet.c:169 #, c-format @@ -56,7 +50,6 @@ msgstr "Terjadi galat ketika membuka penampil bantuan: %s" #: ../accessx-status/applet.c:201 -#| msgid "There was an error launching the keyboard preferences dialog: %s" msgid "Open the keyboard preferences dialog" msgstr "Buka dialog preferensi papan tik" @@ -69,55 +62,37 @@ msgid "_Keyboard Accessibility Preferences" msgstr "Preferensi Aksesibilitas Papan _Ketik" -#: ../accessx-status/applet.c:241 -#: ../battstat/battstat_applet.c:64 -#: ../charpick/charpick.c:719 -#: ../cpufreq/src/cpufreq-applet.c:125 -#: ../drivemount/drivemount.c:144 -#: ../geyes/geyes.c:318 +#: ../accessx-status/applet.c:241 ../battstat/battstat_applet.c:64 +#: ../charpick/charpick.c:719 ../cpufreq/src/cpufreq-applet.c:126 +#: ../drivemount/drivemount.c:144 ../geyes/geyes.c:318 #: ../gweather/gweather-applet.c:124 -#: ../invest-applet/data/Invest_Applet.xml.h:2 -#: ../mini-commander/src/mini-commander_applet.c:56 -#: ../mixer/applet.c:386 -#: ../modemlights/modem-applet.c:151 -#: ../multiload/main.c:465 -#: ../stickynotes/stickynotes_applet.c:45 -#: ../trashapplet/src/trashapplet.c:75 +#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:381 +#: ../modemlights/modem-applet.c:151 ../multiload/main.c:465 +#: ../stickynotes/stickynotes_applet.c:45 ../trashapplet/src/trashapplet.c:75 msgid "_Help" msgstr "Ba_ntuan" -#: ../accessx-status/applet.c:244 -#: ../battstat/battstat_applet.c:67 -#: ../charpick/charpick.c:722 -#: ../cpufreq/src/cpufreq-applet.c:128 -#: ../drivemount/drivemount.c:147 -#: ../geyes/geyes.c:321 +#: ../accessx-status/applet.c:244 ../battstat/battstat_applet.c:67 +#: ../charpick/charpick.c:722 ../cpufreq/src/cpufreq-applet.c:129 +#: ../drivemount/drivemount.c:147 ../geyes/geyes.c:321 #: ../gweather/gweather-applet.c:127 -#: ../invest-applet/data/Invest_Applet.xml.h:1 -#: ../mini-commander/src/mini-commander_applet.c:59 -#: ../mixer/applet.c:389 -#: ../modemlights/modem-applet.c:154 -#: ../multiload/main.c:468 -#: ../stickynotes/stickynotes_applet.c:48 -#: ../trashapplet/src/trashapplet.c:78 +#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:384 +#: ../modemlights/modem-applet.c:154 ../multiload/main.c:468 +#: ../stickynotes/stickynotes_applet.c:48 ../trashapplet/src/trashapplet.c:78 msgid "_About" msgstr "Tent_ang" #. Note to translators: the first letter of the alphabet, not the indefinite article -#: ../accessx-status/applet.c:468 -#: ../accessx-status/applet.c:508 +#: ../accessx-status/applet.c:468 ../accessx-status/applet.c:508 msgid "a" msgstr "a" -#: ../accessx-status/applet.c:981 -#: ../accessx-status/applet.c:1055 -#: ../accessx-status/applet.c:1124 -#: ../accessx-status/applet.c:1290 +#: ../accessx-status/applet.c:981 ../accessx-status/applet.c:1055 +#: ../accessx-status/applet.c:1124 ../accessx-status/applet.c:1290 msgid "AccessX Status" msgstr "Status AccessX" -#: ../accessx-status/applet.c:982 -#: ../accessx-status/applet.c:1125 +#: ../accessx-status/applet.c:982 ../accessx-status/applet.c:1125 msgid "Shows keyboard status when accessibility features are used." msgstr "Menampilkan status papan ketik saat fitur aksesibilitas digunakan." @@ -135,7 +110,7 @@ msgstr "Galat: %s" #: ../accessx-status/applet.c:1287 -#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2 +#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3 msgid "Keyboard Accessibility Status" msgstr "Status Aksesibilitas Papan Ketik" @@ -147,7 +122,7 @@ msgid "AccessX Status Applet Factory" msgstr "Pabrik Aplet Status AccessX" -#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3 +#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2 msgid "Keyboard Accessibility Status Applet Factory" msgstr "Pabrik Aplet Status Aksesibilitas Papan Ketik" @@ -155,16 +130,11 @@ msgid "Shows the status of keyboard accessibility features" msgstr "Menampilkan status fitur aksesibilitas papan ketik" -#: ../battstat/battstat_applet.c:61 -#: ../charpick/charpick.c:716 -#: ../cpufreq/src/cpufreq-applet.c:122 -#: ../geyes/geyes.c:315 +#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:716 +#: ../cpufreq/src/cpufreq-applet.c:123 ../geyes/geyes.c:315 #: ../gweather/gweather-applet.c:121 -#: ../invest-applet/data/Invest_Applet.xml.h:3 -#: ../mini-commander/src/mini-commander_applet.c:53 -#: ../mixer/applet.c:392 -#: ../multiload/main.c:459 -#: ../stickynotes/stickynotes_applet.c:42 +#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:387 +#: ../multiload/main.c:459 ../stickynotes/stickynotes_applet.c:42 msgid "_Preferences" msgstr "_Preferensi" @@ -222,14 +192,12 @@ msgid "%d %s %d %s (%d%%) remaining" msgstr "%d %s %d %s (%d%%) lagi" -#: ../battstat/battstat_applet.c:372 -#: ../battstat/battstat_applet.c:379 +#: ../battstat/battstat_applet.c:372 ../battstat/battstat_applet.c:379 msgid "hour" msgid_plural "hours" msgstr[0] "jam" -#: ../battstat/battstat_applet.c:373 -#: ../battstat/battstat_applet.c:380 +#: ../battstat/battstat_applet.c:373 ../battstat/battstat_applet.c:380 msgid "minute" msgid_plural "minutes" msgstr[0] "menit" @@ -245,13 +213,11 @@ msgid "Battery Monitor" msgstr "Monitor Baterai" -#: ../battstat/battstat_applet.c:402 -#: ../battstat/battstat_applet.c:461 +#: ../battstat/battstat_applet.c:402 ../battstat/battstat_applet.c:461 msgid "Your battery is now fully recharged" msgstr "Baterai sudah terisi penuh" -#: ../battstat/battstat_applet.c:438 -#: ../battstat/battstat_applet.c:593 +#: ../battstat/battstat_applet.c:438 ../battstat/battstat_applet.c:593 msgid "Battery Notice" msgstr "Pemberitahuan Baterai" @@ -263,9 +229,12 @@ #: ../battstat/battstat_applet.c:544 #, c-format -msgid "You have %d minute of battery power remaining (%d%% of the total capacity)." -msgid_plural "You have %d minutes of battery power remaining (%d%% of the total capacity)." -msgstr[0] "Anda punya sisa daya baterai selama %d menit (%d%% dari kapasitas totalnya)." +msgid "" +"You have %d minute of battery power remaining (%d%% of the total capacity)." +msgid_plural "" +"You have %d minutes of battery power remaining (%d%% of the total capacity)." +msgstr[0] "" +"Anda punya sisa daya baterai selama %d menit (%d%% dari kapasitas totalnya)." #. TRANSLATORS: this is a list, it is left as a single string #. * to allow you to make it appear like a list would in your @@ -312,13 +281,9 @@ msgid "N/A" msgstr "T/A" -#: ../battstat/battstat_applet.c:1150 -#: ../drivemount/drivemount.c:132 -#: ../geyes/geyes.c:303 -#: ../geyes/themes.c:242 -#: ../gweather/gweather-applet.c:70 -#: ../gweather/gweather-pref.c:746 -#: ../mini-commander/src/preferences.c:366 +#: ../battstat/battstat_applet.c:1150 ../drivemount/drivemount.c:132 +#: ../geyes/geyes.c:303 ../geyes/themes.c:242 ../gweather/gweather-applet.c:70 +#: ../gweather/gweather-pref.c:746 ../mini-commander/src/preferences.c:366 #: ../stickynotes/stickynotes_applet_callbacks.c:349 #: ../stickynotes/stickynotes_applet_callbacks.c:565 #: ../trashapplet/src/trashapplet.c:398 @@ -340,9 +305,8 @@ msgid "Legacy (non-HAL) backend enabled." msgstr "Dukungan legasi (non-HAL) diaktifkan." -#: ../battstat/battstat_applet.c:1569 -#: ../battstat/battstat_applet.c:1622 -#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1 +#: ../battstat/battstat_applet.c:1569 ../battstat/battstat_applet.c:1622 +#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2 msgid "Battery Charge Monitor" msgstr "Monitor Pengisian Baterai" @@ -352,56 +316,55 @@ msgstr "Pantau sisa daya pada laptop" #: ../battstat/battstat_applet.ui.h:1 -msgid "(shows single image for status and charge)" -msgstr "(tampilkan status dan muatan dalam satu gambar)" +msgid "Battery Charge Monitor Preferences" +msgstr "Preferensi Monitor Pengisian Baterai" #: ../battstat/battstat_applet.ui.h:2 -msgid "(two images: one for status, one for charge)" -msgstr "(dua gambar: satu untuk status, satu untuk muatan)" - -#: ../battstat/battstat_applet.ui.h:3 msgid "Appearance" msgstr "Tampilan" +#: ../battstat/battstat_applet.ui.h:3 +msgid "_Compact view" +msgstr "Tampilan _kompak" + #: ../battstat/battstat_applet.ui.h:4 -msgid "Battery Charge Monitor Preferences" -msgstr "Preferensi Monitor Pengisian Baterai" +msgid "(shows single image for status and charge)" +msgstr "(tampilkan status dan muatan dalam satu gambar)" #: ../battstat/battstat_applet.ui.h:5 -msgid "Notifications" -msgstr "Notifikasi" +msgid "_Expanded view" +msgstr "Tampilan l_ebar" #: ../battstat/battstat_applet.ui.h:6 -msgid "Show _percentage remaining" -msgstr "Tampilkan _persentase tersisa" +msgid "(two images: one for status, one for charge)" +msgstr "(dua gambar: satu untuk status, satu untuk muatan)" #: ../battstat/battstat_applet.ui.h:7 -msgid "Show _time remaining" -msgstr "_Tampilkan waktu tersisa" +msgid "_Show time/percentage:" +msgstr "Tampilkan waktu/per_sentase:" #: ../battstat/battstat_applet.ui.h:8 -msgid "_Compact view" -msgstr "Tampilan _kompak" +msgid "Show _time remaining" +msgstr "_Tampilkan waktu tersisa" #: ../battstat/battstat_applet.ui.h:9 -msgid "_Expanded view" -msgstr "Tampilan l_ebar" +msgid "Show _percentage remaining" +msgstr "Tampilkan _persentase tersisa" #: ../battstat/battstat_applet.ui.h:10 -msgid "_Notify when battery is fully recharged" -msgstr "Beri tahu jika baterai telah terisi pe_nuh" - -#: ../battstat/battstat_applet.ui.h:11 -msgid "_Show time/percentage:" -msgstr "Tampilkan waktu/per_sentase:" +msgid "Notifications" +msgstr "Notifikasi" #. TRANSLATOR: This is the beginning of the sentence 'Warn when battery charge drops to: [XX] percent/minutes remaining' -#: ../battstat/battstat_applet.ui.h:13 +#: ../battstat/battstat_applet.ui.h:12 msgid "_Warn when battery charge drops to:" msgstr "Peringat_kan saat baterai mencapai:" -#: ../battstat/battstat-hal.c:343 -#: ../battstat/battstat-hal.c:368 +#: ../battstat/battstat_applet.ui.h:13 +msgid "_Notify when battery is fully recharged" +msgstr "Beri tahu jika baterai telah terisi pe_nuh" + +#: ../battstat/battstat-hal.c:343 ../battstat/battstat-hal.c:368 msgid "HAL error" msgstr "Galat HAL" @@ -419,78 +382,90 @@ msgstr "Tidak dapat menginisiasi HAL: %s: %s" #: ../battstat/battstat.schemas.in.h:1 -msgid "0 for no label, 1 for percentage and 2 for time remaining." -msgstr "0 untuk tanpa label, 1 untuk persentase dan 2 untuk waktu tersisa." +msgid "Red value level" +msgstr "Tingkat merah" #: ../battstat/battstat.schemas.in.h:2 -msgid "Beep for warnings" -msgstr "Bunyikan suara peringatan" +msgid "" +"The battery level below which the battery is displayed as red. Also the " +"value at which the low battery warning is displayed." +msgstr "" +"Tingkatan baterai lemah ketika baterai ditampilkan dengan warna Merah. Juga " +"nilai ketika peringatan baterai lemah ditampilkan." #: ../battstat/battstat.schemas.in.h:3 -msgid "Beep when displaying a warning." -msgstr "Beep ketika menampilkan sebuah peringatan." +msgid "Warn on low time rather than low percentage" +msgstr "Peringatkan dengan waktu menipis dari pada persentasi rendah" #: ../battstat/battstat.schemas.in.h:4 -msgid "Drain from top" -msgstr "Turun dari atas" +msgid "" +"Use the value defined in red_value as a time remaining to show the warning " +"dialog rather than a percentage." +msgstr "" +"Gunakan nilai yang didefinisikan pada red_value sebagai sisa waktu untuk " +"menampilkan dialog peringatan daripada sebuah persentase." #: ../battstat/battstat.schemas.in.h:5 -msgid "Full Battery Notification" -msgstr "Notifikasi Baterai Penuh" - -#: ../battstat/battstat.schemas.in.h:6 msgid "Low Battery Notification" msgstr "Notifikasi Baterai Lemah" +#: ../battstat/battstat.schemas.in.h:6 +msgid "Notify user when the battery is low." +msgstr "Memberi tahu pengguna ketika baterai sudah lemah." + #: ../battstat/battstat.schemas.in.h:7 -msgid "Notify user when the battery is full." -msgstr "Memberi tahu pengguna ketika baterai sudah penuh." +msgid "Full Battery Notification" +msgstr "Notifikasi Baterai Penuh" #: ../battstat/battstat.schemas.in.h:8 -msgid "Notify user when the battery is low." -msgstr "Memberi tahu pengguna ketika baterai sudah lemah." +msgid "Notify user when the battery is full." +msgstr "Memberi tahu pengguna ketika baterai sudah penuh." #: ../battstat/battstat.schemas.in.h:9 -msgid "Red value level" -msgstr "Tingkat merah" +msgid "Beep for warnings" +msgstr "Bunyikan suara peringatan" #: ../battstat/battstat.schemas.in.h:10 -msgid "Show the battery meter draining from the top of the battery. Only implemented for traditional battery view." -msgstr "Tunjukkan indikator baterai turun dari atas baterai. Ini hanya berlaku pada tampilan baterai tradisional." +msgid "Beep when displaying a warning." +msgstr "Beep ketika menampilkan sebuah peringatan." #: ../battstat/battstat.schemas.in.h:11 -msgid "Show the horizontal battery" -msgstr "Tunjukkan baterai horisontal" +msgid "Drain from top" +msgstr "Turun dari atas" #: ../battstat/battstat.schemas.in.h:12 -msgid "Show the time/percent label" -msgstr "Menampilkan label waktu/persen" +msgid "" +"Show the battery meter draining from the top of the battery. Only " +"implemented for traditional battery view." +msgstr "" +"Tunjukkan indikator baterai turun dari atas baterai. Ini hanya berlaku pada " +"tampilan baterai tradisional." #: ../battstat/battstat.schemas.in.h:13 -msgid "Show the traditional, horizontal battery on the panel." -msgstr "Tampilkan baterai mendatar yang tradisional pada panel." +msgid "Upright (small) battery" +msgstr "Baterai (kecil) kanan atas" #: ../battstat/battstat.schemas.in.h:14 msgid "Show the upright, smaller battery on the panel." msgstr "Tampilkan baterai tegak yang lebih kecil pada panel." #: ../battstat/battstat.schemas.in.h:15 -msgid "The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed." -msgstr "Tingkatan baterai lemah ketika baterai ditampilkan dengan warna Merah. Juga nilai ketika peringatan baterai lemah ditampilkan." +msgid "Show the horizontal battery" +msgstr "Tunjukkan baterai horisontal" #: ../battstat/battstat.schemas.in.h:16 -msgid "Upright (small) battery" -msgstr "Baterai (kecil) kanan atas" +msgid "Show the traditional, horizontal battery on the panel." +msgstr "Tampilkan baterai mendatar yang tradisional pada panel." #: ../battstat/battstat.schemas.in.h:17 -msgid "Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage." -msgstr "Gunakan nilai yang didefinisikan pada red_value sebagai sisa waktu untuk menampilkan dialog peringatan daripada sebuah persentase." +msgid "Show the time/percent label" +msgstr "Menampilkan label waktu/persen" #: ../battstat/battstat.schemas.in.h:18 -msgid "Warn on low time rather than low percentage" -msgstr "Peringatkan dengan waktu menipis dari pada persentasi rendah" +msgid "0 for no label, 1 for percentage and 2 for time remaining." +msgstr "0 untuk tanpa label, 1 untuk persentase dan 2 untuk waktu tersisa." -#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2 +#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1 msgid "Battstat Factory" msgstr "Pabrikan Battstat" @@ -515,13 +490,13 @@ msgstr "Utilitas Status Baterai" #: ../battstat/sounds/battstat_applet.soundlist.in.h:2 -msgid "Battery fully re-charged" -msgstr "Baterai sudah penuh" - -#: ../battstat/sounds/battstat_applet.soundlist.in.h:3 msgid "Battery power low" msgstr "Daya baterai lemah" +#: ../battstat/sounds/battstat_applet.soundlist.in.h:3 +msgid "Battery fully re-charged" +msgstr "Baterai sudah penuh" + #: ../charpick/charpick.c:438 msgid "Available palettes" msgstr "Palet yang tersedia" @@ -545,12 +520,15 @@ msgstr "Masukkan karakter khusus %s" #: ../charpick/charpick.c:607 -msgid "Gnome Panel applet for selecting strange characters that are not on my keyboard. Released under GNU General Public Licence." -msgstr "Applet Gnome Panel untuk memilih karakter asing yang tidak berada pada papan ketik saya. Dilepas dalam Lisensi Publik Umum GNU." +msgid "" +"Gnome Panel applet for selecting strange characters that are not on my " +"keyboard. Released under GNU General Public Licence." +msgstr "" +"Applet Gnome Panel untuk memilih karakter asing yang tidak berada pada papan " +"ketik saya. Dilepas dalam Lisensi Publik Umum GNU." -#: ../charpick/charpick.c:745 -#: ../charpick/charpick.c:759 -#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1 +#: ../charpick/charpick.c:745 ../charpick/charpick.c:759 +#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2 #: ../charpick/properties.c:451 msgid "Character Palette" msgstr "Palet Karakter" @@ -561,27 +539,30 @@ msgstr "Masukkan karakter" #: ../charpick/charpick.schemas.in.h:1 -msgid "Characters shown on applet startup" -msgstr "Karakter yang diperlihatkan pada saat memulai applet" - -#: ../charpick/charpick.schemas.in.h:2 msgid "DEPRECATED - Characters shown on applet startup" msgstr "DEPRECATED - Karakter terlihat pada saat memulai applet" +#: ../charpick/charpick.schemas.in.h:2 +msgid "Characters shown on applet startup" +msgstr "Karakter yang diperlihatkan pada saat memulai applet" + #: ../charpick/charpick.schemas.in.h:3 -#: ../charpick/properties.c:378 +msgid "" +"The string that the user had selected when the applet was last used. This " +"string will be displayed when the user starts the applet." +msgstr "" +"String yang dipilih pengguna ketika terakhir kali applet dipergunakan. " +"String ini akan ditampilkan ketika pengguna menjalankan applet." + +#: ../charpick/charpick.schemas.in.h:4 ../charpick/properties.c:378 msgid "List of available palettes" msgstr "Daftar palet yang tersedia" -#: ../charpick/charpick.schemas.in.h:4 +#: ../charpick/charpick.schemas.in.h:5 msgid "List of strings containing the available palettes." msgstr "Daftar string berisi palet yang tersedia." -#: ../charpick/charpick.schemas.in.h:5 -msgid "The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet." -msgstr "String yang dipilih pengguna ketika terakhir kali applet dipergunakan. String ini akan ditampilkan ketika pengguna menjalankan applet." - -#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2 +#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1 msgid "Charpicker Applet Factory" msgstr "Pabrik Aplet Pemilih Karakter" @@ -646,64 +627,76 @@ msgstr "Preferensi Karakter Palet" #: ../cpufreq/cpufreq-applet.schemas.in.h:1 -msgid "A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency." -msgstr "Nilai 0 berarti menampilkan frekuensi cpu, 1 untuk menampilkan frekuensi serta unit dan 2 untuk menampilkan persentasi daripada frekuensi." +msgid "CPU to Monitor" +msgstr "CPU yang Dipantau" #: ../cpufreq/cpufreq-applet.schemas.in.h:2 -msgid "A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode." -msgstr "Nilai 0 berarti menampilkan applet dalam model grafis (hanya pixmap), 1 menampilkan applet pada mode teks (tidak menampilkan pixmap) dan 2 menampilkan applet dalam mode grafis dan teks." +msgid "" +"Set the CPU to monitor. In a single processor system you don't have to " +"change it." +msgstr "" +"Tetapkan CPU yang akan dipantau, tidak berlaku pada sistem prosesor tunggal" #: ../cpufreq/cpufreq-applet.schemas.in.h:3 -msgid "CPU to Monitor" -msgstr "CPU yang Dipantau" - -#: ../cpufreq/cpufreq-applet.schemas.in.h:4 msgid "Mode to show cpu usage" msgstr "Mode untuk menampilkan penggunaan cpu" -#: ../cpufreq/cpufreq-applet.schemas.in.h:5 -msgid "Set the CPU to monitor. In a single processor system you don't have to change it." -msgstr "Tetapkan CPU yang akan dipantau, tidak berlaku pada sistem prosesor tunggal" +#: ../cpufreq/cpufreq-applet.schemas.in.h:4 +msgid "" +"A 0 value means to show the applet in graphic mode (pixmap only), 1 to show " +"the applet in text mode (not to show the pixmap) and 2 to show the applet in " +"graphic and text mode." +msgstr "" +"Nilai 0 berarti menampilkan applet dalam model grafis (hanya pixmap), 1 " +"menampilkan applet pada mode teks (tidak menampilkan pixmap) dan 2 " +"menampilkan applet dalam mode grafis dan teks." -#: ../cpufreq/cpufreq-applet.schemas.in.h:6 +#: ../cpufreq/cpufreq-applet.schemas.in.h:5 msgid "The type of text to display (if the text is enabled)." msgstr "Jenis teks untuk ditampilkan (jika teks diaktifkan)." +#: ../cpufreq/cpufreq-applet.schemas.in.h:6 +msgid "" +"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 " +"to show percentage instead of frequency." +msgstr "" +"Nilai 0 berarti menampilkan frekuensi cpu, 1 untuk menampilkan frekuensi " +"serta unit dan 2 untuk menampilkan persentasi daripada frekuensi." + #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" msgstr "Preferensi Monitor Frekuensi CPU" #: ../cpufreq/cpufreq-preferences.ui.h:2 -msgid "Display Settings" -msgstr "Pengaturan Tampilan" - -#: ../cpufreq/cpufreq-preferences.ui.h:3 msgid "Monitor Settings" msgstr "Pengaturan Monitor" +#: ../cpufreq/cpufreq-preferences.ui.h:3 +msgid "_Monitored CPU:" +msgstr "CPU yang di_pantau:" + #: ../cpufreq/cpufreq-preferences.ui.h:4 -msgid "Show CPU frequency as _frequency" -msgstr "Tampilkan frekuensi CPU dalam _frekuensi" +msgid "Display Settings" +msgstr "Pengaturan Tampilan" #: ../cpufreq/cpufreq-preferences.ui.h:5 -msgid "Show CPU frequency as _percentage" -msgstr "Tampilkan frekuensi CPU dalam _persentase" +msgid "_Appearance:" +msgstr "T_ampilan:" #: ../cpufreq/cpufreq-preferences.ui.h:6 -msgid "Show frequency _units" -msgstr "Tampilkan _unit frekuensi" +msgid "Show CPU frequency as _frequency" +msgstr "Tampilkan frekuensi CPU dalam _frekuensi" #: ../cpufreq/cpufreq-preferences.ui.h:7 -msgid "_Appearance:" -msgstr "T_ampilan:" +msgid "Show frequency _units" +msgstr "Tampilkan _unit frekuensi" #: ../cpufreq/cpufreq-preferences.ui.h:8 -msgid "_Monitored CPU:" -msgstr "CPU yang di_pantau:" +msgid "Show CPU frequency as _percentage" +msgstr "Tampilkan frekuensi CPU dalam _persentase" #: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1 -#: ../cpufreq/src/cpufreq-applet.c:946 -#: ../cpufreq/src/cpufreq-applet.c:1005 +#: ../cpufreq/src/cpufreq-applet.c:944 ../cpufreq/src/cpufreq-applet.c:1003 msgid "CPU Frequency Scaling Monitor" msgstr "Monitor Skala Frekuensi CPU" @@ -711,16 +704,15 @@ msgid "Monitor the CPU Frequency Scaling" msgstr "Memantau Skala Frekuensi CPU" -#: ../cpufreq/src/cpufreq-applet.c:581 -#: ../cpufreq/src/cpufreq-prefs.c:478 +#: ../cpufreq/src/cpufreq-applet.c:579 ../cpufreq/src/cpufreq-prefs.c:478 msgid "Could not open help document" msgstr "Dokumen bantuan tidak dapat dibuka" -#: ../cpufreq/src/cpufreq-applet.c:608 +#: ../cpufreq/src/cpufreq-applet.c:606 msgid "This utility shows the current CPU Frequency Scaling." msgstr "Program ini menampilkan status penskalaan frekuensi CPU." -#: ../cpufreq/src/cpufreq-applet.c:1006 +#: ../cpufreq/src/cpufreq-applet.c:1004 msgid "This utility shows the current CPU Frequency" msgstr "Program ini menampilkan status frekuensi CPU" @@ -736,7 +728,7 @@ msgid "Graphic and Text" msgstr "Grafik dan Teks" -#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:117 +#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:121 msgid "Frequency Scaling Unsupported" msgstr "Penskalaan Frekuensi Tidak Didukung" @@ -749,8 +741,13 @@ msgstr "Penskalaan frekuensi CPU tidak didukung" #: ../cpufreq/src/cpufreq-monitor-factory.c:60 -msgid "You will not be able to modify the frequency of your machine. Your machine may be misconfigured or not have hardware support for CPU frequency scaling." -msgstr "Anda tidak akan dapat merubah frekuensi dari mesin Anda. Mesin Anda mungkin salah konfigurasi atau tidak memiliki dukungan penskalaan frekuensi untuk CPU." +msgid "" +"You will not be able to modify the frequency of your machine. Your machine " +"may be misconfigured or not have hardware support for CPU frequency scaling." +msgstr "" +"Anda tidak akan dapat merubah frekuensi dari mesin Anda. Mesin Anda mungkin " +"salah konfigurasi atau tidak memiliki dukungan penskalaan frekuensi untuk " +"CPU." #: ../cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.h:1 msgid "Change CPU Frequency scaling" @@ -760,8 +757,7 @@ msgid "Privileges are required to change the CPU Frequency scaling." msgstr "Hak istimewa diperlukan untuk mengubah penskalaan Frekuensi CPU." -#: ../drivemount/drive-button.c:342 -#: ../drivemount/drive-button.c:355 +#: ../drivemount/drive-button.c:342 ../drivemount/drive-button.c:355 msgid "(mounted)" msgstr "(terkait)" @@ -769,38 +765,38 @@ msgid "(not mounted)" msgstr "(terlepas)" -#: ../drivemount/drive-button.c:566 +#: ../drivemount/drive-button.c:562 msgid "Cannot start Nautilus File Manager" msgstr "Tak bisa memulai Manajer Berkas Nautilus" -#: ../drivemount/drive-button.c:573 +#: ../drivemount/drive-button.c:569 msgid "Could not find Nautilus" msgstr "Tak bisa temukan Nautilus" -#: ../drivemount/drive-button.c:897 +#: ../drivemount/drive-button.c:893 msgid "_Play DVD" msgstr "_Putar DVD" -#: ../drivemount/drive-button.c:901 +#: ../drivemount/drive-button.c:897 msgid "_Play CD" msgstr "_Putar CD" -#: ../drivemount/drive-button.c:904 +#: ../drivemount/drive-button.c:900 #, c-format msgid "_Open %s" msgstr "_Buka %s" -#: ../drivemount/drive-button.c:913 +#: ../drivemount/drive-button.c:908 #, c-format msgid "Un_mount %s" msgstr "Lepas kaitan %s" -#: ../drivemount/drive-button.c:920 +#: ../drivemount/drive-button.c:914 #, c-format msgid "_Mount %s" msgstr "_Kaitkan %s" -#: ../drivemount/drive-button.c:928 +#: ../drivemount/drive-button.c:922 #, c-format msgid "_Eject %s" msgstr "K_eluarkan %s" @@ -809,9 +805,8 @@ msgid "Applet for mounting and unmounting block volumes." msgstr "Applet untuk memasang dan melepas media." -#: ../drivemount/drivemount.c:164 -#: ../drivemount/drivemount.c:201 -#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1 +#: ../drivemount/drivemount.c:164 ../drivemount/drivemount.c:201 +#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3 msgid "Disk Mounter" msgstr "Pengait Diska" @@ -823,11 +818,11 @@ msgid "Time in seconds between status updates" msgstr "Waktu dalam detik setiap pembaruan status" -#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2 +#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1 msgid "Drive Mount Applet Factory" msgstr "Pabrik Aplet Kaitan Kandar" -#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3 +#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2 msgid "Factory for drive mount applet" msgstr "Pabrikan untuk aplet pengait kandar" @@ -839,9 +834,7 @@ msgid "A goofy set of eyes for the GNOME panel. They follow your mouse." msgstr "Mata goofy untuk panel GNOME. Dia akan mengikuti tetikusmu." -#: ../geyes/geyes.c:348 -#: ../geyes/geyes.c:379 -#: ../geyes/geyes.c:381 +#: ../geyes/geyes.c:348 ../geyes/geyes.c:379 ../geyes/geyes.c:381 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:2 msgid "Eyes" msgstr "Mata" @@ -855,13 +848,13 @@ msgstr "Direktori di mana tema ditempatkan" #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1 -msgid "A set of eyeballs for your panel" -msgstr "Satu set bola mata untuk panel Anda" - -#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3 msgid "Geyes Applet Factory" msgstr "Pabrik Aplet Geyes" +#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3 +msgid "A set of eyeballs for your panel" +msgstr "Satu set bola mata untuk panel Anda" + #: ../geyes/themes.c:127 msgid "Can not launch the eyes applet." msgstr "Tidak dapat menjalankan applet eyes." @@ -882,644 +875,9 @@ msgid "_Select a theme:" msgstr "_Pilih tema:" -#: ../gkb-new/xmodmap/base.xml.in.h:1 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:1 -msgid "Alt+Control changes layout." -msgstr "Control+Alt mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:2 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:2 -msgid "Alt+Shift changes layout." -msgstr "Alt+Shift mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:3 -msgid "Arabic keymap" -msgstr "Susunan Arab" - -#: ../gkb-new/xmodmap/base.xml.in.h:4 -msgid "Armenian" -msgstr "Armenia" - -#: ../gkb-new/xmodmap/base.xml.in.h:5 -msgid "Basque" -msgstr "Basque" - -#: ../gkb-new/xmodmap/base.xml.in.h:6 -msgid "Belgian" -msgstr "Belgia" - -#: ../gkb-new/xmodmap/base.xml.in.h:7 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:6 -msgid "Both Alt keys together change layout." -msgstr "Kedua tombol Alt mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:8 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:7 -msgid "Both Ctrl keys together change layout." -msgstr "Kedua tombol Ctrl mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:9 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:8 -msgid "Both Shift keys together change layout." -msgstr "Kedua tombol Shift mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:10 -msgid "Brazil Portuguese keymap" -msgstr "Susunan Brasil Portugis" - -#: ../gkb-new/xmodmap/base.xml.in.h:11 -msgid "Bulgarian Cyrillic" -msgstr "Sirilik Bulgaria" - -#: ../gkb-new/xmodmap/base.xml.in.h:12 -msgid "Bulgarian keymap" -msgstr "Susunan Bulgaria" - -#: ../gkb-new/xmodmap/base.xml.in.h:13 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:16 -msgid "CapsLock key changes layout." -msgstr "Tombol CapsLock mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:14 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:17 -msgid "Control+Shift changes layout." -msgstr "Control+Shift mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:15 -msgid "Czech keymap" -msgstr "Susunan Ceko" - -#: ../gkb-new/xmodmap/base.xml.in.h:16 -msgid "Danish keymap" -msgstr "Susunan Denmark" - -#: ../gkb-new/xmodmap/base.xml.in.h:17 -msgid "Dutch keymap" -msgstr "Susunan Belanda" - -#: ../gkb-new/xmodmap/base.xml.in.h:18 -msgid "English keymap" -msgstr "Susunan Inggris" - -#: ../gkb-new/xmodmap/base.xml.in.h:19 -msgid "Estonian keymap" -msgstr "Susunan Estonia" - -#: ../gkb-new/xmodmap/base.xml.in.h:20 -msgid "Finnish keymap" -msgstr "Susunan Finlandia" - -#: ../gkb-new/xmodmap/base.xml.in.h:21 -msgid "French Swiss" -msgstr "Prancis Swiss" - -#: ../gkb-new/xmodmap/base.xml.in.h:22 -msgid "French Swiss keymap" -msgstr "Susunan Prancis Swiss" - -#: ../gkb-new/xmodmap/base.xml.in.h:23 -msgid "French keymap" -msgstr "Susunan Prancis" - -#: ../gkb-new/xmodmap/base.xml.in.h:24 -msgid "French-Canadian 105-key" -msgstr "Key 105 Prancis Kanada" - -#: ../gkb-new/xmodmap/base.xml.in.h:25 -msgid "GB 102-key" -msgstr "GB 102 tombol" - -#: ../gkb-new/xmodmap/base.xml.in.h:26 -msgid "GB 105-key" -msgstr "GB 105 tombol" - -#: ../gkb-new/xmodmap/base.xml.in.h:27 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:27 -msgid "Generic Keyboard" -msgstr "Papan Ketik Generik" - -#: ../gkb-new/xmodmap/base.xml.in.h:28 -msgid "Georgian Latin" -msgstr "Georgia Latin" - -#: ../gkb-new/xmodmap/base.xml.in.h:29 -msgid "Georgian Russian layout" -msgstr "Tata letak Georgia Rusia" - -#: ../gkb-new/xmodmap/base.xml.in.h:30 -msgid "Georgian keymap" -msgstr "Susunan Georgia" - -#: ../gkb-new/xmodmap/base.xml.in.h:31 -msgid "German" -msgstr "Jerman" - -#: ../gkb-new/xmodmap/base.xml.in.h:32 -msgid "German Swiss with Euro" -msgstr "Swis Jerman dengan Euro" - -#: ../gkb-new/xmodmap/base.xml.in.h:33 -msgid "German keymap" -msgstr "Susunan Jerman" - -#: ../gkb-new/xmodmap/base.xml.in.h:34 -msgid "Greek keymap" -msgstr "Susunan Yunani" - -#: ../gkb-new/xmodmap/base.xml.in.h:35 -msgid "Hebrew keymap" -msgstr "Susunan Ibrani" - -#: ../gkb-new/xmodmap/base.xml.in.h:36 -msgid "Hungarian 101-key latin 1" -msgstr "Key latin 1 101 hungaria" - -#: ../gkb-new/xmodmap/base.xml.in.h:37 -msgid "Hungarian 101-key latin 2" -msgstr "Key latin 2 101 Hungaria " - -#: ../gkb-new/xmodmap/base.xml.in.h:38 -msgid "Hungarian 105-key latin 1" -msgstr "Key latin 1 105 Hungaria" - -#: ../gkb-new/xmodmap/base.xml.in.h:39 -msgid "Hungarian 105-key latin 2" -msgstr "Key latin 2 105 Hungaria " - -#: ../gkb-new/xmodmap/base.xml.in.h:40 -msgid "Hungarian PC/AT 101 keyboard" -msgstr "Keyboard PC/AT 101 Hungaria" - -#: ../gkb-new/xmodmap/base.xml.in.h:41 -msgid "Hungarian latin1" -msgstr "Hungarian latin1" - -#: ../gkb-new/xmodmap/base.xml.in.h:42 -msgid "Icelandic keymap" -msgstr "Susunan Islandia" - -#: ../gkb-new/xmodmap/base.xml.in.h:43 -msgid "Italian keymap" -msgstr "Susunan Italia" - -#: ../gkb-new/xmodmap/base.xml.in.h:44 -msgid "Japanese keymap" -msgstr "Susunan Jepang" - -#: ../gkb-new/xmodmap/base.xml.in.h:45 -msgid "Lao keymap" -msgstr "Susunan Lao" - -#: ../gkb-new/xmodmap/base.xml.in.h:46 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:41 -msgid "Layout shift behavior" -msgstr "Perilaku susunan shift" - -#: ../gkb-new/xmodmap/base.xml.in.h:47 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:42 -msgid "Left Alt key changes layout." -msgstr "Tombol Alt kiri mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:48 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:43 -msgid "Left Ctrl key changes group." -msgstr "Tombol Ctrl kiri mengubah kelompok." - -#: ../gkb-new/xmodmap/base.xml.in.h:49 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:44 -msgid "Left Shift key changes group." -msgstr "Tombol Shift kiri mengubah kelompok." - -#: ../gkb-new/xmodmap/base.xml.in.h:50 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:45 -msgid "Left Win-key changes layout." -msgstr "Tombol Win kiri mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:51 -msgid "Lithuanian keymap" -msgstr "Susunan Lituania" - -#: ../gkb-new/xmodmap/base.xml.in.h:52 -msgid "Macedonian" -msgstr "Bahasa Makedonia" - -#: ../gkb-new/xmodmap/base.xml.in.h:53 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:48 -msgid "Menu key changes layout." -msgstr "Tombol Menu mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:54 -msgid "Mongolian alt keymap" -msgstr "Susunan alt Mongolia" - -#: ../gkb-new/xmodmap/base.xml.in.h:55 -msgid "Mongolian keymap" -msgstr "Susunan Mongolia" - -#: ../gkb-new/xmodmap/base.xml.in.h:56 -msgid "Mongolian phonetic keymap" -msgstr "Susunan Fonetik Mongolia" - -#: ../gkb-new/xmodmap/base.xml.in.h:57 -msgid "Norwegian" -msgstr "Norwegia" - -#: ../gkb-new/xmodmap/base.xml.in.h:58 -msgid "Plain Russian keymap" -msgstr "Susunan Plain Rusia" - -#: ../gkb-new/xmodmap/base.xml.in.h:59 -msgid "Polish" -msgstr "Bahasa Polandia" - -#: ../gkb-new/xmodmap/base.xml.in.h:60 -msgid "Polish deadkeys" -msgstr "Deadkey Polandia" - -#: ../gkb-new/xmodmap/base.xml.in.h:61 -msgid "Portugal" -msgstr "Portugal" - -#: ../gkb-new/xmodmap/base.xml.in.h:62 -msgid "Portugal Deadkeys" -msgstr "Deadkey Portugal" - -#: ../gkb-new/xmodmap/base.xml.in.h:63 -msgid "Portuguese keymap" -msgstr "Susunan Portugis" - -#: ../gkb-new/xmodmap/base.xml.in.h:64 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:53 -msgid "Right Alt key changes layout." -msgstr "Tombol Alt kanan mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:65 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:54 -msgid "Right Ctrl key changes group." -msgstr "Tombol Ctrl kanan mengubah kelompok." - -#: ../gkb-new/xmodmap/base.xml.in.h:66 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:55 -msgid "Right Shift key changes group." -msgstr "Tombol Shift kanan mengubah kelompok." - -#: ../gkb-new/xmodmap/base.xml.in.h:67 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:56 -msgid "Right Win-key changes layout." -msgstr "Tombol Win kanan mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:68 -msgid "Russian Cyrillic" -msgstr "Cyrillic Rusia" - -#: ../gkb-new/xmodmap/base.xml.in.h:69 -msgid "Russian keymap" -msgstr "Susunan Rusia" - -#: ../gkb-new/xmodmap/base.xml.in.h:70 -msgid "Serbian keymap" -msgstr "Susunan Serbia" - -#: ../gkb-new/xmodmap/base.xml.in.h:71 -#: ../gkb-new/xmodmap.sun/base.xml.in.h:60 -msgid "Shift+CapsLock changes layout." -msgstr "Shift+CapsLock mengubah tata letak." - -#: ../gkb-new/xmodmap/base.xml.in.h:72 -msgid "Slovak keymap" -msgstr "Susunan Sloakia" - -#: ../gkb-new/xmodmap/base.xml.in.h:73 -msgid "Slovenian" -msgstr "Bahasa Slovenia" - -#: ../gkb-new/xmodmap/base.xml.in.h:74 -msgid "Slovenian keymap" -msgstr "Susunan Slovenia" - -#: ../gkb-new/xmodmap/base.xml.in.h:75 -msgid "Spanish keymap" -msgstr "Susunan Spanyol" - -#: ../gkb-new/xmodmap/base.xml.in.h:76 -msgid "Sun (!not PC!) type5 Hungarian latin 2" -msgstr "Sun (bukan PC) tipe 5 latin 2 Hungaria" - -#: ../gkb-new/xmodmap/base.xml.in.h:77 -msgid "Swedish" -msgstr "Bahasa Swedia" - -#: ../gkb-new/xmodmap/base.xml.in.h:78 -msgid "Swedish keymap" -msgstr "Susunan Swedia" - -#: ../gkb-new/xmodmap/base.xml.in.h:79 -msgid "Swiss keymap" -msgstr "Susunan Swiss" - -#: ../gkb-new/xmodmap/base.xml.in.h:80 -msgid "Thai" -msgstr "Thailand" - -#: ../gkb-new/xmodmap/base.xml.in.h:81 -msgid "Thai Kedmanee" -msgstr "Thailand Kedmani" - -#: ../gkb-new/xmodmap/base.xml.in.h:82 -msgid "Thai keymap" -msgstr "Susunan Thailand" - -#: ../gkb-new/xmodmap/base.xml.in.h:83 -msgid "Turkish \"F\" keyboard" -msgstr "Keybord \"F\" Turki" - -#: ../gkb-new/xmodmap/base.xml.in.h:84 -msgid "Turkish \"Q\" keyboard" -msgstr "Keyboard \"Q\" Turki" - -#: ../gkb-new/xmodmap/base.xml.in.h:85 -msgid "Turkish keymap" -msgstr "Susunan Turki" - -#: ../gkb-new/xmodmap/base.xml.in.h:86 -msgid "UK 105-key" -msgstr "UK 105 tombol" - -#: ../gkb-new/xmodmap/base.xml.in.h:87 -msgid "UK PC/AT keyboard" -msgstr "Papan Ketik PC/AT UK" - -#: ../gkb-new/xmodmap/base.xml.in.h:88 -msgid "US 101-key keyboard" -msgstr "Papan ketik US 101 tombol" - -#: ../gkb-new/xmodmap/base.xml.in.h:89 -msgid "US 105-key keyboard (with windows keys)" -msgstr "Papan ketik US 105 tombol (dengan tombol windows)" - -#: ../gkb-new/xmodmap/base.xml.in.h:90 -msgid "US 84-key" -msgstr "US 84 tombol" - -#: ../gkb-new/xmodmap/base.xml.in.h:91 -msgid "US DEC 450" -msgstr "US DEC 450" - -#: ../gkb-new/xmodmap/base.xml.in.h:92 -msgid "US IBM RS/6000" -msgstr "US IBM RS/6000" - -#: ../gkb-new/xmodmap/base.xml.in.h:93 -msgid "US International" -msgstr "Internasional US" - -#: ../gkb-new/xmodmap/base.xml.in.h:94 -msgid "US Macintosh" -msgstr "Macintosh US" - -#: ../gkb-new/xmodmap/base.xml.in.h:95 -msgid "US PC/AT 101 keyboard" -msgstr "Papan ketik PC/AT 101 US" - -#: ../gkb-new/xmodmap/base.xml.in.h:96 -msgid "US Silicon Graphics 101-key" -msgstr "Silicon Graphics US 101 tombol" - -#: ../gkb-new/xmodmap/base.xml.in.h:97 -msgid "US Sun type5" -msgstr "Sun US Tipe 5" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:3 -msgid "Armenian Sun keymap" -msgstr "Susunan Sun Armenia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:4 -msgid "Azerbaijani Turkish Sun keymap" -msgstr "Susunan Sun Azerbaijan Turki" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:5 -msgid "Belarusian Sun keymap" -msgstr "Susunan Sun Belarusia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:9 -msgid "Brazil Portuguese Sun USB keymap" -msgstr "Susunan USB Sun Brazil Portugis" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:10 -msgid "Brazil Portuguese Sun keymap" -msgstr "Susunan Sun Brazil Portugis" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:11 -msgid "British Sun Type-4 keymap" -msgstr "Susunan Sun British Tipe 4" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:12 -msgid "British Sun USB keymap" -msgstr "Susunan Sun USB British" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:13 -msgid "British Sun keymap" -msgstr "Susunan Sun British" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:14 -msgid "Bulgarian Sun keymap" -msgstr "Susunan Sun Bulgaria" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:15 -msgid "Canadian Sun keymap" -msgstr "Susunan Sun Kanada" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:18 -msgid "Czech Sun keymap" -msgstr "Susunan Sun Ceko" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:19 -msgid "Danish Sun Type-4 keymap" -msgstr "Susunan Sun Denmark Tipe 4" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:20 -msgid "Danish Sun USB keymap" -msgstr "Susunan Sun USB Denmark" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:21 -msgid "Danish Sun keymap" -msgstr "Susunan Sun Denmark" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:22 -msgid "Dutch Sun keymap" -msgstr "Susunan Sun Belanda" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:23 -msgid "Estonian Sun keymap" -msgstr "Susunan Sun Estonia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:24 -msgid "Finnish Sun keymap" -msgstr "Susunan Sun Finlandia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:25 -msgid "French Sun USB keymap" -msgstr "Susunan USB Sun Prancis" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:26 -msgid "French Sun keymap" -msgstr "Susunan Sun Prancis" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:28 -msgid "German Sun Type-4 keymap" -msgstr "Susunan Sun Jerman Tipe 4" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:29 -msgid "German Sun USB keymap" -msgstr "Susunan USB Sun Jerman" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:30 -msgid "German Sun keymap" -msgstr "Susunan Sun Jerman" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:31 -msgid "Hebrew Sun keymap" -msgstr "Susunan Sun Bahasa Ibrani" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:32 -msgid "Hungarian latin2 Sun keymap" -msgstr "Susunan Latin2 Sun Hungaria" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:33 -msgid "Hungarian type5 latin 1 keymap" -msgstr "Susunan latin1 tipe 5 Hungaria" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:34 -msgid "Icelandic Sun keymap" -msgstr "Susunan Sun Islandia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:35 -msgid "Italian Sun Type-4 keymap" -msgstr "Susunan Sun Tipe4 Italia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:36 -msgid "Italian Sun USB keymap" -msgstr "Susunan USB Sun Italia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:37 -msgid "Italian Sun keymap" -msgstr "Susunan Sun Italia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:38 -msgid "Japanese Sun Type-4 keymap" -msgstr "Susunan Tipe 4 Sun Jepang" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:39 -msgid "Japanese Sun keymap" -msgstr "Susunan Sun Jepang" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:40 -msgid "Latvian Sun keymap" -msgstr "Susunan Sun Latvia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:46 -msgid "Lithuanian Sun keymap" -msgstr "Susunan Sun Lituania" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:47 -msgid "Macedonian Sun keymap" -msgstr "Susunan Sun Makedonia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:49 -msgid "Norwegian Sun keymap" -msgstr "Susunan Sun Norwegia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:50 -msgid "Polish Sun keymap" -msgstr "Susunan Sun Polandia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:51 -msgid "Portuguese Sun Type-4 keymap" -msgstr "Susunan Sun Tipe 4 Portugis" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:52 -msgid "Portuguese Sun keymap" -msgstr "Susunan Sun Portugis" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:57 -msgid "Romanian Sun keymap" -msgstr "Susunan Sun Rumania" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:58 -msgid "Russian Sun keymap" -msgstr "Susunan Sun Rusia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:59 -msgid "Serbian Sun standard keymap" -msgstr "Susunan standar Sun Serbia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:61 -msgid "Slovak Sun keymap" -msgstr "Susunan Sun Sloakia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:62 -msgid "Slovenian Sun keymap" -msgstr "Susunan Sun Slovenia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:63 -msgid "Spanish Sun Type-4 keymap" -msgstr "Susunan Tipe 4 Sun Spanyol" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:64 -msgid "Spanish Sun USB keymap" -msgstr "Susunan USB Sun Spanyol" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:65 -msgid "Spanish Sun keymap" -msgstr "Susunan Sun Spanyol" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:66 -msgid "Swedish Sun Type-4 keymap" -msgstr "Susunan Type 4 Sun Swedia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:67 -msgid "Swedish Sun USB keymap" -msgstr "Susunan USB Sun Swedia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:68 -msgid "Swedish Sun keymap" -msgstr "Susunan Sun Swedia" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:69 -msgid "Swiss German Sun keymap" -msgstr "Susunan Sun Swis Jerman" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:70 -msgid "Thai Sun keymap" -msgstr "Susunan Sun Thailand" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:71 -msgid "Turkish Sun keymap" -msgstr "Susunan Sun Turki" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:72 -msgid "US Sun Type-4 keymap" -msgstr "Keybord Tipe 4 Sun US" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:73 -msgid "US Sun USB keymap" -msgstr "Papan ketik USB Sun US" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:74 -msgid "US Sun type5 keymap" -msgstr "Papan ketik Sun Type 5 US" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:75 -msgid "Ukrainian Sun keymap" -msgstr "Susunan Sun Ukraina" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:76 -msgid "Vietnamese Sun keymap" -msgstr "Susunan Sun Vietnam" - #: ../gweather/gweather-about.c:50 msgid "© 1999-2005 by S. Papadimitriou and others" -msgstr "Hak cipta (c) 1999-2005 oleh S Papadimitriou dan teman-teman." +msgstr "Hak cipta (c) 1999-2005 oleh S Papadimitriou dan teman-teman" #: ../gweather/gweather-about.c:51 msgid "A panel application for monitoring local weather conditions." @@ -1529,18 +887,16 @@ msgid "_Details" msgstr "_Detail" -#: ../gweather/gweather-applet.c:118 -#: ../gweather/gweather-dialog.c:215 +#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:215 msgid "_Update" msgstr "Perbahar_ui" #: ../gweather/gweather-applet.c:329 -#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4 +#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3 msgid "Weather Report" msgstr "Laporan Cuaca" -#: ../gweather/gweather-applet.c:347 -#: ../gweather/gweather-applet.c:351 +#: ../gweather/gweather-applet.c:347 ../gweather/gweather-applet.c:351 msgid "GNOME Weather" msgstr "Informasi Cuaca" @@ -1681,15 +1037,15 @@ msgstr "Masukkan URL" #: ../gweather/gweather-pref.c:315 -msgid "Failed to load the Locations XML database. Please report this as a bug." +msgid "" +"Failed to load the Locations XML database. Please report this as a bug." msgstr "Basis data XML Lokasi tidak dapat dibuka. Laporkan kesalahan ini." #: ../gweather/gweather-pref.c:805 msgid "Weather Preferences" msgstr "Preferensi Cuaca" -#: ../gweather/gweather-pref.c:836 -#: ../gweather/gweather-pref.c:1021 +#: ../gweather/gweather-pref.c:836 ../gweather/gweather-pref.c:1021 msgid "_Automatically update every:" msgstr "Pemb_aharuan otomatis setiap:" @@ -1701,10 +1057,8 @@ msgid "_Temperature unit:" msgstr "Satuan _Temperatur:" -#: ../gweather/gweather-pref.c:858 -#: ../gweather/gweather-pref.c:878 -#: ../gweather/gweather-pref.c:904 -#: ../gweather/gweather-pref.c:932 +#: ../gweather/gweather-pref.c:858 ../gweather/gweather-pref.c:878 +#: ../gweather/gweather-pref.c:904 ../gweather/gweather-pref.c:932 msgid "Default" msgstr "Baku" @@ -1830,7 +1184,7 @@ msgstr "Tampil" #: ../gweather/gweather-pref.c:1072 -#: ../mini-commander/src/mini-commander.ui.h:9 +#: ../mini-commander/src/mini-commander.ui.h:12 msgid "General" msgstr "Umum" @@ -1851,324 +1205,436 @@ msgstr "Lokasi" #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1 -msgid "Factory for creating the weather applet." -msgstr "Pabrikan untuk membuat applet cuaca" - -#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2 msgid "Gweather Applet Factory" msgstr "Pabrik Aplet Gweather" -#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3 +#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2 +msgid "Factory for creating the weather applet." +msgstr "Pabrik untuk membuat applet cuaca." + +#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4 msgid "Monitor the current weather conditions, and forecasts" msgstr "Tampilkan informasi cuaca dan prakiraan ke depan" -#: ../invest-applet/data/Invest_Applet.server.in.in.h:1 +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:1 +#| msgid "Geyes Applet Factory" +msgid "Invest Applet Factory" +msgstr "Pabrik Aplet Investasi" + +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:2 +#| msgid "Factory for creating the weather applet." +msgid "Factory for creating the invest applet." +msgstr "Pabrik untuk membuat applet investasi." + +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:3 #: ../invest-applet/invest/about.py:17 msgid "Invest" msgstr "Invest" -#: ../invest-applet/data/Invest_Applet.server.in.in.h:2 +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:4 #: ../invest-applet/invest/about.py:20 msgid "Track your invested money." msgstr "Melacak investasi uang Anda." -#: ../invest-applet/data/Invest_Applet.xml.h:4 -msgid "_Refresh" -msgstr "Sega_rkan" - #: ../invest-applet/data/financialchart.ui.h:1 -msgid "1 Year" -msgstr "1 Tahun" +#: ../invest-applet/invest/chart.py:112 +msgid "Financial Chart" +msgstr "Bagan Keuangan" #: ../invest-applet/data/financialchart.ui.h:2 -msgid "10" -msgstr "10" +msgid "_Ticker symbol: " +msgstr "Simbol _ticker: " #: ../invest-applet/data/financialchart.ui.h:3 -msgid "100" -msgstr "100" +msgid "Auto _refresh" +msgstr "Sega_rkan Otomatis" #: ../invest-applet/data/financialchart.ui.h:4 -msgid "20" -msgstr "20" +msgid "Today" +msgstr "Hari ini" #: ../invest-applet/data/financialchart.ui.h:5 -msgid "200" -msgstr "200" +msgid "5 Days" +msgstr "5 Hari" #: ../invest-applet/data/financialchart.ui.h:6 msgid "3 Months" msgstr "3 Bulan" #: ../invest-applet/data/financialchart.ui.h:7 -msgid "5" -msgstr "5" - +msgid "6 Months" +msgstr "6 Bulan" + #: ../invest-applet/data/financialchart.ui.h:8 -msgid "5 Days" -msgstr "5 Hari" +msgid "1 Year" +msgstr "1 Tahun" #: ../invest-applet/data/financialchart.ui.h:9 msgid "5 Years" msgstr "5 Tahun" #: ../invest-applet/data/financialchart.ui.h:10 -msgid "50" -msgstr "50" +msgid "Maximum" +msgstr "Maksimal" #: ../invest-applet/data/financialchart.ui.h:11 -msgid "6 Months" -msgstr "6 Bulan" - -#: ../invest-applet/data/financialchart.ui.h:12 -msgid "Auto _refresh" -msgstr "Sega_rkan Otomatis" - -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide13.html and http://en.wikipedia.org/wiki/Bollinger_bands -#: ../invest-applet/data/financialchart.ui.h:14 -msgid "Bollinger" -msgstr "Bollinger" +msgid "_Graph style: " +msgstr "_Gaya grafik: " -#: ../invest-applet/data/financialchart.ui.h:15 -msgid "Downloading chart from Yahoo!" -msgstr "Mengambil bagan dari Yahoo!" +#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average +#: ../invest-applet/data/financialchart.ui.h:13 +msgid "Moving average: " +msgstr "Pergerakan rata-rata: " #. see http://biz.yahoo.com/charts/guide12.html and http://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average -#: ../invest-applet/data/financialchart.ui.h:17 +#: ../invest-applet/data/financialchart.ui.h:15 msgid "Exponential moving average: " msgstr "Pergerakan rata-rata eksponensial: " -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator +#: ../invest-applet/data/financialchart.ui.h:16 +msgid "5" +msgstr "5" + +#: ../invest-applet/data/financialchart.ui.h:17 +msgid "10" +msgstr "10" + +#: ../invest-applet/data/financialchart.ui.h:18 +msgid "20" +msgstr "20" + #: ../invest-applet/data/financialchart.ui.h:19 -msgid "Fast stoch" -msgstr "Stoch cepat" +msgid "50" +msgstr "50" #: ../invest-applet/data/financialchart.ui.h:20 -#: ../invest-applet/invest/chart.py:107 -msgid "Financial Chart" -msgstr "Bagan Keuangan" +msgid "100" +msgstr "100" -#. see http://biz.yahoo.com/charts/guide10.html and http://en.wikipedia.org/wiki/Technical_indicator#Charting_terms_and_indicators -#: ../invest-applet/data/financialchart.ui.h:22 -msgid "Indicators: " -msgstr "Indikator: " +#: ../invest-applet/data/financialchart.ui.h:21 +msgid "200" +msgstr "200" -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/MACD -#: ../invest-applet/data/financialchart.ui.h:24 -msgid "MACD" -msgstr "MACD" +#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays +#: ../invest-applet/data/financialchart.ui.h:23 +msgid "Overlays: " +msgstr "Overlay: " -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Money_flow_index -#: ../invest-applet/data/financialchart.ui.h:26 -msgid "MFI" -msgstr "MFI" +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide13.html and http://en.wikipedia.org/wiki/Bollinger_bands +#: ../invest-applet/data/financialchart.ui.h:25 +msgid "Bollinger" +msgstr "Bollinger" +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide16.html and http://en.wikipedia.org/wiki/Parabolic_SAR #: ../invest-applet/data/financialchart.ui.h:27 -msgid "Maximum" -msgstr "Maksimal" +msgid "SAR" +msgstr "SAR" -#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide6.html and http://en.wikipedia.org/wiki/Stock_split #: ../invest-applet/data/financialchart.ui.h:29 -msgid "Moving average: " -msgstr "Pergerakan rata-rata: " +msgid "Splits" +msgstr "Split" -#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide20.html and http://en.wikipedia.org/wiki/Volume_%28finance%29 #: ../invest-applet/data/financialchart.ui.h:31 -msgid "Overlays: " -msgstr "Overlay: " +msgid "Volumes" +msgstr "Volume" -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Rate_of_change_%28technical_analysis%29 +#. see http://biz.yahoo.com/charts/guide10.html and http://en.wikipedia.org/wiki/Technical_indicator#Charting_terms_and_indicators #: ../invest-applet/data/financialchart.ui.h:33 -msgid "ROC" -msgstr "ROC" +msgid "Indicators: " +msgstr "Indikator: " #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Relative_Strength_Index #: ../invest-applet/data/financialchart.ui.h:35 msgid "RSI" msgstr "RSI" -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide16.html and http://en.wikipedia.org/wiki/Parabolic_SAR +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29 #: ../invest-applet/data/financialchart.ui.h:37 -msgid "SAR" -msgstr "SAR" +msgid "Vol" +msgstr "Vol" -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Money_flow_index #: ../invest-applet/data/financialchart.ui.h:39 -msgid "Slow stoch" -msgstr "Stoch lambat" +msgid "MFI" +msgstr "MFI" -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide6.html and http://en.wikipedia.org/wiki/Stock_split +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator #: ../invest-applet/data/financialchart.ui.h:41 -msgid "Splits" -msgstr "Split" - -#: ../invest-applet/data/financialchart.ui.h:42 -msgid "Today" -msgstr "Hari ini" - -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29 -#: ../invest-applet/data/financialchart.ui.h:44 -msgid "Vol" -msgstr "Vol" +msgid "Slow stoch" +msgstr "Stoch lambat" #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29 -#: ../invest-applet/data/financialchart.ui.h:46 +#: ../invest-applet/data/financialchart.ui.h:43 msgid "Vol+MA" msgstr "Vol+MA" -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide20.html and http://en.wikipedia.org/wiki/Volume_%28finance%29 -#: ../invest-applet/data/financialchart.ui.h:48 -msgid "Volumes" -msgstr "Volume" +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Rate_of_change_%28technical_analysis%29 +#: ../invest-applet/data/financialchart.ui.h:45 +msgid "ROC" +msgstr "ROC" + +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator +#: ../invest-applet/data/financialchart.ui.h:47 +msgid "Fast stoch" +msgstr "Stoch cepat" #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Williams_%25R -#: ../invest-applet/data/financialchart.ui.h:51 +#: ../invest-applet/data/financialchart.ui.h:50 #, no-c-format msgid "W%R" msgstr "W%R" +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/MACD #: ../invest-applet/data/financialchart.ui.h:52 -msgid "_Graph style: " -msgstr "_Gaya grafik: " +msgid "MACD" +msgstr "MACD" #: ../invest-applet/data/financialchart.ui.h:53 +msgid "Line" +msgstr "Garis" + +#: ../invest-applet/data/financialchart.ui.h:54 +msgid "Bar" +msgstr "Batang" + +#: ../invest-applet/data/financialchart.ui.h:55 +msgid "Candle" +msgstr "Lilin" + +#: ../invest-applet/data/financialchart.ui.h:56 +msgid "Scale: " +msgstr "Skala: " + +#: ../invest-applet/data/financialchart.ui.h:57 +msgid "Linear" +msgstr "Linier" + +#: ../invest-applet/data/financialchart.ui.h:58 +msgid "Logarithmic" +msgstr "Logaritmis" + +#: ../invest-applet/data/financialchart.ui.h:59 msgid "_Options" msgstr "_Opsi" -#: ../invest-applet/data/financialchart.ui.h:54 -msgid "_Ticker symbol: " -msgstr "Simbol _ticker: " +#: ../invest-applet/data/financialchart.ui.h:60 +msgid "Downloading chart from Yahoo!" +msgstr "Mengambil bagan dari Yahoo!" #: ../invest-applet/data/prefs-dialog.ui.h:1 +msgid "Invest Preferences" +msgstr "Preferensi Investasi" + +#: ../invest-applet/data/prefs-dialog.ui.h:2 +msgid "label" +msgstr "label" + +#: ../invest-applet/data/prefs-dialog.ui.h:3 +msgid "Stocks" +msgstr "Saham" + +#. Instead of adding a single stock to the list of stocks, the 'Add Group' button adds a group (kind of a sub folder) to which numerous stocks can be added. A group here refers to a group of stocks. +#: ../invest-applet/data/prefs-dialog.ui.h:5 +msgctxt " " +msgid "Add Group" +msgstr "Tambah Grup" + +#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to also show the quotes of the stocks an index is based on. +#: ../invest-applet/data/prefs-dialog.ui.h:7 +msgid "Show stocks of index values" +msgstr "Tampilkan saham dari nilai indeks" + +#: ../invest-applet/data/prefs-dialog.ui.h:8 msgid "" -"Note: Quotes are delayed at least 15 minutes.\n" -"Source: Yahoo!" +"An index value, for instance the NASDAQ Composite (^IXIC), is based " +"on a number of stocks. This option allows to also show the quotes of the " +"stocks an index is based on." msgstr "" -"Catat: Kutipan tertunda paling tidak 15 menit.\n" -"Sumber: Yahoo!" +"Suatu nilai indeks, misalnya Komposit NASDAQ (^IXIC), didasarkan atas " +"sejumlah saham. Opsi ini memungkinkan untuk juga menampilkan kutipan yang " +"mendasari indeks saham." + +#: ../invest-applet/data/prefs-dialog.ui.h:9 +msgid "Hide charts in quotes list" +msgstr "Sembunyikan diagram dalam daftar kutipan" -#: ../invest-applet/data/prefs-dialog.ui.h:3 +#: ../invest-applet/data/prefs-dialog.ui.h:10 +msgid "" +"A small chart image is shown next to each quote. The retrieval of each chart " +"image causes network traffic. Hiding charts reduces the network bandwidth " +"demand significantly." +msgstr "" +"Suatu gambar diagram kecil ditampilkan di sebelah setiap kutipan. " +"Pengambilan gambar setiap diagram menyebabkan lalu lintas jaringan. " +"Menyembunyikan diagram mengurangi kebutuhan lebar pita jaringan secara " +"signifikan." + +#: ../invest-applet/data/prefs-dialog.ui.h:11 +msgid "" +"Source: Yahoo! " +"Finance (at least 15 minutes delayed)" +msgstr "" +"Sumber: Yahoo! " +"Finance (tertunda paling tidak 15 menit)" + +#: ../invest-applet/data/prefs-dialog.ui.h:12 msgid "Currency" msgstr "Mata Uang" -#: ../invest-applet/data/prefs-dialog.ui.h:4 -msgid "Invest Preferences" -msgstr "Preferensi Investasi" - -#: ../invest-applet/data/prefs-dialog.ui.h:5 -msgid "Stocks" -msgstr "Saham" +#: ../invest-applet/data/prefs-dialog.ui.h:13 +msgid "" +"Type the target currency to which all stock quotes will be converted to." +msgstr "" +"Ketikkan mata uang target kemana semua kutipan saham akan dikonversikan." -#: ../invest-applet/data/prefs-dialog.ui.h:6 -msgid "label" -msgstr "label" +#. name, stock_id, label, accellerator, tooltip, callback +#: ../invest-applet/invest/applet.py:24 +#| msgid "_About" +msgid "About" +msgstr "Tentang" + +#: ../invest-applet/invest/applet.py:25 +#| msgid "_Help" +msgid "Help" +msgstr "Bantuan" + +#: ../invest-applet/invest/applet.py:26 +#| msgid "_Preferences" +msgid "Preferences" +msgstr "Preferensi" + +#: ../invest-applet/invest/applet.py:27 +#| msgid "_Refresh" +msgid "Refresh" +msgstr "Segarkan" #. a) We aren't configured yet -#: ../invest-applet/invest/applet.py:50 +#: ../invest-applet/invest/applet.py:60 msgid "You have not entered any stock information yet" msgstr "Anda belum memasukkan informasi saham sama sekali" -#: ../invest-applet/invest/applet.py:55 +#: ../invest-applet/invest/applet.py:65 msgid "No stock quotes are currently available" msgstr "Saat ini tak tersedia kutipan saham (stock quote)" -#: ../invest-applet/invest/applet.py:56 -msgid "The server could not be contacted. The computer is either offline or the servers are down. Try again later." -msgstr "Server tidak dapat dihubungi. Komputer mungkin luring atau server mati. Coba beberapa saat lagi." +#: ../invest-applet/invest/applet.py:66 +msgid "" +"The server could not be contacted. The computer is either offline or the " +"servers are down. Try again later." +msgstr "" +"Server tidak dapat dihubungi. Komputer mungkin luring atau server mati. Coba " +"beberapa saat lagi." -#: ../invest-applet/invest/chart.py:156 +#: ../invest-applet/invest/chart.py:161 #, python-format msgid "Financial Chart - %s" msgstr "Bagan Keuangan - %s" -#: ../invest-applet/invest/chart.py:223 +#: ../invest-applet/invest/chart.py:228 msgid "Opening Chart" msgstr "Membuka Bagan" -#: ../invest-applet/invest/chart.py:238 +#: ../invest-applet/invest/chart.py:243 msgid "Chart downloaded" msgstr "Bagan telah diunduh" -#: ../invest-applet/invest/chart.py:240 +#: ../invest-applet/invest/chart.py:245 msgid "Chart could not be downloaded" msgstr "Bagan tidak dapat diunduh" -#: ../invest-applet/invest/invest-applet.py:41 -msgid "Invest Applet" -msgstr "Aplet Investasi" - -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Symbol" msgstr "Simbol" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Label" msgstr "Label" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Amount" msgstr "Jumlah" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Price" msgstr "Harga" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Commission" msgstr "Komisi" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Currency Rate" msgstr "Tingkat Mata Ulang" -#: ../invest-applet/invest/quotes.py:131 +#: ../invest-applet/invest/preferences.py:244 +msgid "Stock Group" +msgstr "Grup Saham" + +#. translators: Asks the user to confirm deletion of a group of stocks +#: ../invest-applet/invest/preferences.py:269 +#| msgid "Delete this sticky note?" +msgid "Delete entire stock group?" +msgstr "Hapus seluruh grup saham?" + +#. translators: stocks can be grouped together into a "stock group". +#. The user wants to delete a group, but the group still contains stocks. +#. By deleting the group, also all stocks will be removed from configuration +#: ../invest-applet/invest/preferences.py:277 +msgid "" +"This removes all stocks contained in this stock group!\n" +"Do you really want to remove this stock group?" +msgstr "" +"Ini menghapus semua saham yang dimuat dalam grup saham ini!\n" +"Apakah Anda yakin hendak menghapus grup saham ini?" + +#: ../invest-applet/invest/quotes.py:284 msgid "Invest could not connect to Yahoo! Finance" msgstr "Invest tidak dapat menyambung ke Yahoo! Finance" -#. Translators: %s is an hour (%H:%M) -#: ../invest-applet/invest/quotes.py:134 -#: ../invest-applet/invest/quotes.py:163 -#, python-format -msgid "Updated at %s" -msgstr "Diperbaharui pada %s" - #. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s gets replaced with the string value of the change (localized), including the percent sign. -#: ../invest-applet/invest/quotes.py:153 +#: ../invest-applet/invest/quotes.py:327 #, python-format msgid "Average change: %s" msgstr "Rata-rata perubahan: %s" #. Translators: This is share-market jargon. It refers to the total difference between the current price and purchase price for all the shares put together for a particular currency. i.e. How much money would be earned if they were sold right now. The first string is the change value, the second the currency, and the third value is the percentage of the change, formatted using user's locale. -#: ../invest-applet/invest/quotes.py:162 +#: ../invest-applet/invest/quotes.py:336 #, python-format msgid "Positions balance: %s %s (%s)" msgstr "Posisi keseimbangan: %s %s (%s)" +#: ../invest-applet/invest/quotes.py:338 +#, python-format +msgid "Updated at %s" +msgstr "Diperbaharui pada %s" + #. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB #. Translators: these words all refer to a stock. Last is short #. for "last price". Gain is referring to the gain since the #. stock was purchased. -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Ticker" msgstr "Ticker" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Last" msgstr "Terakhir" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Change %" msgstr "Perubahan %" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Chart" msgstr "Bagan" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Gain" msgstr "Kenaika" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Gain %" msgstr "Kenaikan %" @@ -2181,23 +1647,27 @@ msgstr "Deskbar (peningkatan tersamar dari Mini Commander)" #: ../mini-commander/src/about.c:48 -msgid "This GNOME applet adds a command line to the panel. It features command completion, command history, and changeable macros." -msgstr "Aplet GNOME ini memasukkan baris perintah ke panel. Memiliki kelebihan dengan pelengkapan perintah, riwayat perintah dan makro yang dapat dirubah." +msgid "" +"This GNOME applet adds a command line to the panel. It features command " +"completion, command history, and changeable macros." +msgstr "" +"Aplet GNOME ini memasukkan baris perintah ke panel. Memiliki kelebihan " +"dengan pelengkapan perintah, riwayat perintah dan makro yang dapat dirubah." -#: ../mini-commander/src/command_line.c:345 +#: ../mini-commander/src/command_line.c:362 msgid "No items in history" msgstr "Riwayat kosong" #. build file select dialog -#: ../mini-commander/src/command_line.c:469 +#: ../mini-commander/src/command_line.c:488 msgid "Start program" msgstr "Jalankan program" -#: ../mini-commander/src/command_line.c:522 +#: ../mini-commander/src/command_line.c:541 msgid "Command line" msgstr "Baris perintah" -#: ../mini-commander/src/command_line.c:523 +#: ../mini-commander/src/command_line.c:542 msgid "Type a command here and Gnome will execute it for you" msgstr "Tuliskan perintah di sini dan Gnome akan menjalankannya untuk Anda" @@ -2219,7 +1689,9 @@ #: ../mini-commander/src/mc-install-default-macros.c:129 #, c-format msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n" -msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL telah ditetapkan, tidak memasang skema\n" +msgstr "" +"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL telah ditetapkan, tidak memasang " +"skema\n" #: ../mini-commander/src/mc-install-default-macros.c:137 #, c-format @@ -2237,201 +1709,205 @@ msgstr "Gagal mensinkronisasikan data config: %s" #: ../mini-commander/src/mini-commander-global.schemas.in.h:1 -msgid "List of GConfValue entries containing strings for the macro commands." -msgstr "Daftar nilai GConf mengandung string untuk perintah macro." +#: ../mini-commander/src/mini-commander.schemas.in.h:26 +msgid "Macro pattern list" +msgstr "Macro daftar pola" #: ../mini-commander/src/mini-commander-global.schemas.in.h:2 msgid "List of GConfValue entries containing strings for the macro patterns." msgstr "Daftar nilai GConf mengandung string untuk bentuk macro." #: ../mini-commander/src/mini-commander-global.schemas.in.h:3 -#: ../mini-commander/src/mini-commander.schemas.in.h:10 +#: ../mini-commander/src/mini-commander.schemas.in.h:28 msgid "Macro command list" msgstr "Daftar perintah makro" #: ../mini-commander/src/mini-commander-global.schemas.in.h:4 -#: ../mini-commander/src/mini-commander.schemas.in.h:11 -msgid "Macro pattern list" -msgstr "Macro daftar pola" +msgid "List of GConfValue entries containing strings for the macro commands." +msgstr "Daftar nilai GConf mengandung string untuk perintah macro." #: ../mini-commander/src/mini-commander.ui.h:1 -msgid "Add New Macro" -msgstr "Tambah Makro Baru" +msgid "Command Line Preferences" +msgstr "Preferensi Baris Perintah" #: ../mini-commander/src/mini-commander.ui.h:2 msgid "Auto Completion" msgstr "Pelengkapan Otomatis" #: ../mini-commander/src/mini-commander.ui.h:3 -msgid "Co_mmand:" -msgstr "_Perintah:" +msgid "E_nable history-based auto completion" +msgstr "A_ktifkan pelengkapan otomatis berdasarkan riwayat" #: ../mini-commander/src/mini-commander.ui.h:4 -#: ../multiload/properties.c:569 -msgid "Colors" -msgstr "Warna" +msgid "Size" +msgstr "Ukuran" #: ../mini-commander/src/mini-commander.ui.h:5 -msgid "Command Line Preferences" -msgstr "Preferensi Baris Perintah" +#: ../stickynotes/stickynotes.ui.h:19 +msgid "_Width:" +msgstr "_Lebar:" -#: ../mini-commander/src/mini-commander.ui.h:6 -msgid "Command line _background:" -msgstr "Latar _belakang baris perintah:" +#: ../mini-commander/src/mini-commander.ui.h:6 ../multiload/properties.c:524 +msgid "pixels" +msgstr "piksel" -#: ../mini-commander/src/mini-commander.ui.h:7 -msgid "Command line _foreground:" -msgstr "_Latar depan baris perintah:" +#: ../mini-commander/src/mini-commander.ui.h:7 ../multiload/properties.c:569 +msgid "Colors" +msgstr "Warna" #: ../mini-commander/src/mini-commander.ui.h:8 -msgid "E_nable history-based auto completion" -msgstr "A_ktifkan pelengkapan otomatis berdasarkan riwayat" +msgid "_Use default theme colors" +msgstr "G_unakan warna tema standar" + +#: ../mini-commander/src/mini-commander.ui.h:9 +msgid "Command line _foreground:" +msgstr "_Latar depan baris perintah:" #: ../mini-commander/src/mini-commander.ui.h:10 -msgid "Macros" -msgstr "Makro" +msgid "Command line _background:" +msgstr "Latar _belakang baris perintah:" #: ../mini-commander/src/mini-commander.ui.h:11 msgid "Pick a color" msgstr "Pilih warna" -#: ../mini-commander/src/mini-commander.ui.h:12 -msgid "Size" -msgstr "Ukuran" - #: ../mini-commander/src/mini-commander.ui.h:13 +msgid "_Macros:" +msgstr "_Makro:" + +#: ../mini-commander/src/mini-commander.ui.h:14 msgid "_Add Macro..." msgstr "T_ambah Makro..." -#: ../mini-commander/src/mini-commander.ui.h:14 +#: ../mini-commander/src/mini-commander.ui.h:15 msgid "_Delete Macro" msgstr "_Hapus Makro" -#: ../mini-commander/src/mini-commander.ui.h:15 -msgid "_Macros:" -msgstr "_Makro:" - #: ../mini-commander/src/mini-commander.ui.h:16 -msgid "_Pattern:" -msgstr "_Pola:" +msgid "Macros" +msgstr "Makro" #: ../mini-commander/src/mini-commander.ui.h:17 -msgid "_Use default theme colors" -msgstr "G_unakan warna tema standar" +msgid "Add New Macro" +msgstr "Tambah Makro Baru" #: ../mini-commander/src/mini-commander.ui.h:18 -#: ../stickynotes/stickynotes.ui.h:46 -msgid "_Width:" -msgstr "_Lebar:" +msgid "_Pattern:" +msgstr "_Pola:" #: ../mini-commander/src/mini-commander.ui.h:19 -#: ../multiload/properties.c:524 -msgid "pixels" -msgstr "piksel" +msgid "Co_mmand:" +msgstr "_Perintah:" #: ../mini-commander/src/mini-commander.schemas.in.h:1 -msgid "Attempt to autocomplete a command from the history of commands entered." -msgstr "Mencoba untuk melengkapi sebuah perintah secara otomatis dari riwayat perintah yang dimasukkan." +msgid "Show handle" +msgstr "Tampilkan handle" #: ../mini-commander/src/mini-commander.schemas.in.h:2 -msgid "Background color, blue component" -msgstr "Warna latar, komponen biru" +msgid "Show a handle so the applet can be detached from the panel." +msgstr "Tampilkan handle supaya applet dapat dikeluarkan dari panel." #: ../mini-commander/src/mini-commander.schemas.in.h:3 -msgid "Background color, green component" -msgstr "Warna latar, komponen hijau" +msgid "Show frame" +msgstr "Tampilkan bingkai" #: ../mini-commander/src/mini-commander.schemas.in.h:4 -msgid "Background color, red component" -msgstr "Warna latar, komponen merah" +msgid "Show a frame surrounding the applet." +msgstr "Tampilkan sebuah bingkai mengitari applet." #: ../mini-commander/src/mini-commander.schemas.in.h:5 -msgid "Foreground color, blue component" -msgstr "Warna latar depan, komponen biru" +msgid "Perform history autocompletion" +msgstr "Lakukan pelengkapan otomatis dari riwayat" #: ../mini-commander/src/mini-commander.schemas.in.h:6 -msgid "Foreground color, green component" -msgstr "Warna latar depan, komponen hijau" +msgid "Attempt to autocomplete a command from the history of commands entered." +msgstr "" +"Mencoba untuk melengkapi sebuah perintah secara otomatis dari riwayat " +"perintah yang dimasukkan." #: ../mini-commander/src/mini-commander.schemas.in.h:7 -msgid "Foreground color, red component" -msgstr "Warna latar depan, komponen merah" +msgid "Width" +msgstr "Lebar" #: ../mini-commander/src/mini-commander.schemas.in.h:8 -msgid "History list" -msgstr "Daftar riwayat" +msgid "Width of the applet" +msgstr "Lebar aplet" #: ../mini-commander/src/mini-commander.schemas.in.h:9 -msgid "List of GConfValue entries containing strings for history entries." -msgstr "Daftar nilai GConf mengandung string untuk riwayat." - -#: ../mini-commander/src/mini-commander.schemas.in.h:12 msgid "Not used anymore" msgstr "Tidak dipergunakan lagi" +#: ../mini-commander/src/mini-commander.schemas.in.h:10 +msgid "Use the default theme colors" +msgstr "Pergunakan tema warna default" + +#: ../mini-commander/src/mini-commander.schemas.in.h:11 +msgid "Use theme colors instead of custom ones." +msgstr "Pergunakan warna tema daripada yang dipilih." + +#: ../mini-commander/src/mini-commander.schemas.in.h:12 +msgid "Foreground color, red component" +msgstr "Warna latar depan, komponen merah" + #: ../mini-commander/src/mini-commander.schemas.in.h:13 -msgid "Perform history autocompletion" -msgstr "Lakukan pelengkapan otomatis dari riwayat" +msgid "The red component of the foreground color." +msgstr "Komponen Merah dari warna latar depan." #: ../mini-commander/src/mini-commander.schemas.in.h:14 -msgid "Show a frame surrounding the applet." -msgstr "Tampilkan sebuah bingkai mengitari applet." +msgid "Foreground color, green component" +msgstr "Warna latar depan, komponen hijau" #: ../mini-commander/src/mini-commander.schemas.in.h:15 -msgid "Show a handle so the applet can be detached from the panel." -msgstr "Tampilkan handle supaya applet dapat dikeluarkan dari panel." +msgid "The green component of the foreground color." +msgstr "Komponen hijau dari warna latar depan." #: ../mini-commander/src/mini-commander.schemas.in.h:16 -msgid "Show frame" -msgstr "Tampilkan bingkai" +msgid "Foreground color, blue component" +msgstr "Warna latar depan, komponen biru" #: ../mini-commander/src/mini-commander.schemas.in.h:17 -msgid "Show handle" -msgstr "Tampilkan handle" +msgid "The blue component of the foreground color." +msgstr "Komponen biru warna latar depan." #: ../mini-commander/src/mini-commander.schemas.in.h:18 -msgid "The blue component of the background color." -msgstr "Komponen biru warna latar belakang." +msgid "Background color, red component" +msgstr "Warna latar, komponen merah" #: ../mini-commander/src/mini-commander.schemas.in.h:19 -msgid "The blue component of the foreground color." -msgstr "Komponen biru warna latar depan." +msgid "The red component of the background color." +msgstr "Komponen Merah dari warna latar belakang." #: ../mini-commander/src/mini-commander.schemas.in.h:20 -msgid "The green component of the background color." -msgstr "Komponen Hijau dari warna latar belakang." +msgid "Background color, green component" +msgstr "Warna latar, komponen hijau" #: ../mini-commander/src/mini-commander.schemas.in.h:21 -msgid "The green component of the foreground color." -msgstr "Komponen hijau dari warna latar depan." +msgid "The green component of the background color." +msgstr "Komponen Hijau dari warna latar belakang." #: ../mini-commander/src/mini-commander.schemas.in.h:22 -msgid "The red component of the background color." -msgstr "Komponen Merah dari warna latar belakang." +msgid "Background color, blue component" +msgstr "Warna latar, komponen biru" #: ../mini-commander/src/mini-commander.schemas.in.h:23 -msgid "The red component of the foreground color." -msgstr "Komponen Merah dari warna latar depan." +msgid "The blue component of the background color." +msgstr "Komponen biru warna latar belakang." #: ../mini-commander/src/mini-commander.schemas.in.h:24 -msgid "This per-applet key is deprecated in favour of the global key, /schemas/apps/mini-commander-global/macro_patterns." -msgstr "Kunci per-applet telah kuno dibandingkan dengan kunci umum, /schemas/apps/mini-commander-global/macro_patterns." +msgid "History list" +msgstr "Daftar riwayat" #: ../mini-commander/src/mini-commander.schemas.in.h:25 -msgid "Use the default theme colors" -msgstr "Pergunakan tema warna default" - -#: ../mini-commander/src/mini-commander.schemas.in.h:26 -msgid "Use theme colors instead of custom ones." -msgstr "Pergunakan warna tema daripada yang dipilih." +msgid "List of GConfValue entries containing strings for history entries." +msgstr "Daftar nilai GConf mengandung string untuk riwayat." #: ../mini-commander/src/mini-commander.schemas.in.h:27 -msgid "Width" -msgstr "Lebar" - -#: ../mini-commander/src/mini-commander.schemas.in.h:28 -msgid "Width of the applet" -msgstr "Lebar aplet" +msgid "" +"This per-applet key is deprecated in favour of the global key, /schemas/apps/" +"mini-commander-global/macro_patterns." +msgstr "" +"Kunci per-applet telah kuno dibandingkan dengan kunci umum, /schemas/apps/" +"mini-commander-global/macro_patterns." #: ../mini-commander/src/mini-commander_applet.c:242 #: ../mini-commander/src/mini-commander_applet.c:246 @@ -2455,27 +1931,27 @@ msgid "Command line has been disabled by your system administrator" msgstr "Baris perintah telah di-nonaktifkan oleh sistem administrator Anda" -#: ../mini-commander/src/mini-commander_applet.c:361 -#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1 +#: ../mini-commander/src/mini-commander_applet.c:360 +#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2 msgid "Command Line" msgstr "Baris Perintah" -#: ../mini-commander/src/mini-commander_applet.c:407 +#: ../mini-commander/src/mini-commander_applet.c:406 msgid "Mini-Commander applet" msgstr "Aplet Komandan-Mini" -#: ../mini-commander/src/mini-commander_applet.c:408 +#: ../mini-commander/src/mini-commander_applet.c:407 msgid "This applet adds a command line to the panel" msgstr "Aplet ini memasukkan sebuah baris perintah ke panel" -#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2 -msgid "Mini-Commander" -msgstr "Komandan-Mini" - -#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3 +#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1 msgid "MiniCommander Applet Factory" msgstr "Pabrik Aplet KomandanMini" +#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3 +msgid "Mini-Commander" +msgstr "Komandan-Mini" + #: ../mini-commander/src/preferences.c:401 msgid "You must specify a pattern" msgstr "Anda harus memberikan pola" @@ -2492,48 +1968,58 @@ msgid "You may not specify duplicate patterns" msgstr "Anda tidak boleh memberikan pola yang sama lebih dari sekali" -#: ../mini-commander/src/preferences.c:773 +#: ../mini-commander/src/preferences.c:779 msgid "Pattern" msgstr "Pola" -#: ../mini-commander/src/preferences.c:783 +#: ../mini-commander/src/preferences.c:789 msgid "Command" msgstr "Perintah" -#: ../mixer/applet.c:184 +#: ../mixer/applet.c:179 msgid "Volume Applet" msgstr "Aplet Volume" #. tooltip over applet -#: ../mixer/applet.c:200 -#: ../mixer/applet.c:221 -#: ../null_applet/null_applet.c:55 -#: ../null_applet/null_applet.c:57 +#: ../mixer/applet.c:195 ../mixer/applet.c:216 +#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:1 +#: ../null_applet/null_applet.c:55 ../null_applet/null_applet.c:57 msgid "Volume Control" msgstr "Kendali Volume" -#: ../mixer/applet.c:383 +#: ../mixer/applet.c:378 msgid "_Open Volume Control" msgstr "Buka Kendali V_olume" -#: ../mixer/applet.c:397 +#: ../mixer/applet.c:392 msgid "Mu_te" msgstr "_Bisu" -#: ../mixer/applet.c:563 -msgid "The volume control did not find any elements and/or devices to control. This means either that you don't have the right GStreamer plugins installed, or that you don't have a sound card configured." -msgstr "Pengatur volume suara tidak berhasil menemukan elemen dan/atau perangkat mixer. Mungkin Anda tidak memiliki hak akses ke plugin GStreamer yang ada, atau kartu suara Anda belum terkonfigurasi dengan benar." - -#: ../mixer/applet.c:567 -msgid "You can remove the volume control from the panel by right-clicking the speaker icon on the panel and selecting \"Remove From Panel\" from the menu." -msgstr "Anda dapat mencabut pengatur volume dari panel dengan melakukan klik kanan pada gambar pengeras suara pada panel dan pilih \"Hapus dari Panel\" pada menu yang muncul kemudian." +#: ../mixer/applet.c:558 +msgid "" +"The volume control did not find any elements and/or devices to control. This " +"means either that you don't have the right GStreamer plugins installed, or " +"that you don't have a sound card configured." +msgstr "" +"Pengatur volume suara tidak berhasil menemukan elemen dan/atau perangkat " +"mixer. Mungkin Anda tidak memiliki hak akses ke plugin GStreamer yang ada, " +"atau kartu suara Anda belum terkonfigurasi dengan benar." + +#: ../mixer/applet.c:562 +msgid "" +"You can remove the volume control from the panel by right-clicking the " +"speaker icon on the panel and selecting \"Remove From Panel\" from the menu." +msgstr "" +"Anda dapat mencabut pengatur volume dari panel dengan melakukan klik kanan " +"pada gambar pengeras suara pada panel dan pilih \"Hapus dari Panel\" pada " +"menu yang muncul kemudian." -#: ../mixer/applet.c:753 +#: ../mixer/applet.c:745 #, c-format msgid "Failed to start Volume Control: %s" msgstr "Gagal untuk menjalankan Kendali Volume: %s" -#: ../mixer/applet.c:1202 +#: ../mixer/applet.c:1160 #, c-format msgid "%s: muted" msgstr "%s: bisu" @@ -2542,29 +2028,29 @@ #. * to mark as a translation, but anyway. The string is a list of #. * selected tracks, the number is the volume in percent. You #. * most likely want to keep this as-is. -#: ../mixer/applet.c:1208 +#: ../mixer/applet.c:1166 #, c-format msgid "%s: %d%%" msgstr "%s: %d%%" -#: ../mixer/applet.c:1444 +#: ../mixer/applet.c:1402 #, c-format msgid "Failed to display help: %s" msgstr "Gagal membuka bantuan: %s" -#: ../mixer/applet.c:1457 +#: ../mixer/applet.c:1415 msgid "Volume control for your GNOME Panel." msgstr "Kendali volume untuk Panel GNOME Anda." -#: ../mixer/applet.c:1458 +#: ../mixer/applet.c:1416 msgid "Using GStreamer 0.10." msgstr "Menggunakan GStreamer 0.10." -#: ../mixer/dock.c:218 +#: ../mixer/dock.c:219 msgid "Mute" msgstr "Bisu" -#: ../mixer/dock.c:224 +#: ../mixer/dock.c:225 msgid "Volume Control..." msgstr "Kendali Volume..." @@ -2585,12 +2071,16 @@ msgid "Saved volume to restore on startup" msgstr "Simpan volume dan aktifkan saat komputer dinyalakan" +#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:2 +msgid "Adjust the sound volume" +msgstr "Menyetel volume suara" + #. make window look cute #: ../mixer/preferences.c:90 msgid "Volume Control Preferences" msgstr "Preferensi Kendali Volume" -#: ../mixer/preferences.c:103 +#: ../mixer/preferences.c:102 msgid "Select the device and track to control." msgstr "Pilih perangkat dan kanal yang hendak dikendalikan." @@ -2602,13 +2092,12 @@ msgid "_Deactivate" msgstr "_Nonaktifkan" -#: ../modemlights/modem-applet.c:148 -#: ../stickynotes/stickynotes.ui.h:43 +#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:4 msgid "_Properties" msgstr "_Properti" #: ../modemlights/modem-applet.c:184 -#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2 +#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1 msgid "Modem Monitor" msgstr "Monitor Modem" @@ -2626,20 +2115,31 @@ msgstr "Tidak terhubung" #: ../modemlights/modem-applet.c:752 -msgid "To connect to your Internet service provider, you need administrator privileges" -msgstr "Untuk menyambung ke penyedia jasa internet Anda diperlukan hak administrator" +msgid "" +"To connect to your Internet service provider, you need administrator " +"privileges" +msgstr "" +"Untuk menyambung ke penyedia jasa internet Anda diperlukan hak administrator" #: ../modemlights/modem-applet.c:753 -msgid "To disconnect from your Internet service provider, you need administrator privileges" -msgstr "Untuk memutuskan sambungan dari penyedia jasa internet, Anda memerlukan hak administrator" +msgid "" +"To disconnect from your Internet service provider, you need administrator " +"privileges" +msgstr "" +"Untuk memutuskan sambungan dari penyedia jasa internet, Anda memerlukan hak " +"administrator" #: ../modemlights/modem-applet.c:828 msgid "The entered password is invalid" -msgstr "Sandi yang diberikan salah." +msgstr "Sandi yang diberikan salah" #: ../modemlights/modem-applet.c:830 -msgid "Check that you have typed it correctly and that you haven't activated the \"caps lock\" key" -msgstr "Periksa apakah Anda telah mengetikkannya dengan benar dan Anda tidak mengaktifkan tombol \"caps lock\"" +msgid "" +"Check that you have typed it correctly and that you haven't activated the " +"\"caps lock\" key" +msgstr "" +"Periksa apakah Anda telah mengetikkannya dengan benar dan Anda tidak " +"mengaktifkan tombol \"caps lock\"" #: ../modemlights/modem-applet.c:932 msgid "Do you want to connect?" @@ -2662,39 +2162,46 @@ msgstr "Alat pengatur konfigurasi jaringan tidak dapat dibuka" #: ../modemlights/modem-applet.c:997 -msgid "Check that it's installed in the correct path and that it has the correct permissions" -msgstr "Periksa bahwa telah terpasang dengan benar pada tempatnya dan memiliki hak akses yang benar." +msgid "" +"Check that it's installed in the correct path and that it has the correct " +"permissions" +msgstr "" +"Periksa bahwa telah terpasang dengan benar pada tempatnya dan memiliki hak " +"akses yang benar." #: ../modemlights/modem-applet.c:1020 msgid "Applet for activating and monitoring a dial-up network connection." msgstr "Applet untuk mengaktifkan dan memantau sambungan koneksi dial-up." #: ../modemlights/modemlights.ui.h:1 -msgid "Connecting with Internet Service Provider" -msgstr "Menyambung ke Penyedia Layanan Internet" - -#: ../modemlights/modemlights.ui.h:2 msgid "Enter password" msgstr "Masukkan sandi" +#: ../modemlights/modemlights.ui.h:2 +msgid "Root password required" +msgstr "Diperlukan sandi root" + #: ../modemlights/modemlights.ui.h:3 msgid "Password:" msgstr "Sandi:" #: ../modemlights/modemlights.ui.h:4 -msgid "Root password required" -msgstr "Diperlukan sandi root" +msgid "Connecting with Internet Service Provider" +msgstr "Menyambung ke Penyedia Layanan Internet" -#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1 +#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2 msgid "Activate and monitor a dial-up network connection" msgstr "Aktifkan dan pantau sambungan koneksi dial-up" #: ../multiload/main.c:56 -msgid "A system load monitor capable of displaying graphs for CPU, ram, and swap space use, plus network traffic." -msgstr "Memantau beban sistem sekaligus menampilkan grafik penggunaan CPU, RAM, swap, sekaligus lalu lintas jaringan." +msgid "" +"A system load monitor capable of displaying graphs for CPU, ram, and swap " +"space use, plus network traffic." +msgstr "" +"Memantau beban sistem sekaligus menampilkan grafik penggunaan CPU, RAM, " +"swap, sekaligus lalu lintas jaringan." #: ../multiload/main.c:129 -#| msgid "System Monitor" msgid "Start system-monitor" msgstr "Jalankan system-monitor" @@ -2703,28 +2210,23 @@ msgid "There was an error executing '%s': %s" msgstr "Galat sewaktu mengeksekusi '%s': %s" -#: ../multiload/main.c:278 -#: ../multiload/properties.c:594 +#: ../multiload/main.c:278 ../multiload/properties.c:594 msgid "Processor" msgstr "Prosesor" -#: ../multiload/main.c:280 -#: ../multiload/properties.c:602 +#: ../multiload/main.c:280 ../multiload/properties.c:602 msgid "Memory" msgstr "Memori" -#: ../multiload/main.c:282 -#: ../multiload/properties.c:610 +#: ../multiload/main.c:282 ../multiload/properties.c:610 msgid "Network" msgstr "Jaringan" -#: ../multiload/main.c:284 -#: ../multiload/properties.c:617 +#: ../multiload/main.c:284 ../multiload/properties.c:617 msgid "Swap Space" msgstr "Ruang Swap" -#: ../multiload/main.c:286 -#: ../multiload/main.c:365 +#: ../multiload/main.c:286 ../multiload/main.c:365 msgid "Load Average" msgstr "Beban Rata-rata" @@ -2800,129 +2302,133 @@ msgstr "Buka M_onitor Sistem" #: ../multiload/main.c:490 -#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2 +#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1 msgid "System Monitor" msgstr "Monitor Sistem" #: ../multiload/multiload.schemas.in.h:1 -msgid "Applet refresh rate in milliseconds" -msgstr "Refresh rate applet dalam milidetik" +msgid "Enable CPU load graph" +msgstr "Aktifkan grafik beban CPU" #: ../multiload/multiload.schemas.in.h:2 -msgid "Background color for disk load graph" -msgstr "Warna latar belakang untuk grafik beban diska" +msgid "Enable memory load graph" +msgstr "Aktifkan grafik beban memori" #: ../multiload/multiload.schemas.in.h:3 -msgid "CPU graph background color" -msgstr "Warna latar belakang grafik CPU" +msgid "Enable network load graph" +msgstr "Aktifkan grafik beban jaringan" #: ../multiload/multiload.schemas.in.h:4 -msgid "Enable CPU load graph" -msgstr "Aktifkan grafik beban CPU" +msgid "Enable swap load graph" +msgstr "Aktifkan grafik beban swap" #: ../multiload/multiload.schemas.in.h:5 -msgid "Enable disk load graph" -msgstr "Aktifkan grafik beban diska" - -#: ../multiload/multiload.schemas.in.h:6 msgid "Enable load average graph" msgstr "Aktifkan grafik beban rata-rata" +#: ../multiload/multiload.schemas.in.h:6 +msgid "Enable disk load graph" +msgstr "Aktifkan grafik beban diska" + #: ../multiload/multiload.schemas.in.h:7 -msgid "Enable memory load graph" -msgstr "Aktifkan grafik beban memori" +msgid "Applet refresh rate in milliseconds" +msgstr "Refresh rate applet dalam milidetik" #: ../multiload/multiload.schemas.in.h:8 -msgid "Enable network load graph" -msgstr "Aktifkan grafik beban jaringan" +msgid "Graph size" +msgstr "Ukuran grafik" #: ../multiload/multiload.schemas.in.h:9 -msgid "Enable swap load graph" -msgstr "Aktifkan grafik beban swap" +msgid "" +"For horizontal panels, the width of the graphs in pixels. For vertical " +"panels, this is the height of the graphs." +msgstr "" +"Untuk panel datar, lebar grafik dalam piksel. Untuk panel tegak, ini " +"merupakan tinggi dari grafik." #: ../multiload/multiload.schemas.in.h:10 -msgid "For horizontal panels, the width of the graphs in pixels. For vertical panels, this is the height of the graphs." -msgstr "Untuk panel datar, lebar grafik dalam piksel. Untuk panel tegak, ini merupakan tinggi dari grafik." +msgid "Graph color for user-related CPU activity" +msgstr "Warna grafik aktifitas CPU yang berhubungan dengan pengguna" #: ../multiload/multiload.schemas.in.h:11 -msgid "Graph color for buffer memory" -msgstr "Warna grafik untuk memory buffer" +msgid "Graph color for system-related CPU activity" +msgstr "Warna grafik untuk aktifitas CPU yang berhubungan dengan system" #: ../multiload/multiload.schemas.in.h:12 -msgid "Graph color for cached memory" -msgstr "Warna grafik untuk memory yang dicachekan" +msgid "Graph color for nice-related CPU activity" +msgstr "Warna grafik untuk aktifitas CPU yang berhubungan dengan nice" #: ../multiload/multiload.schemas.in.h:13 -msgid "Graph color for disk read" -msgstr "Warna grafik untuk pembacaan diska" +msgid "Graph color for iowait related CPU activity" +msgstr "Warna grafik untuk iowait yang berhubungan dengan CPU" #: ../multiload/multiload.schemas.in.h:14 -msgid "Graph color for disk write" -msgstr "Warna grafik untuk penulisan diska" +msgid "CPU graph background color" +msgstr "Warna latar belakang grafik CPU" #: ../multiload/multiload.schemas.in.h:15 -msgid "Graph color for input network activity" -msgstr "Warna grafik untuk kegiatan jaringan arah masuk" +msgid "Graph color for user-related memory usage" +msgstr "Warna grafik penggunaan memori yang berhubungan dengan pengguna" #: ../multiload/multiload.schemas.in.h:16 -msgid "Graph color for iowait related CPU activity" -msgstr "Warna grafik untuk iowait yang berhubungan dengan CPU" +msgid "Graph color for shared memory" +msgstr "Warna grafik untuk memory bersama" #: ../multiload/multiload.schemas.in.h:17 -msgid "Graph color for load average" -msgstr "Warna grafik untuk beban rata-rata" +msgid "Graph color for buffer memory" +msgstr "Warna grafik untuk memory buffer" #: ../multiload/multiload.schemas.in.h:18 -msgid "Graph color for loopback network usage" -msgstr "Warna grafik untuk penggunaan jaringan loopback" +msgid "Graph color for cached memory" +msgstr "Warna grafik untuk memory yang dicachekan" #: ../multiload/multiload.schemas.in.h:19 -msgid "Graph color for nice-related CPU activity" -msgstr "Warna grafik untuk aktifitas CPU yang berhubungan dengan nice" +msgid "Memory graph background color" +msgstr "Warna latar belakang grafik memory" #: ../multiload/multiload.schemas.in.h:20 -msgid "Graph color for output network activity" -msgstr "Warna grafik untuk kegiatan jaringan arah keluar" +msgid "Graph color for input network activity" +msgstr "Warna grafik untuk kegiatan jaringan arah masuk" #: ../multiload/multiload.schemas.in.h:21 -msgid "Graph color for shared memory" -msgstr "Warna grafik untuk memory bersama" +msgid "Graph color for output network activity" +msgstr "Warna grafik untuk kegiatan jaringan arah keluar" #: ../multiload/multiload.schemas.in.h:22 -msgid "Graph color for system-related CPU activity" -msgstr "Warna grafik untuk aktifitas CPU yang berhubungan dengan system" +msgid "Graph color for loopback network usage" +msgstr "Warna grafik untuk penggunaan jaringan loopback" #: ../multiload/multiload.schemas.in.h:23 -msgid "Graph color for user-related CPU activity" -msgstr "Warna grafik aktifitas CPU yang berhubungan dengan pengguna" +msgid "Network graph background color" +msgstr "Warna latar belakang grafik jaringan" #: ../multiload/multiload.schemas.in.h:24 -msgid "Graph color for user-related memory usage" -msgstr "Warna grafik penggunaan memori yang berhubungan dengan pengguna" - -#: ../multiload/multiload.schemas.in.h:25 msgid "Graph color for user-related swap usage" msgstr "Warna grafik penggunaan swap yang berhubungan dengan pengguna" +#: ../multiload/multiload.schemas.in.h:25 +msgid "Swap graph background color" +msgstr "Warna latar belakang grafik swap" + #: ../multiload/multiload.schemas.in.h:26 -msgid "Graph size" -msgstr "Ukuran grafik" +msgid "Graph color for load average" +msgstr "Warna grafik untuk beban rata-rata" #: ../multiload/multiload.schemas.in.h:27 msgid "Load graph background color" msgstr "Warna latar belakang grafik beban" #: ../multiload/multiload.schemas.in.h:28 -msgid "Memory graph background color" -msgstr "Warna latar belakang grafik memory" +msgid "Graph color for disk read" +msgstr "Warna grafik untuk pembacaan diska" #: ../multiload/multiload.schemas.in.h:29 -msgid "Network graph background color" -msgstr "Warna latar belakang grafik jaringan" +msgid "Graph color for disk write" +msgstr "Warna grafik untuk penulisan diska" #: ../multiload/multiload.schemas.in.h:30 -msgid "Swap graph background color" -msgstr "Warna latar belakang grafik swap" +msgid "Background color for disk load graph" +msgstr "Warna latar belakang untuk grafik beban diska" #: ../multiload/multiload.schemas.in.h:31 msgid "The desktop description file to execute as the system monitor" @@ -2933,7 +2439,7 @@ msgid "%s/s" msgstr "%s/s" -#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1 +#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2 msgid "A system load indicator" msgstr "Indikator beban sistem" @@ -2975,7 +2481,7 @@ #: ../multiload/properties.c:493 msgid "System m_onitor height: " -msgstr "Tinggi m_onitor sistem:" +msgstr "Tinggi m_onitor sistem: " #: ../multiload/properties.c:532 msgid "Sys_tem monitor update interval: " @@ -2985,8 +2491,7 @@ msgid "milliseconds" msgstr "milidetik" -#: ../multiload/properties.c:596 -#: ../multiload/properties.c:604 +#: ../multiload/properties.c:596 ../multiload/properties.c:604 msgid "_User" msgstr "Pengg_una" @@ -3034,8 +2539,7 @@ msgid "_Local" msgstr "_Lokal" -#: ../multiload/properties.c:615 -#: ../multiload/properties.c:625 +#: ../multiload/properties.c:615 ../multiload/properties.c:625 #: ../multiload/properties.c:631 msgid "_Background" msgstr "Latar _Belakang" @@ -3072,54 +2576,6 @@ msgid "System Monitor Preferences" msgstr "Preferensi Monitor Sistem" -#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:1 -msgid "CD Player (Deprecated)" -msgstr "Pemutar CD (Deprekasi)" - -#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:2 -msgid "Panel applet for playing audio CDs" -msgstr "Applet panel untuk memutar CD audio" - -#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:1 -msgid "Alert you when new mail arrives" -msgstr "Beritahu Anda ketika ada surat baru yang sampai" - -#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:2 -msgid "Inbox Monitor (Deprecated)" -msgstr "Monitor Kotak Masuk (Deprekasi)" - -#: ../null_applet/GNOME_MixerApplet.server.in.h:1 -msgid "Adjust the sound volume" -msgstr "Menyetel volume suara" - -#: ../null_applet/GNOME_MixerApplet.server.in.h:2 -msgid "Volume Control (Deprecated)" -msgstr "Kendali Volume (Deprekasi)" - -#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:1 -msgid "Factory for deprecating applets" -msgstr "Pabrikan untuk applet yang telah ditinggalkan" - -#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:2 -msgid "Null Applet Factory" -msgstr "Pabrik Aplet Null" - -#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:1 -msgid "Monitor the quality of a wireless network link" -msgstr "Pantau daya pancar sambungan jaringan nirkabel" - -#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:2 -msgid "Wireless Link Monitor" -msgstr "Monitor Sambungan Nirkabel" - -#: ../null_applet/GNOME_KeyboardApplet.server.in.h:1 -msgid "Keyboard Indicator (Deprecated)" -msgstr "Indikator Papan Ketik (Deprekasi)" - -#: ../null_applet/GNOME_KeyboardApplet.server.in.h:2 -msgid "Keyboard layout indicator" -msgstr "Indikator tata letak papan ketik" - #: ../null_applet/null_applet.c:51 msgid "Inbox Monitor" msgstr "Monitor Kotak Masuk" @@ -3137,8 +2593,12 @@ msgstr "Ada objek panel yang tidak lagi aktif" #: ../null_applet/null_applet.c:158 -msgid "One or more panel items (also referred to as applets) are no longer available in the GNOME desktop." -msgstr "Satu atau lebih benda pada panel (yang juga dikenal sebagai applets) tidak lagi tersedia pada dekstop GNOME." +msgid "" +"One or more panel items (also referred to as applets) are no longer " +"available in the GNOME desktop." +msgstr "" +"Satu atau lebih benda pada panel (yang juga dikenal sebagai applets) tidak " +"lagi tersedia pada dekstop GNOME." #: ../null_applet/null_applet.c:160 msgid "These items will now be removed from your configuration:" @@ -3157,8 +2617,8 @@ msgstr "Tomboy (upgrade langsung dari stickynotes)" #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1 -msgid "Create, view, and manage sticky notes on the desktop" -msgstr "Buat dan atur kertas catatan pada dekstop Anda" +msgid "Sticky Notes Applet Factory" +msgstr "Pabrik Aplet Catatan Tempel" #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2 #: ../stickynotes/stickynotes_applet.c:146 @@ -3167,297 +2627,335 @@ msgstr "Catatan Tempel" #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3 -msgid "Sticky Notes Applet Factory" -msgstr "Pabrik Aplet Catatan Tempel" +msgid "Create, view, and manage sticky notes on the desktop" +msgstr "Buat dan atur kertas catatan pada dekstop Anda" -#: ../stickynotes/stickynotes.c:632 +#: ../stickynotes/stickynotes.c:630 msgid "This note is locked." msgstr "Catatan ini dikunci." -#: ../stickynotes/stickynotes.c:636 +#: ../stickynotes/stickynotes.c:634 msgid "This note is unlocked." msgstr "Catatan ini tidak dikunci." -#: ../stickynotes/stickynotes.ui.h:1 -msgid "Behavior" -msgstr "Perilaku" +#: ../stickynotes/stickynotes.ui.h:1 ../stickynotes/stickynotes_applet.c:33 +msgid "_New Note" +msgstr "Catata_n Baru" #: ../stickynotes/stickynotes.ui.h:2 -msgid "Choose a base color to use for all sticky notes" -msgstr "Pilih warna dasar yang digunakan untuk seluruh catatan." +msgid "_Delete Note..." +msgstr "_Hapus Catatan..." #: ../stickynotes/stickynotes.ui.h:3 -msgid "Choose a color for the note" -msgstr "Pilih warna kertas catatan" - -#: ../stickynotes/stickynotes.ui.h:4 -msgid "Choose a font for the note" -msgstr "Pilih fonta catatan" +msgid "_Lock Note" +msgstr "Kunci _Catatan" #: ../stickynotes/stickynotes.ui.h:5 -msgid "Choose a font to use for all sticky notes" -msgstr "Pilih fonta dipergunakan pada catatan" +msgid "Sticky Notes Preferences" +msgstr "Preferensi Catatan Tempel" #: ../stickynotes/stickynotes.ui.h:6 -msgid "Choose if notes are visible on all workspaces" -msgstr "Pilih jika catatan terlihat pada seluruh area kerja" +msgid "Default Note Properties" +msgstr "Properti Catatan Baku" #: ../stickynotes/stickynotes.ui.h:7 -msgid "Choose if the default style is forced on all notes" -msgstr "Pilih jika seluruh catatan menggunakan konfigurasi standar" +msgid "Choose a font to use for all sticky notes" +msgstr "Pilih fonta dipergunakan pada catatan" #: ../stickynotes/stickynotes.ui.h:8 -msgid "Choose whether to hide all notes when selecting on the desktop" -msgstr "Memilih untuk menyembunyikan atau tidak semua catatan ketika memilih desktop" +msgid "Pick a default sticky note font" +msgstr "Pilih fonta standar catatan" #: ../stickynotes/stickynotes.ui.h:9 -msgid "Close note" -msgstr "Tutup catatan" +msgid "_Font:" +msgstr "_Fonta:" #: ../stickynotes/stickynotes.ui.h:10 -msgid "Default Note Properties" -msgstr "Properti Catatan Baku" +msgid "Use fo_nt from the system theme" +msgstr "Ambil fo_nta dari tema sistem" #: ../stickynotes/stickynotes.ui.h:11 -msgid "Delete all sticky notes?" -msgstr "Hapus semua catatan lengket?" +msgid "Note C_olor:" +msgstr "W_arna Catatan:" #: ../stickynotes/stickynotes.ui.h:12 -msgid "Delete this sticky note?" -msgstr "Hapus catatan lengket ini?" +msgid "Font Co_lor:" +msgstr "_Warna Fonta:" #: ../stickynotes/stickynotes.ui.h:13 -msgid "Font C_olor:" -msgstr "Warna F_onta:" +msgid "Choose a base color to use for all sticky notes" +msgstr "Pilih warna dasar yang digunakan untuk seluruh catatan" #: ../stickynotes/stickynotes.ui.h:14 -msgid "Font Co_lor:" -msgstr "_Warna Fonta:" +msgid "Pick a default sticky note color" +msgstr "Pilih warna standar kertas catatan" #: ../stickynotes/stickynotes.ui.h:15 -msgid "Force _default color and font on notes" -msgstr "Gunakan warna dan fonta standar pada setiap catatan" +msgid "Use co_lor from the system theme" +msgstr "Ambil wa_rna dari tema sistem" #: ../stickynotes/stickynotes.ui.h:16 -msgid "H_eight:" -msgstr "_Tinggi:" +msgid "Specify the default height (in pixels) of new notes" +msgstr "Tentukan tinggi kertas catatan (dalam piksel)" #: ../stickynotes/stickynotes.ui.h:17 -msgid "Hide notes when the des_ktop is clicked on" -msgstr "Sembunyikan catatan saat des_ktop diklik" +msgid "Specify the default width (in pixels) of new notes" +msgstr "Tentukan lebar kertas catatan (dalam piksel)" #: ../stickynotes/stickynotes.ui.h:18 -msgid "Lock/Unlock note" -msgstr "Kunci/Buka catatan" - -#: ../stickynotes/stickynotes.ui.h:19 -msgid "Note C_olor:" -msgstr "W_arna Catatan:" +msgid "H_eight:" +msgstr "_Tinggi:" #: ../stickynotes/stickynotes.ui.h:20 -msgid "Note _Color:" -msgstr "Warna _Catatan:" +msgid "Behavior" +msgstr "Perilaku" #: ../stickynotes/stickynotes.ui.h:21 -msgid "Pick a color for the sticky note" -msgstr "Pilih warna untuk kertas catatan" +msgid "Hide notes when the des_ktop is clicked on" +msgstr "Sembunyikan catatan saat des_ktop diklik" #: ../stickynotes/stickynotes.ui.h:22 -msgid "Pick a default sticky note color" -msgstr "Pilih warna standar kertas catatan" +msgid "Choose whether to hide all notes when selecting on the desktop" +msgstr "" +"Memilih untuk menyembunyikan atau tidak semua catatan ketika memilih desktop" #: ../stickynotes/stickynotes.ui.h:23 -msgid "Pick a default sticky note font" -msgstr "Pilih fonta standar catatan" +msgid "Force _default color and font on notes" +msgstr "Gunakan warna dan fonta standar pada setiap catatan" #: ../stickynotes/stickynotes.ui.h:24 -msgid "Pick a font for the sticky note" -msgstr "Pilih fonta catatan" +msgid "Choose if the default style is forced on all notes" +msgstr "Pilih jika seluruh catatan menggunakan konfigurasi standar" #: ../stickynotes/stickynotes.ui.h:25 -msgid "Properties" -msgstr "Properti" +msgid "_Put notes on all workspaces" +msgstr "_Letakkan catatan pada seluruh ruang kerja" #: ../stickynotes/stickynotes.ui.h:26 -msgid "Resize note" -msgstr "Ubah ukuran kertas catatan" +msgid "Choose if notes are visible on all workspaces" +msgstr "Pilih jika catatan terlihat pada seluruh area kerja" #: ../stickynotes/stickynotes.ui.h:27 -msgid "Specify a title for the note" -msgstr "Tentukan judul catatan" +msgid "Delete this sticky note?" +msgstr "Hapus catatan lengket ini?" #: ../stickynotes/stickynotes.ui.h:28 -msgid "Specify the default height (in pixels) of new notes" -msgstr "Tentukan tinggi kertas catatan (dalam piksel)" +msgid "This cannot be undone." +msgstr "Ini tidak dapat dibatalkan." #: ../stickynotes/stickynotes.ui.h:29 -msgid "Specify the default width (in pixels) of new notes" -msgstr "Tentukan lebar kertas catatan (dalam piksel)" +msgid "Delete all sticky notes?" +msgstr "Hapus semua catatan lengket?" #: ../stickynotes/stickynotes.ui.h:30 -msgid "Sticky Note" -msgstr "Catatan Tempel" +msgid "_Delete All" +msgstr "_Hapus Semua" #: ../stickynotes/stickynotes.ui.h:31 -msgid "Sticky Note Properties" -msgstr "Properti Catatan Tempel" +msgid "Sticky Note" +msgstr "Catatan Tempel" #: ../stickynotes/stickynotes.ui.h:32 -msgid "Sticky Notes Preferences" -msgstr "Preferensi Catatan Tempel" +msgid "Lock/Unlock note" +msgstr "Kunci/Buka catatan" #: ../stickynotes/stickynotes.ui.h:33 -msgid "This cannot be undone." -msgstr "Ini tidak dapat dibatalkan." +msgid "Close note" +msgstr "Tutup catatan" #: ../stickynotes/stickynotes.ui.h:34 -msgid "Use co_lor from the system theme" -msgstr "Ambil wa_rna dari tema sistem" +msgid "Resize note" +msgstr "Ubah ukuran kertas catatan" #: ../stickynotes/stickynotes.ui.h:35 -msgid "Use default co_lor" -msgstr "Gunakan wa_rna standar" +msgid "Sticky Note Properties" +msgstr "Properti Catatan Tempel" #: ../stickynotes/stickynotes.ui.h:36 -msgid "Use default fo_nt" -msgstr "Pergunakan fo_nta standar" +msgid "Properties" +msgstr "Properti" #: ../stickynotes/stickynotes.ui.h:37 -msgid "Use fo_nt from the system theme" -msgstr "Ambil fo_nta dari tema sistem" +msgid "Choose a font for the note" +msgstr "Pilih fonta catatan" #: ../stickynotes/stickynotes.ui.h:38 -msgid "_Delete All" -msgstr "_Hapus Semua" +msgid "Pick a font for the sticky note" +msgstr "Pilih fonta catatan" #: ../stickynotes/stickynotes.ui.h:39 -msgid "_Delete Note..." -msgstr "_Hapus Catatan..." +msgid "Use default fo_nt" +msgstr "Pergunakan fo_nta standar" #: ../stickynotes/stickynotes.ui.h:40 -msgid "_Font:" -msgstr "_Fonta:" +msgid "Choose a color for the note" +msgstr "Pilih warna kertas catatan" #: ../stickynotes/stickynotes.ui.h:41 -msgid "_Lock Note" -msgstr "Kunci _Catatan" +msgid "Pick a color for the sticky note" +msgstr "Pilih warna untuk kertas catatan" #: ../stickynotes/stickynotes.ui.h:42 -#: ../stickynotes/stickynotes_applet.c:33 -msgid "_New Note" -msgstr "Catata_n Baru" +msgid "Note _Color:" +msgstr "Warna _Catatan:" + +#: ../stickynotes/stickynotes.ui.h:43 +msgid "Font C_olor:" +msgstr "Warna F_onta:" #: ../stickynotes/stickynotes.ui.h:44 -msgid "_Put notes on all workspaces" -msgstr "_Letakkan catatan pada seluruh ruang kerja" +msgid "Use default co_lor" +msgstr "Gunakan wa_rna standar" #: ../stickynotes/stickynotes.ui.h:45 +msgid "Specify a title for the note" +msgstr "Tentukan judul catatan" + +#: ../stickynotes/stickynotes.ui.h:46 msgid "_Title:" msgstr "_Judul:" #: ../stickynotes/stickynotes.schemas.in.h:1 -msgid "By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid." -msgstr "Secara default, catatan tempel menggunakan tanggal saat ini sebagai judulnya. Format ini menggunakan format yang sama dengan format yang digunakan strftime()." +msgid "Default width for new notes" +msgstr "Lebar standar kertas catatan" #: ../stickynotes/stickynotes.schemas.in.h:2 -msgid "Date format of note's title" -msgstr "Format tanggal judul catatan" +msgid "Default width for new sticky notes in pixels." +msgstr "Lebar baku kertas catatan baru dalam piksel." #: ../stickynotes/stickynotes.schemas.in.h:3 -msgid "Default color for font" -msgstr "Warna standar fonta" +msgid "Default height for new notes" +msgstr "Tinggi standar catatan" #: ../stickynotes/stickynotes.schemas.in.h:4 -msgid "Default color for new notes" -msgstr "Warna standar untuk catatan baru" +msgid "Default height for new sticky notes in pixels." +msgstr "Tinggi standar catatan baru dalam piksel." #: ../stickynotes/stickynotes.schemas.in.h:5 -msgid "Default color for new sticky notes. This should be in html hex specification, for example \"#30FF50\"." -msgstr "Warna standar untuk kertas catatan yang baru. Gunakan format hex html, contoh \"#30FF50\"." +msgid "Default color for new notes" +msgstr "Warna standar untuk catatan baru" #: ../stickynotes/stickynotes.schemas.in.h:6 -msgid "Default font color for new sticky notes. This should be in html hex specification, for example \"#000000\"." -msgstr "Warna standar kertas catatan. Harus dalam bentuk spesifikasi heksadesimal html, contoh \"#000000\"." +msgid "" +"Default color for new sticky notes. This should be in html hex " +"specification, for example \"#30FF50\"." +msgstr "" +"Warna standar untuk kertas catatan yang baru. Gunakan format hex html, " +"contoh \"#30FF50\"." #: ../stickynotes/stickynotes.schemas.in.h:7 -msgid "Default font for new notes" -msgstr "Fonta standar catatan" +msgid "Default color for font" +msgstr "Warna standar fonta" #: ../stickynotes/stickynotes.schemas.in.h:8 -msgid "Default font for new sticky notes. This should be a Pango Font Name, for example \"Sans Italic 10\"." -msgstr "Fonta baku untuk catatan lengket. Harus merupakan sebuah nama Fonta Pango, sebagai contoh \"Sans Italic 10\"." +msgid "" +"Default font color for new sticky notes. This should be in html hex " +"specification, for example \"#000000\"." +msgstr "" +"Warna standar kertas catatan. Harus dalam bentuk spesifikasi heksadesimal " +"html, contoh \"#000000\"." #: ../stickynotes/stickynotes.schemas.in.h:9 -msgid "Default height for new notes" -msgstr "Tinggi standar catatan" +msgid "Default font for new notes" +msgstr "Fonta standar catatan" #: ../stickynotes/stickynotes.schemas.in.h:10 -msgid "Default height for new sticky notes in pixels." -msgstr "Tinggi standar dalam piksel catatan" +msgid "" +"Default font for new sticky notes. This should be a Pango Font Name, for " +"example \"Sans Italic 10\"." +msgstr "" +"Fonta baku untuk catatan lengket. Harus merupakan sebuah nama Fonta Pango, " +"sebagai contoh \"Sans Italic 10\"." #: ../stickynotes/stickynotes.schemas.in.h:11 -msgid "Default width for new notes" -msgstr "Lebar standar kertas catatan" +msgid "Sticky notes' workspace stickyness" +msgstr "Ruang kerja tempelan catatan tempel" #: ../stickynotes/stickynotes.schemas.in.h:12 -msgid "Default width for new sticky notes in pixels." -msgstr "Lebar standar kertas catatan dalam piksel" +msgid "" +"Specifies whether the sticky notes are visible on ALL workspaces on the " +"desktop, or not." +msgstr "" +"Tentukan apakah catatan tempel terlihat pada SELURUH ruang kerja pada " +"desktop, atau tidak." #: ../stickynotes/stickynotes.schemas.in.h:13 -msgid "Empty notes are always deleted without confirmation." -msgstr "Catatan kosong akan selalu dihapus tanpa konfirmasi." +msgid "Sticky notes' locked state" +msgstr "Kondisi catatan tempel terkunci" #: ../stickynotes/stickynotes.schemas.in.h:14 -msgid "If this option is disabled, a custom color can be used as the default color for all sticky notes." -msgstr "Jika pilihan ini tidak diaktifkan, warna pilihan dapat dipergunakan sebagai warna default untuk seluruh catatan." +msgid "Specifies whether the sticky notes are locked (non-editable) or not." +msgstr "Tentukan apakah catatan tempel dikunci (tidak bisa diedit) atau tidak." #: ../stickynotes/stickynotes.schemas.in.h:15 -msgid "If this option is disabled, a custom font can be used as the default font for all sticky notes." -msgstr "Jika pilihan ini tidak diaktifkan, Anda dapat memilih sendiri jenis huruf yang Anda sukai." +msgid "Date format of note's title" +msgstr "Format tanggal judul catatan" #: ../stickynotes/stickynotes.schemas.in.h:16 -msgid "If this option is enabled, selecting the desktop in any way will automatically hide all the open notes." -msgstr "Jika opsi ini diaktifkan, memilih desktop dengan cara apa pun secara otomatis menyembunyikan semua catatan yang dibuka." +msgid "" +"By default, sticky notes are given the current date as the title when they " +"are created. This format is used; anything that can be parsed by strftime() " +"is valid." +msgstr "" +"Secara default, catatan tempel menggunakan tanggal saat ini sebagai " +"judulnya. Format ini menggunakan format yang sama dengan format yang " +"digunakan strftime()." #: ../stickynotes/stickynotes.schemas.in.h:17 -msgid "If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored." -msgstr "Jika pilihan ini diaktifkan, warna pilihan dan jenis huruf yang telah ditentukan ke masing-masing catatan akan diabaikan." +msgid "Whether to use the default system color" +msgstr "Apakah menggunakan warna sistem default" #: ../stickynotes/stickynotes.schemas.in.h:18 -msgid "Specifies whether the sticky notes are locked (non-editable) or not." -msgstr "Tentukan apakah catatan tempel dikunci (tidak bisa diedit) atau tidak." +msgid "" +"If this option is disabled, a custom color can be used as the default color " +"for all sticky notes." +msgstr "" +"Jika pilihan ini tidak diaktifkan, warna pilihan dapat dipergunakan sebagai " +"warna default untuk seluruh catatan." #: ../stickynotes/stickynotes.schemas.in.h:19 -msgid "Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not." -msgstr "Tentukan apakah catatan tempel terlihat pada SELURUH ruang kerja pada desktop, atau tidak." +msgid "Whether to use the default system font" +msgstr "Apakah menggunakan jenis huruf default" #: ../stickynotes/stickynotes.schemas.in.h:20 -msgid "Sticky notes' locked state" -msgstr "Kondisi catatan tempel terkunci" +msgid "" +"If this option is disabled, a custom font can be used as the default font " +"for all sticky notes." +msgstr "" +"Jika pilihan ini tidak diaktifkan, Anda dapat memilih sendiri jenis huruf " +"yang Anda sukai." #: ../stickynotes/stickynotes.schemas.in.h:21 -msgid "Sticky notes' workspace stickyness" -msgstr "Ruang kerja tempelan catatan tempel" +msgid "Whether to force the default color and font on all notes" +msgstr "Apakah memaksa warna default dan jenis huruf pada seluruh catatan" #: ../stickynotes/stickynotes.schemas.in.h:22 -msgid "Whether to ask for confirmation when deleting a note" -msgstr "Apakah menanyakan konfirmasi ketika menghapus sebuah catatan" +msgid "" +"If this option is enabled, the custom colors and fonts that have been " +"assigned to individual notes will be ignored." +msgstr "" +"Jika pilihan ini diaktifkan, warna pilihan dan jenis huruf yang telah " +"ditentukan ke masing-masing catatan akan diabaikan." #: ../stickynotes/stickynotes.schemas.in.h:23 -msgid "Whether to force the default color and font on all notes" -msgstr "Apakah memaksa warna default dan jenis huruf pada seluruh catatan" - -#: ../stickynotes/stickynotes.schemas.in.h:24 msgid "Whether to hide all notes when the desktop is selected" msgstr "Menentukan untuk menyembunyikan semua catatan ketika desktop dipilih" +#: ../stickynotes/stickynotes.schemas.in.h:24 +msgid "" +"If this option is enabled, selecting the desktop in any way will " +"automatically hide all the open notes." +msgstr "" +"Jika opsi ini diaktifkan, memilih desktop dengan cara apa pun secara " +"otomatis menyembunyikan semua catatan yang dibuka." + #: ../stickynotes/stickynotes.schemas.in.h:25 -msgid "Whether to use the default system color" -msgstr "Apakah menggunakan warna sistem default" +msgid "Whether to ask for confirmation when deleting a note" +msgstr "Apakah menanyakan konfirmasi ketika menghapus sebuah catatan" #: ../stickynotes/stickynotes.schemas.in.h:26 -msgid "Whether to use the default system font" -msgstr "Apakah menggunakan jenis huruf default" +msgid "Empty notes are always deleted without confirmation." +msgstr "Catatan kosong akan selalu dihapus tanpa konfirmasi." #: ../stickynotes/stickynotes_applet.c:36 msgid "Hi_de Notes" @@ -3486,15 +2984,14 @@ msgstr "Kertas Catatan GNOME" #: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1 -msgid "Go to Trash" -msgstr "Ke Tempat Sampah" - -#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2 msgid "Trash" msgstr "Tempat Sampah" -#: ../trashapplet/src/trashapplet.c:69 -#: ../trashapplet/src/trash-empty.c:343 +#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2 +msgid "Go to Trash" +msgstr "Ke Tempat Sampah" + +#: ../trashapplet/src/trashapplet.c:69 ../trashapplet/src/trash-empty.c:343 msgid "_Empty Trash" msgstr "Kosongkan T_empat Sampah" @@ -3522,8 +3019,12 @@ "%s" #: ../trashapplet/src/trashapplet.c:426 -msgid "A GNOME trash bin that lives in your panel. You can use it to view the trash or drag and drop items into the trash." -msgstr "Tempat sampah GNOME. Anda dapat menggunakannya untuk menampilkan atau memasukkan objek ke tempat sampah." +msgid "" +"A GNOME trash bin that lives in your panel. You can use it to view the trash " +"or drag and drop items into the trash." +msgstr "" +"Tempat sampah GNOME. Anda dapat menggunakannya untuk menampilkan atau " +"memasukkan objek ke tempat sampah." #: ../trashapplet/src/trashapplet.c:451 msgid "Delete Immediately?" @@ -3534,8 +3035,10 @@ msgstr "Tidak dapat memindahkan objek ke tempat sampah, hapus permanen?" #: ../trashapplet/src/trashapplet.c:485 -msgid "Cannot move some items to trash, do you want to delete these immediately?" -msgstr "Tidak dapat memindahkan beberapa objek ke tempat sampah, hapus permanen?" +msgid "" +"Cannot move some items to trash, do you want to delete these immediately?" +msgstr "" +"Tidak dapat memindahkan beberapa objek ke tempat sampah, hapus permanen?" #: ../trashapplet/src/trashapplet.c:615 msgid "Trash Applet" @@ -3558,8 +3061,12 @@ msgstr "Hapus semua isi tempat sampah?" #: ../trashapplet/src/trash-empty.c:329 -msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately." -msgstr "Apabila Anda memilih untuk mengosongkan tempat sampah, maka semua isinya akan dihapus permanen. Tip: Anda juga bisa menghapusnya satu per satu." +msgid "" +"If you choose to empty the trash, all items in it will be permanently lost. " +"Please note that you can also delete them separately." +msgstr "" +"Apabila Anda memilih untuk mengosongkan tempat sampah, maka semua isinya " +"akan dihapus permanen. Tip: Anda juga bisa menghapusnya satu per satu." #: ../trashapplet/trashapplet-empty-progress.ui.h:1 msgid "Emptying the Trash" @@ -3568,6 +3075,3 @@ #: ../trashapplet/trashapplet-empty-progress.ui.h:2 msgid "From:" msgstr "Dari:" - -#~ msgid "Cannot execute '%s'" -#~ msgstr "'%s' tidak dapat dijalankan" diff -Nru gnome-applets-3.5.91/po/lt.po gnome-applets-3.5.92/po/lt.po --- gnome-applets-3.5.91/po/lt.po 2011-05-08 01:04:20.000000000 +0000 +++ gnome-applets-3.5.92/po/lt.po 2012-09-20 01:07:34.000000000 +0000 @@ -8,20 +8,19 @@ msgid "" msgstr "" "Project-Id-Version: gnome-applets.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-30 21:17+0200\n" -"PO-Revision-Date: 2010-09-30 21:57+0200\n" -"Last-Translator: Žygimantas Beručka \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-applets&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-02-19 10:30+0000\n" +"PO-Revision-Date: 2012-09-15 16:16+0300\n" +"Last-Translator: Aurimas Černius \n" "Language-Team: Lithuanian \n" -"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" +"Language: lt\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Virtaal 0.6.1\n" -#: ../accessx-status/applet.c:137 +#: ../accessx-status/applet.c:139 msgid "Shows the state of AccessX features such as latched modifiers" msgstr "Rodo AccessX ypatybių tokių kaip „latched modifiers“ būseną" @@ -29,14 +28,20 @@ #. about.set_documenters([]) #. translators: These appear in the About dialog, usual format applies. #. "documenters", documenters, -#: ../accessx-status/applet.c:142 ../battstat/battstat_applet.c:1256 -#: ../charpick/charpick.c:610 ../cpufreq/src/cpufreq-applet.c:613 -#: ../drivemount/drivemount.c:117 ../geyes/geyes.c:196 -#: ../gweather/gweather-about.c:55 ../invest-applet/invest/about.py:29 -#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1467 -#: ../modemlights/modem-applet.c:1023 ../multiload/main.c:61 -#: ../stickynotes/stickynotes_applet_callbacks.c:425 -#: ../trashapplet/src/trashapplet.c:432 +#: ../accessx-status/applet.c:144 +#: ../battstat/battstat_applet.c:1203 +#: ../charpick/charpick.c:612 +#: ../cpufreq/src/cpufreq-applet.c:611 +#: ../drivemount/drivemount.c:106 +#: ../geyes/geyes.c:153 +#: ../gweather/gweather-about.c:55 +#: ../invest-applet/invest/about.py:29 +#: ../mini-commander/src/about.c:53 +#: ../mixer/applet.c:1424 +#: ../modemlights/modem-applet.c:1023 +#: ../multiload/main.c:61 +#: ../stickynotes/stickynotes_applet_callbacks.c:383 +#: ../trashapplet/src/trashapplet.c:431 msgid "translator-credits" msgstr "" "Paskutinis vertėjas:\n" @@ -46,76 +51,94 @@ "Vaidotas Zemlys \n" "Gediminas Paulauskas " -#: ../accessx-status/applet.c:167 +#: ../accessx-status/applet.c:169 #, c-format msgid "There was an error launching the help viewer: %s" msgstr "Įvyko klaida paleidžiant žinyno žiūryklę: %s" -#: ../accessx-status/applet.c:216 +#: ../accessx-status/applet.c:201 +#| msgid "There was an error launching the keyboard preferences dialog: %s" +msgid "Open the keyboard preferences dialog" +msgstr "Atverti klaviatūros nustatymų dialogą" + +#: ../accessx-status/applet.c:219 #, c-format msgid "There was an error launching the keyboard preferences dialog: %s" msgstr "Įvyko klaida paleidžiant klaviatūros nustatymų dialogą: %s" -#: ../accessx-status/applet.c:233 +#: ../accessx-status/applet.c:238 msgid "_Keyboard Accessibility Preferences" msgstr "_Klaviatūros pritaikymo neįgaliesiems nustatymai" -#: ../accessx-status/applet.c:236 ../battstat/battstat_applet.c:64 -#: ../charpick/charpick.c:717 ../cpufreq/src/cpufreq-applet.c:125 -#: ../drivemount/drivemount.c:153 ../geyes/geyes.c:361 +#: ../accessx-status/applet.c:241 +#: ../battstat/battstat_applet.c:64 +#: ../charpick/charpick.c:719 +#: ../cpufreq/src/cpufreq-applet.c:126 +#: ../drivemount/drivemount.c:144 +#: ../geyes/geyes.c:318 #: ../gweather/gweather-applet.c:124 -#: ../invest-applet/data/Invest_Applet.xml.h:2 -#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:387 -#: ../modemlights/modem-applet.c:151 ../multiload/main.c:439 -#: ../stickynotes/stickynotes_applet.c:45 ../trashapplet/src/trashapplet.c:75 +#: ../mini-commander/src/mini-commander_applet.c:56 +#: ../mixer/applet.c:381 +#: ../modemlights/modem-applet.c:151 +#: ../multiload/main.c:465 +#: ../stickynotes/stickynotes_applet.c:45 +#: ../trashapplet/src/trashapplet.c:75 msgid "_Help" msgstr "_Žinynas" -#: ../accessx-status/applet.c:239 ../battstat/battstat_applet.c:67 -#: ../charpick/charpick.c:720 ../cpufreq/src/cpufreq-applet.c:128 -#: ../drivemount/drivemount.c:156 ../geyes/geyes.c:364 +#: ../accessx-status/applet.c:244 +#: ../battstat/battstat_applet.c:67 +#: ../charpick/charpick.c:722 +#: ../cpufreq/src/cpufreq-applet.c:129 +#: ../drivemount/drivemount.c:147 +#: ../geyes/geyes.c:321 #: ../gweather/gweather-applet.c:127 -#: ../invest-applet/data/Invest_Applet.xml.h:1 -#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:390 -#: ../modemlights/modem-applet.c:154 ../multiload/main.c:442 -#: ../stickynotes/stickynotes_applet.c:48 ../trashapplet/src/trashapplet.c:78 +#: ../mini-commander/src/mini-commander_applet.c:59 +#: ../mixer/applet.c:384 +#: ../modemlights/modem-applet.c:154 +#: ../multiload/main.c:468 +#: ../stickynotes/stickynotes_applet.c:48 +#: ../trashapplet/src/trashapplet.c:78 msgid "_About" msgstr "_Apie" #. Note to translators: the first letter of the alphabet, not the indefinite article -#: ../accessx-status/applet.c:474 ../accessx-status/applet.c:514 +#: ../accessx-status/applet.c:468 +#: ../accessx-status/applet.c:508 msgid "a" msgstr "a" -#: ../accessx-status/applet.c:987 ../accessx-status/applet.c:1061 -#: ../accessx-status/applet.c:1130 ../accessx-status/applet.c:1340 +#: ../accessx-status/applet.c:981 +#: ../accessx-status/applet.c:1055 +#: ../accessx-status/applet.c:1124 +#: ../accessx-status/applet.c:1290 msgid "AccessX Status" msgstr "AccessX būklė" -#: ../accessx-status/applet.c:988 ../accessx-status/applet.c:1131 +#: ../accessx-status/applet.c:982 +#: ../accessx-status/applet.c:1125 msgid "Shows keyboard status when accessibility features are used." -msgstr "" -"Rodo klaviatūros būseną, kai naudojamos pritaikymo neįgaliesiems funkcijos." +msgstr "Rodo klaviatūros būseną, kai naudojamos pritaikymo neįgaliesiems funkcijos." -#: ../accessx-status/applet.c:1023 +#: ../accessx-status/applet.c:1017 msgid "XKB Extension is not enabled" msgstr "XKB plėtinys neįjungtas" -#: ../accessx-status/applet.c:1028 +#: ../accessx-status/applet.c:1022 msgid "Unknown error" msgstr "Nežinoma klaida" -#: ../accessx-status/applet.c:1036 +#: ../accessx-status/applet.c:1030 #, c-format msgid "Error: %s" msgstr "Klaida: %s" -#: ../accessx-status/applet.c:1337 -#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2 +#: ../accessx-status/applet.c:1287 +#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3 msgid "Keyboard Accessibility Status" msgstr "Klaviatūros prieinamumo būklė" -#: ../accessx-status/applet.c:1342 +#: ../accessx-status/applet.c:1292 msgid "Displays current state of keyboard accessibility features" msgstr "Rodo dabartinę klaviatūros pritaikymo neįgaliesiems funkcijų būseną" @@ -123,7 +146,7 @@ msgid "AccessX Status Applet Factory" msgstr "AccessX būklės įtaiso gamykla" -#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3 +#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2 msgid "Keyboard Accessibility Status Applet Factory" msgstr "Klaviatūros pritaikymo neįgaliesiems būsenos įtaiso gamykla" @@ -131,12 +154,15 @@ msgid "Shows the status of keyboard accessibility features" msgstr "Rodo klaviatūros pritaikymo neįgaliesiems funkcijų būseną" -#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:714 -#: ../cpufreq/src/cpufreq-applet.c:122 ../geyes/geyes.c:358 +#: ../battstat/battstat_applet.c:61 +#: ../charpick/charpick.c:716 +#: ../cpufreq/src/cpufreq-applet.c:123 +#: ../geyes/geyes.c:315 #: ../gweather/gweather-applet.c:121 -#: ../invest-applet/data/Invest_Applet.xml.h:3 -#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:393 -#: ../multiload/main.c:433 ../stickynotes/stickynotes_applet.c:42 +#: ../mini-commander/src/mini-commander_applet.c:53 +#: ../mixer/applet.c:387 +#: ../multiload/main.c:459 +#: ../stickynotes/stickynotes_applet.c:42 msgid "_Preferences" msgstr "_Nustatymai" @@ -148,22 +174,22 @@ msgid "System is running on battery power" msgstr "Sistema naudoja baterijos energiją" -#: ../battstat/battstat_applet.c:375 +#: ../battstat/battstat_applet.c:339 #, c-format msgid "Battery charged (%d%%)" msgstr "Baterija įkrauta (%d%%)" -#: ../battstat/battstat_applet.c:377 +#: ../battstat/battstat_applet.c:341 #, c-format msgid "Unknown time (%d%%) remaining" msgstr "Nežinoma, kiek liko laiko (%d%%)" -#: ../battstat/battstat_applet.c:379 +#: ../battstat/battstat_applet.c:343 #, c-format msgid "Unknown time (%d%%) until charged" msgstr "Nežinoma, kiek liko laiko iki įkrovimo (%d%%)" -#: ../battstat/battstat_applet.c:384 +#: ../battstat/battstat_applet.c:348 #, c-format msgid "%d minute (%d%%) remaining" msgid_plural "%d minutes (%d%%) remaining" @@ -171,7 +197,7 @@ msgstr[1] "liko %d minutės (%d%%)" msgstr[2] "liko %d minučių (%d%%)" -#: ../battstat/battstat_applet.c:389 +#: ../battstat/battstat_applet.c:353 #, c-format msgid "%d minute until charged (%d%%)" msgid_plural "%d minutes until charged (%d%%)" @@ -179,7 +205,7 @@ msgstr[1] "%d minutės iki įkrovimo (%d%%)" msgstr[2] "%d minučių iki įkrovimo (%d%%)" -#: ../battstat/battstat_applet.c:395 +#: ../battstat/battstat_applet.c:359 #, c-format msgid "%d hour (%d%%) remaining" msgid_plural "%d hours (%d%%) remaining" @@ -187,7 +213,7 @@ msgstr[1] "liko %d valandos (%d%%)" msgstr[2] "liko %d valandų (%d%%)" -#: ../battstat/battstat_applet.c:400 +#: ../battstat/battstat_applet.c:364 #, c-format msgid "%d hour until charged (%d%%)" msgid_plural "%d hours until charged (%d%%)" @@ -197,19 +223,21 @@ #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes" #. * Swap order with "%2$s %2$d %1$s %1$d if needed -#: ../battstat/battstat_applet.c:407 +#: ../battstat/battstat_applet.c:371 #, c-format msgid "%d %s %d %s (%d%%) remaining" msgstr "liko %d %s %d %s (%d%%)" -#: ../battstat/battstat_applet.c:408 ../battstat/battstat_applet.c:415 +#: ../battstat/battstat_applet.c:372 +#: ../battstat/battstat_applet.c:379 msgid "hour" msgid_plural "hours" msgstr[0] "valanda" msgstr[1] "valandos" msgstr[2] "valandų" -#: ../battstat/battstat_applet.c:409 ../battstat/battstat_applet.c:416 +#: ../battstat/battstat_applet.c:373 +#: ../battstat/battstat_applet.c:380 msgid "minute" msgid_plural "minutes" msgstr[0] "minutė" @@ -218,35 +246,35 @@ #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes" #. * Swap order with "%2$s %2$d %1$s %1$d if needed -#: ../battstat/battstat_applet.c:414 +#: ../battstat/battstat_applet.c:378 #, c-format msgid "%d %s %d %s until charged (%d%%)" msgstr "%d %s %d %s iki įkrovimo (%d%%)" -#: ../battstat/battstat_applet.c:428 +#: ../battstat/battstat_applet.c:392 msgid "Battery Monitor" msgstr "Baterijos stebėtuvas" -#: ../battstat/battstat_applet.c:438 ../battstat/battstat_applet.c:498 +#: ../battstat/battstat_applet.c:402 +#: ../battstat/battstat_applet.c:461 msgid "Your battery is now fully recharged" msgstr "Baterija dabar yra pilnai įkrauta" -#: ../battstat/battstat_applet.c:474 ../battstat/battstat_applet.c:630 +#: ../battstat/battstat_applet.c:438 +#: ../battstat/battstat_applet.c:593 msgid "Battery Notice" msgstr "Baterijos pranešimas" #. we don't know the remaining time -#: ../battstat/battstat_applet.c:575 +#: ../battstat/battstat_applet.c:538 #, c-format msgid "You have %d%% of your total battery capacity remaining." msgstr "Liko %d%% baterijos." -#: ../battstat/battstat_applet.c:581 +#: ../battstat/battstat_applet.c:544 #, c-format -msgid "" -"You have %d minute of battery power remaining (%d%% of the total capacity)." -msgid_plural "" -"You have %d minutes of battery power remaining (%d%% of the total capacity)." +msgid "You have %d minute of battery power remaining (%d%% of the total capacity)." +msgid_plural "You have %d minutes of battery power remaining (%d%% of the total capacity)." msgstr[0] "Baterijos energijos liko %d minutei (%d%% visos talpos)." msgstr[1] "Baterijos energijos liko %d minutėms (%d%% visos talpos)." msgstr[2] "Baterijos energijos liko %d minučių (%d%% visos talpos)." @@ -254,7 +282,7 @@ #. TRANSLATORS: this is a list, it is left as a single string #. * to allow you to make it appear like a list would in your #. * locale. This is if the laptop does not support suspend. -#: ../battstat/battstat_applet.c:593 +#: ../battstat/battstat_applet.c:556 msgid "" "To avoid losing your work:\n" " • plug your laptop into external power, or\n" @@ -267,7 +295,7 @@ #. TRANSLATORS: this is a list, it is left as a single string #. * to allow you to make it appear like a list would in your #. * locale. This is if the laptop supports suspend. -#: ../battstat/battstat_applet.c:601 +#: ../battstat/battstat_applet.c:564 msgid "" "To avoid losing your work:\n" " • suspend your laptop to save power,\n" @@ -279,106 +307,112 @@ " • įjunkite kompiuterį į tinklą,\n" " • išsaugokite atvertus dokumentus ir kompiuterį išjunkite." -#: ../battstat/battstat_applet.c:609 +#: ../battstat/battstat_applet.c:572 msgid "Your battery is running low" msgstr "Baterija baigia išsikrauti" -#: ../battstat/battstat_applet.c:706 +#: ../battstat/battstat_applet.c:667 msgid "No battery present" msgstr "Baterijos nėra" -#: ../battstat/battstat_applet.c:709 +#: ../battstat/battstat_applet.c:670 msgid "Battery status unknown" msgstr "Baterijos būsena nežinoma" -#: ../battstat/battstat_applet.c:868 +#: ../battstat/battstat_applet.c:850 msgid "N/A" msgstr "N/A" -#: ../battstat/battstat_applet.c:1203 ../drivemount/drivemount.c:141 -#: ../geyes/geyes.c:346 ../geyes/themes.c:244 ../gweather/gweather-applet.c:70 -#: ../gweather/gweather-pref.c:748 ../mini-commander/src/preferences.c:366 -#: ../stickynotes/stickynotes_applet_callbacks.c:391 -#: ../stickynotes/stickynotes_applet_callbacks.c:607 -#: ../trashapplet/src/trashapplet.c:399 +#: ../battstat/battstat_applet.c:1150 +#: ../drivemount/drivemount.c:132 +#: ../geyes/geyes.c:303 +#: ../geyes/themes.c:242 +#: ../gweather/gweather-applet.c:70 +#: ../gweather/gweather-pref.c:746 +#: ../mini-commander/src/preferences.c:366 +#: ../stickynotes/stickynotes_applet_callbacks.c:349 +#: ../stickynotes/stickynotes_applet_callbacks.c:565 +#: ../trashapplet/src/trashapplet.c:398 #, c-format msgid "There was an error displaying help: %s" msgstr "Įvyko klaida rodant žinyną: %s" -#: ../battstat/battstat_applet.c:1243 +#: ../battstat/battstat_applet.c:1190 msgid "This utility shows the status of your laptop battery." msgstr "Ši pagalbinė programa parodo nešiojamo kompiuterio baterijos būseną." #. true -#: ../battstat/battstat_applet.c:1245 +#: ../battstat/battstat_applet.c:1192 msgid "HAL backend enabled." msgstr "HAL posistemė įjungta." #. false -#: ../battstat/battstat_applet.c:1246 +#: ../battstat/battstat_applet.c:1193 msgid "Legacy (non-HAL) backend enabled." msgstr "Sena (ne HAL) posistemė įjungta." -#: ../battstat/battstat_applet.c:1622 ../battstat/battstat_applet.c:1676 -#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1 +#: ../battstat/battstat_applet.c:1569 +#: ../battstat/battstat_applet.c:1622 +#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2 msgid "Battery Charge Monitor" msgstr "Baterijos įkrovos stebyklė" -#: ../battstat/battstat_applet.c:1677 +#: ../battstat/battstat_applet.c:1623 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:3 msgid "Monitor a laptop's remaining power" msgstr "Stebėti likusią nešiojamojo kompiuterio energiją" #: ../battstat/battstat_applet.ui.h:1 -msgid "(shows single image for status and charge)" -msgstr "(rodo vieną paveiksliuką būsenai ir įkrovimui)" +msgid "Battery Charge Monitor Preferences" +msgstr "Baterijos įkrovos stebėtuvo nustatymai" #: ../battstat/battstat_applet.ui.h:2 -msgid "(two images: one for status, one for charge)" -msgstr "(du paveikslėliai: vienas būsenai, vienas įkrovimui)" - -#: ../battstat/battstat_applet.ui.h:3 msgid "Appearance" msgstr "Išvaizda" +#: ../battstat/battstat_applet.ui.h:3 +msgid "_Compact view" +msgstr "_Kompaktiškas rodinys" + #: ../battstat/battstat_applet.ui.h:4 -msgid "Battery Charge Monitor Preferences" -msgstr "Baterijos įkrovos stebėtuvo nustatymai" +msgid "(shows single image for status and charge)" +msgstr "(rodo vieną paveiksliuką būsenai ir įkrovimui)" #: ../battstat/battstat_applet.ui.h:5 -msgid "Notifications" -msgstr "Pranešimai" +msgid "_Expanded view" +msgstr "_Išplėstinis rodinys" #: ../battstat/battstat_applet.ui.h:6 -msgid "Show _percentage remaining" -msgstr "Rodyti likusius _procentus" +msgid "(two images: one for status, one for charge)" +msgstr "(du paveikslėliai: vienas būsenai, vienas įkrovimui)" #: ../battstat/battstat_applet.ui.h:7 -msgid "Show _time remaining" -msgstr "Rodyti likusį _laiką" +msgid "_Show time/percentage:" +msgstr "_Rodyti laiką/procentus:" #: ../battstat/battstat_applet.ui.h:8 -msgid "_Compact view" -msgstr "_Kompaktiškas rodinys" +msgid "Show _time remaining" +msgstr "Rodyti likusį _laiką" #: ../battstat/battstat_applet.ui.h:9 -msgid "_Expanded view" -msgstr "_Išplėstinis rodinys" +msgid "Show _percentage remaining" +msgstr "Rodyti likusius _procentus" #: ../battstat/battstat_applet.ui.h:10 -msgid "_Notify when battery is fully recharged" -msgstr "Pra_nešti, kai baterija yra visiškai įkrauta" - -#: ../battstat/battstat_applet.ui.h:11 -msgid "_Show time/percentage:" -msgstr "_Rodyti laiką/procentus:" +msgid "Notifications" +msgstr "Pranešimai" #. TRANSLATOR: This is the beginning of the sentence 'Warn when battery charge drops to: [XX] percent/minutes remaining' -#: ../battstat/battstat_applet.ui.h:13 +#: ../battstat/battstat_applet.ui.h:12 msgid "_Warn when battery charge drops to:" msgstr "_Perspėti, kai baterija išsikrauna iki:" -#: ../battstat/battstat-hal.c:343 ../battstat/battstat-hal.c:368 +#: ../battstat/battstat_applet.ui.h:13 +msgid "_Notify when battery is fully recharged" +msgstr "Pra_nešti, kai baterija yra visiškai įkrauta" + +#: ../battstat/battstat-hal.c:343 +#: ../battstat/battstat-hal.c:368 msgid "HAL error" msgstr "HAL klaida" @@ -396,90 +430,78 @@ msgstr "Nepavyko inicializuoti HAL: %s: %s" #: ../battstat/battstat.schemas.in.h:1 -msgid "0 for no label, 1 for percentage and 2 for time remaining." -msgstr "0 – nėra užrašo, 1 – procentai, 2 – likęs laikas" +msgid "Red value level" +msgstr "Raudonos vertės lygis" #: ../battstat/battstat.schemas.in.h:2 -msgid "Beep for warnings" -msgstr "Pyptelėti atsiradus įspėjimų" +msgid "The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed." +msgstr "Baterijos lygis žemiau kurio baterija yra raudonos spalvos, tai taip pat yra reikšmė, esant kuriai yra parodomas perspėjimas apie baterijos išsikrovimą." #: ../battstat/battstat.schemas.in.h:3 -msgid "Beep when displaying a warning." -msgstr "Pyptelėti, kai rodomas įspėjimas." +msgid "Warn on low time rather than low percentage" +msgstr "Įspėti, kai lieka mažai laiko, o ne procentų" #: ../battstat/battstat.schemas.in.h:4 -msgid "Drain from top" -msgstr "Mažėti iš viršaus" +msgid "Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage." +msgstr "Vietoje procentų naudoti reikšmę, nurodytą red_value rakte, kaip laiką, likusį iki perspėjimo parodymo." #: ../battstat/battstat.schemas.in.h:5 -msgid "Full Battery Notification" -msgstr "Įspėjimas įkrovus bateriją" - -#: ../battstat/battstat.schemas.in.h:6 msgid "Low Battery Notification" msgstr "Įspėjimas baterijai išsikraunant" +#: ../battstat/battstat.schemas.in.h:6 +msgid "Notify user when the battery is low." +msgstr "Pranešti, kai baterija beveik išsikrovusi." + #: ../battstat/battstat.schemas.in.h:7 -msgid "Notify user when the battery is full." -msgstr "Pranešti, kai baterija įkrauta." +msgid "Full Battery Notification" +msgstr "Įspėjimas įkrovus bateriją" #: ../battstat/battstat.schemas.in.h:8 -msgid "Notify user when the battery is low." -msgstr "Pranešti, kai baterija beveik išsikrovusi." +msgid "Notify user when the battery is full." +msgstr "Pranešti, kai baterija įkrauta." #: ../battstat/battstat.schemas.in.h:9 -msgid "Red value level" -msgstr "Raudonos vertės lygis" +msgid "Beep for warnings" +msgstr "Pyptelėti atsiradus įspėjimų" #: ../battstat/battstat.schemas.in.h:10 -msgid "" -"Show the battery meter draining from the top of the battery. Only " -"implemented for traditional battery view." -msgstr "" -"Rodyti baterijos įkrovos matuoklį, mažėjantį nuo baterijos viršaus. Kol kas " -"ši funkcija įgyvendinta tik tradiciniam baterijos rodiniui." +msgid "Beep when displaying a warning." +msgstr "Pyptelėti, kai rodomas įspėjimas." #: ../battstat/battstat.schemas.in.h:11 -msgid "Show the horizontal battery" -msgstr "Rodyti bateriją horizontaliai" +msgid "Drain from top" +msgstr "Mažėti iš viršaus" #: ../battstat/battstat.schemas.in.h:12 -msgid "Show the time/percent label" -msgstr "Rodyti laiko/procentų užrašą" +msgid "Show the battery meter draining from the top of the battery. Only implemented for traditional battery view." +msgstr "Rodyti baterijos įkrovos matuoklį, mažėjantį nuo baterijos viršaus. Kol kas ši funkcija įgyvendinta tik tradiciniam baterijos rodiniui." #: ../battstat/battstat.schemas.in.h:13 -msgid "Show the traditional, horizontal battery on the panel." -msgstr "Rodyti tradicinę, horizontalią bateriją." +msgid "Upright (small) battery" +msgstr "Stačia (maža) baterija" #: ../battstat/battstat.schemas.in.h:14 msgid "Show the upright, smaller battery on the panel." msgstr "Rodyti stačią, mažesnę bateriją." #: ../battstat/battstat.schemas.in.h:15 -msgid "" -"The battery level below which the battery is displayed as red. Also the " -"value at which the low battery warning is displayed." -msgstr "" -"Baterijos lygis žemiau kurio baterija yra raudonos spalvos, tai taip pat yra " -"reikšmė, esant kuriai yra parodomas perspėjimas apie baterijos išsikrovimą." +msgid "Show the horizontal battery" +msgstr "Rodyti bateriją horizontaliai" #: ../battstat/battstat.schemas.in.h:16 -msgid "Upright (small) battery" -msgstr "Stačia (maža) baterija" +msgid "Show the traditional, horizontal battery on the panel." +msgstr "Rodyti tradicinę, horizontalią bateriją." #: ../battstat/battstat.schemas.in.h:17 -msgid "" -"Use the value defined in red_value as a time remaining to show the warning " -"dialog rather than a percentage." -msgstr "" -"Vietoje procentų naudoti reikšmę, nurodytą red_value rakte, kaip laiką, " -"likusį iki perspėjimo parodymo." +msgid "Show the time/percent label" +msgstr "Rodyti laiko/procentų užrašą" #: ../battstat/battstat.schemas.in.h:18 -msgid "Warn on low time rather than low percentage" -msgstr "Įspėti, kai lieka mažai laiko, o ne procentų" +msgid "0 for no label, 1 for percentage and 2 for time remaining." +msgstr "0 – nėra užrašo, 1 – procentai, 2 – likęs laikas" -#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2 +#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1 msgid "Battstat Factory" msgstr "Battstat gamykla" @@ -504,14 +526,14 @@ msgstr "Baterijos būsenos pagalbinė programa" #: ../battstat/sounds/battstat_applet.soundlist.in.h:2 -msgid "Battery fully re-charged" -msgstr "Baterija yra pilnai įkrauta." - -#: ../battstat/sounds/battstat_applet.soundlist.in.h:3 msgid "Battery power low" msgstr "Baterija beveik išsikrovusi" -#: ../charpick/charpick.c:436 +#: ../battstat/sounds/battstat_applet.soundlist.in.h:3 +msgid "Battery fully re-charged" +msgstr "Baterija yra pilnai įkrauta." + +#: ../charpick/charpick.c:438 msgid "Available palettes" msgstr "Prieinamos paletės" @@ -519,64 +541,58 @@ #. * hopefully, the name of the unicode character has already #. * been translated. #. -#: ../charpick/charpick.c:483 +#: ../charpick/charpick.c:485 #, c-format msgid "Insert \"%s\"" msgstr "Įterpti „%s“" -#: ../charpick/charpick.c:486 +#: ../charpick/charpick.c:488 msgid "Insert special character" msgstr "Įterpkite specialų simbolį" -#: ../charpick/charpick.c:490 +#: ../charpick/charpick.c:492 #, c-format msgid "insert special character %s" msgstr "įterpti specialų simbolį %s" -#: ../charpick/charpick.c:605 -msgid "" -"Gnome Panel applet for selecting strange characters that are not on my " -"keyboard. Released under GNU General Public Licence." -msgstr "" -"GNOME skydelio įtaisas, padedantis įterpti keistus simbolius, kurių nėra " -"klaviatūroje. Išleistas GPL sąlygomis." +#: ../charpick/charpick.c:607 +msgid "Gnome Panel applet for selecting strange characters that are not on my keyboard. Released under GNU General Public Licence." +msgstr "GNOME skydelio įtaisas, padedantis įterpti keistus simbolius, kurių nėra klaviatūroje. Išleistas GPL sąlygomis." -#: ../charpick/charpick.c:743 ../charpick/charpick.c:757 -#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1 -#: ../charpick/properties.c:452 +#: ../charpick/charpick.c:745 +#: ../charpick/charpick.c:759 +#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2 +#: ../charpick/properties.c:451 msgid "Character Palette" msgstr "Simbolių paletė" -#: ../charpick/charpick.c:743 +#: ../charpick/charpick.c:745 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:3 msgid "Insert characters" msgstr "Įterpti simbolius" #: ../charpick/charpick.schemas.in.h:1 +msgid "DEPRECATED - Characters shown on applet startup" +msgstr "NENAUDOJAMA - Simboliai rodomi įtaiso paleidimo metu" + +#: ../charpick/charpick.schemas.in.h:2 msgid "Characters shown on applet startup" msgstr "Simboliai rodomi įtaiso paleidimo metu" -#: ../charpick/charpick.schemas.in.h:2 -msgid "DEPRECATED - Characters shown on applet startup" -msgstr "NENAUDOJAMA - Simboliai rodomi įtaiso paleidimo metu" +#: ../charpick/charpick.schemas.in.h:3 +msgid "The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet." +msgstr "Eilutė kurią vartotojas buvo pažymėjęs paskutinio įtaiso naudojimo metu. Ši eilutė bus rodoma kai vartotojas vėl paleis įtaisą." -#: ../charpick/charpick.schemas.in.h:3 ../charpick/properties.c:379 +#: ../charpick/charpick.schemas.in.h:4 +#: ../charpick/properties.c:378 msgid "List of available palettes" msgstr "Galimų palečių sąrašas" -#: ../charpick/charpick.schemas.in.h:4 +#: ../charpick/charpick.schemas.in.h:5 msgid "List of strings containing the available palettes." msgstr "Eilučių, turinčių prieinamas paletes, sąrašas." -#: ../charpick/charpick.schemas.in.h:5 -msgid "" -"The string that the user had selected when the applet was last used. This " -"string will be displayed when the user starts the applet." -msgstr "" -"Eilutė kurią vartotojas buvo pažymėjęs paskutinio įtaiso naudojimo metu. Ši " -"eilutė bus rodoma kai vartotojas vėl paleis įtaisą." - -#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2 +#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1 msgid "Charpicker Applet Factory" msgstr "Charpicker įtaiso gamykla" @@ -584,134 +600,121 @@ msgid "_Edit" msgstr "_Keisti" -#: ../charpick/properties.c:117 +#: ../charpick/properties.c:116 msgid "_Palette:" msgstr "_Paletė:" -#: ../charpick/properties.c:125 +#: ../charpick/properties.c:124 msgid "Palette entry" msgstr "Paletės įvestis" -#: ../charpick/properties.c:126 +#: ../charpick/properties.c:125 msgid "Modify a palette by adding or removing characters" msgstr "Modifikuoti paletę pridedant arba pašalinant simbolius" -#: ../charpick/properties.c:240 +#: ../charpick/properties.c:239 msgid "Add Palette" msgstr "Pridėti paletę" -#: ../charpick/properties.c:277 +#: ../charpick/properties.c:276 msgid "Edit Palette" msgstr "Redaguoti paletę" -#: ../charpick/properties.c:378 +#: ../charpick/properties.c:377 msgid "Palettes list" msgstr "Palečių sąrašas" -#: ../charpick/properties.c:457 +#: ../charpick/properties.c:456 msgid "_Palettes:" msgstr "_Paletės:" -#: ../charpick/properties.c:473 +#: ../charpick/properties.c:472 msgid "Add button" msgstr "Pridėti mygtuką" -#: ../charpick/properties.c:474 +#: ../charpick/properties.c:473 msgid "Click to add a new palette" msgstr "Norėdami pridėti naują paletę, spragtelkit čia" -#: ../charpick/properties.c:481 +#: ../charpick/properties.c:480 msgid "Edit button" msgstr "Redaguoti mygtuką" -#: ../charpick/properties.c:482 +#: ../charpick/properties.c:481 msgid "Click to edit the selected palette" msgstr "Norėdami redaguoti pasirinktą paletę, spragtelkite čia" -#: ../charpick/properties.c:489 +#: ../charpick/properties.c:488 msgid "Delete button" msgstr "Pašalinti mygtuką" -#: ../charpick/properties.c:490 +#: ../charpick/properties.c:489 msgid "Click to delete the selected palette" msgstr "Norėdami ištrinti pasirinktą paletę, spragtelkite čia" -#: ../charpick/properties.c:541 +#: ../charpick/properties.c:540 msgid "Character Palette Preferences" msgstr "Simbolių paletės nustatymai" #: ../cpufreq/cpufreq-applet.schemas.in.h:1 -msgid "" -"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 " -"to show percentage instead of frequency." -msgstr "" -"0-inė reikšmė reiškia, kad rodomas cpu dažnis, 1 - kad rodomas dažnis ir " -"vienetai, 2 - kad vietoje dažnio rodomi procentai." +msgid "CPU to Monitor" +msgstr "Stebimas CPU" #: ../cpufreq/cpufreq-applet.schemas.in.h:2 -msgid "" -"A 0 value means to show the applet in graphic mode (pixmap only), 1 to show " -"the applet in text mode (not to show the pixmap) and 2 to show the applet in " -"graphic and text mode." -msgstr "" -"0-inė vertė reiškia, kad įtaisas rodomas grafiniame režime (tik " -"paveikslėlis), 1 - kad įtaisas rodomas tekstiniame režime (paveikslėlis " -"nerodomas) ir 2 - kad įtaisas rodomas ir grafiniame, ir tekstiniame režime." +msgid "Set the CPU to monitor. In a single processor system you don't have to change it." +msgstr "Nurodykite stebimą CPU. Vieno procesoriaus sistemoje, jums jo keisti nereikia." #: ../cpufreq/cpufreq-applet.schemas.in.h:3 -msgid "CPU to Monitor" -msgstr "Stebimas CPU" - -#: ../cpufreq/cpufreq-applet.schemas.in.h:4 msgid "Mode to show cpu usage" msgstr "CPU apkrovos rodymo režimas" -#: ../cpufreq/cpufreq-applet.schemas.in.h:5 -msgid "" -"Set the CPU to monitor. In a single processor system you don't have to " -"change it." -msgstr "" -"Nurodykite stebimą CPU. Vieno procesoriaus sistemoje, jums jo keisti " -"nereikia." +#: ../cpufreq/cpufreq-applet.schemas.in.h:4 +msgid "A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode." +msgstr "0-inė vertė reiškia, kad įtaisas rodomas grafiniame režime (tik paveikslėlis), 1 - kad įtaisas rodomas tekstiniame režime (paveikslėlis nerodomas) ir 2 - kad įtaisas rodomas ir grafiniame, ir tekstiniame režime." -#: ../cpufreq/cpufreq-applet.schemas.in.h:6 +#: ../cpufreq/cpufreq-applet.schemas.in.h:5 msgid "The type of text to display (if the text is enabled)." msgstr "Rodomo teksto tipas (jei tekstas įjungtas)." +#: ../cpufreq/cpufreq-applet.schemas.in.h:6 +msgid "A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency." +msgstr "0-inė reikšmė reiškia, kad rodomas cpu dažnis, 1 - kad rodomas dažnis ir vienetai, 2 - kad vietoje dažnio rodomi procentai." + #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" msgstr "CPU dažnio stebėjimo nustatymai" #: ../cpufreq/cpufreq-preferences.ui.h:2 -msgid "Display Settings" -msgstr "Rodymo nustatymai" - -#: ../cpufreq/cpufreq-preferences.ui.h:3 msgid "Monitor Settings" msgstr "Stebėjimo nustatymai" +#: ../cpufreq/cpufreq-preferences.ui.h:3 +msgid "_Monitored CPU:" +msgstr "_Stebimas CPU:" + #: ../cpufreq/cpufreq-preferences.ui.h:4 -msgid "Show CPU frequency as _frequency" -msgstr "Rodyti CPU dažnį kaip _dažnį" +msgid "Display Settings" +msgstr "Rodymo nustatymai" #: ../cpufreq/cpufreq-preferences.ui.h:5 -msgid "Show CPU frequency as _percentage" -msgstr "Rodyti CPU dažnį _procentais" +msgid "_Appearance:" +msgstr "_Išvaizda:" #: ../cpufreq/cpufreq-preferences.ui.h:6 -msgid "Show frequency _units" -msgstr "Rodyti dažnio _vienetus" +msgid "Show CPU frequency as _frequency" +msgstr "Rodyti CPU dažnį kaip _dažnį" #: ../cpufreq/cpufreq-preferences.ui.h:7 -msgid "_Appearance:" -msgstr "_Išvaizda:" +msgid "Show frequency _units" +msgstr "Rodyti dažnio _vienetus" #: ../cpufreq/cpufreq-preferences.ui.h:8 -msgid "_Monitored CPU:" -msgstr "_Stebimas CPU:" +msgid "Show CPU frequency as _percentage" +msgstr "Rodyti CPU dažnį _procentais" #: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1 -#: ../cpufreq/src/cpufreq-applet.c:946 ../cpufreq/src/cpufreq-applet.c:1005 +#: ../cpufreq/src/cpufreq-applet.c:944 +#: ../cpufreq/src/cpufreq-applet.c:1003 msgid "CPU Frequency Scaling Monitor" msgstr "CPU dažnio mastelio stebėtuvas" @@ -719,15 +722,16 @@ msgid "Monitor the CPU Frequency Scaling" msgstr "Stebėti CPU dažnio mastelį" -#: ../cpufreq/src/cpufreq-applet.c:581 ../cpufreq/src/cpufreq-prefs.c:478 +#: ../cpufreq/src/cpufreq-applet.c:579 +#: ../cpufreq/src/cpufreq-prefs.c:478 msgid "Could not open help document" msgstr "Nepavyko atverti žinyno dokumento" -#: ../cpufreq/src/cpufreq-applet.c:608 +#: ../cpufreq/src/cpufreq-applet.c:606 msgid "This utility shows the current CPU Frequency Scaling." msgstr "Ši pagalbinė programa rodo esamą CPU dažnio mastelį." -#: ../cpufreq/src/cpufreq-applet.c:1006 +#: ../cpufreq/src/cpufreq-applet.c:1004 msgid "This utility shows the current CPU Frequency" msgstr "Ši pagalbinė programa rodo esamą CPU dažnį" @@ -743,7 +747,7 @@ msgid "Graphic and Text" msgstr "Grafikas ir tekstas" -#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:117 +#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:121 msgid "Frequency Scaling Unsupported" msgstr "Dažnio keitimas nepalaikomas" @@ -756,12 +760,8 @@ msgstr "CPU dažnio keitimas nepalaikomas" #: ../cpufreq/src/cpufreq-monitor-factory.c:60 -msgid "" -"You will not be able to modify the frequency of your machine. Your machine " -"may be misconfigured or not have hardware support for CPU frequency scaling." -msgstr "" -"Negalėsite keisti kompiuterio dažnio. Kompiuteris neteisingai " -"sukonfigūruotas arba neturi galimybės keisti dažnį." +msgid "You will not be able to modify the frequency of your machine. Your machine may be misconfigured or not have hardware support for CPU frequency scaling." +msgstr "Negalėsite keisti kompiuterio dažnio. Kompiuteris neteisingai sukonfigūruotas arba neturi galimybės keisti dažnį." #: ../cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.h:1 msgid "Change CPU Frequency scaling" @@ -769,10 +769,10 @@ #: ../cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in.h:2 msgid "Privileges are required to change the CPU Frequency scaling." -msgstr "" -"Norint keisti CPU dažnių reguliavimą reikia turėti administratoriaus teises." +msgstr "Norint keisti CPU dažnių reguliavimą reikia turėti administratoriaus teises." -#: ../drivemount/drive-button.c:342 ../drivemount/drive-button.c:355 +#: ../drivemount/drive-button.c:342 +#: ../drivemount/drive-button.c:355 msgid "(mounted)" msgstr "(prijungtas)" @@ -780,45 +780,49 @@ msgid "(not mounted)" msgstr "(neprijungtas)" -#: ../drivemount/drive-button.c:556 -#, c-format -msgid "Cannot execute '%s'" -msgstr "Negali įvykdyti „%s“" +#: ../drivemount/drive-button.c:562 +msgid "Cannot start Nautilus File Manager" +msgstr "Nepavyko paleisti Nautilus failų tvarkyklės" + +#: ../drivemount/drive-button.c:569 +msgid "Could not find Nautilus" +msgstr "Nepavyko rasti Nautilus" -#: ../drivemount/drive-button.c:879 +#: ../drivemount/drive-button.c:893 msgid "_Play DVD" msgstr "_Rodyti DVD " -#: ../drivemount/drive-button.c:883 +#: ../drivemount/drive-button.c:897 msgid "_Play CD" msgstr "_Groti CD" -#: ../drivemount/drive-button.c:886 +#: ../drivemount/drive-button.c:900 #, c-format msgid "_Open %s" msgstr "_Atverti %s" -#: ../drivemount/drive-button.c:895 +#: ../drivemount/drive-button.c:908 #, c-format msgid "Un_mount %s" msgstr "A_tjungti %s" -#: ../drivemount/drive-button.c:902 +#: ../drivemount/drive-button.c:914 #, c-format msgid "_Mount %s" msgstr "_Prijungti %s" -#: ../drivemount/drive-button.c:910 +#: ../drivemount/drive-button.c:922 #, c-format msgid "_Eject %s" msgstr "_Išmesti %s" -#: ../drivemount/drivemount.c:114 +#: ../drivemount/drivemount.c:103 msgid "Applet for mounting and unmounting block volumes." msgstr "Įtaisas duomenų laikmenų prijungimui ir atjungimui." -#: ../drivemount/drivemount.c:173 ../drivemount/drivemount.c:210 -#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1 +#: ../drivemount/drivemount.c:164 +#: ../drivemount/drivemount.c:201 +#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3 msgid "Disk Mounter" msgstr "Diskų prijungimas" @@ -830,11 +834,11 @@ msgid "Time in seconds between status updates" msgstr "Laiko tarpas sekundėmis tarp būklės atnaujinimų" -#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2 +#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1 msgid "Drive Mount Applet Factory" msgstr "Diskų prijungimo priedo gamykla" -#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3 +#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2 msgid "Factory for drive mount applet" msgstr "Diskų prijungimo priedo gamykla" @@ -842,17 +846,18 @@ msgid "Mount local disks and devices" msgstr "Prijungti vietinius diskus ir įrenginius" -#: ../geyes/geyes.c:191 +#: ../geyes/geyes.c:148 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse." -msgstr "" -"Keletas kvailų akių GNOME skydeliui. Jų žvilgsnis seka jūsų pelės žymiklį." +msgstr "Keletas kvailų akių GNOME skydeliui. Jų žvilgsnis seka jūsų pelės žymiklį." -#: ../geyes/geyes.c:391 ../geyes/geyes.c:422 ../geyes/geyes.c:424 +#: ../geyes/geyes.c:348 +#: ../geyes/geyes.c:379 +#: ../geyes/geyes.c:381 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:2 msgid "Eyes" msgstr "Akys" -#: ../geyes/geyes.c:425 +#: ../geyes/geyes.c:382 msgid "The eyes look in the direction of the mouse pointer" msgstr "Akys žiūri pelės žymeklio kryptimis" @@ -861,13 +866,13 @@ msgstr "Aplankas, kuriame yra tema" #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1 -msgid "A set of eyeballs for your panel" -msgstr "Keletas akių jūsų skydeliui pagražinti" - -#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3 msgid "Geyes Applet Factory" msgstr "Geyes įtaiso gamykla" +#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3 +msgid "A set of eyeballs for your panel" +msgstr "Keletas akių jūsų skydeliui pagražinti" + #: ../geyes/themes.c:127 msgid "Can not launch the eyes applet." msgstr "Nepavyko paleisti akių įtaiso." @@ -876,634 +881,18 @@ msgid "There was a fatal error while trying to load the theme." msgstr "Įkeliant temą įvyko lemtinga klaida." -#: ../geyes/themes.c:303 +#: ../geyes/themes.c:301 msgid "Geyes Preferences" msgstr "Geyes nustatymai" -#: ../geyes/themes.c:337 +#: ../geyes/themes.c:334 msgid "Themes" msgstr "Temos" -#: ../geyes/themes.c:358 +#: ../geyes/themes.c:355 msgid "_Select a theme:" msgstr "Pa_sirinkite temą:" -#: ../gkb-new/xmodmap/base.xml.in.h:1 ../gkb-new/xmodmap.sun/base.xml.in.h:1 -msgid "Alt+Control changes layout." -msgstr "Alt+Control keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:2 ../gkb-new/xmodmap.sun/base.xml.in.h:2 -msgid "Alt+Shift changes layout." -msgstr "Alt+Shift keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:3 -msgid "Arabic keymap" -msgstr "Arabų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:4 -msgid "Armenian" -msgstr "Armenų" - -#: ../gkb-new/xmodmap/base.xml.in.h:5 -msgid "Basque" -msgstr "Baskų" - -#: ../gkb-new/xmodmap/base.xml.in.h:6 -msgid "Belgian" -msgstr "Belgų" - -#: ../gkb-new/xmodmap/base.xml.in.h:7 ../gkb-new/xmodmap.sun/base.xml.in.h:6 -msgid "Both Alt keys together change layout." -msgstr "Abu Alt klavišai kartu keičia išdėstymą" - -#: ../gkb-new/xmodmap/base.xml.in.h:8 ../gkb-new/xmodmap.sun/base.xml.in.h:7 -msgid "Both Ctrl keys together change layout." -msgstr "Abu Ctrl klavišai kartu keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:9 ../gkb-new/xmodmap.sun/base.xml.in.h:8 -msgid "Both Shift keys together change layout." -msgstr "Abu Shift klavišai kartu keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:10 -msgid "Brazil Portuguese keymap" -msgstr "Brazilų Portugalų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:11 -msgid "Bulgarian Cyrillic" -msgstr "Bulgarų kirilica" - -#: ../gkb-new/xmodmap/base.xml.in.h:12 -msgid "Bulgarian keymap" -msgstr "Bulgarų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:13 ../gkb-new/xmodmap.sun/base.xml.in.h:16 -msgid "CapsLock key changes layout." -msgstr "CapsLock klavišas keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:14 ../gkb-new/xmodmap.sun/base.xml.in.h:17 -msgid "Control+Shift changes layout." -msgstr "Control+Shift keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:15 -msgid "Czech keymap" -msgstr "Čekų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:16 -msgid "Danish keymap" -msgstr "Danų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:17 -msgid "Dutch keymap" -msgstr "Olandų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:18 -msgid "English keymap" -msgstr "Anglų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:19 -msgid "Estonian keymap" -msgstr "Estų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:20 -msgid "Finnish keymap" -msgstr "Suomių išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:21 -msgid "French Swiss" -msgstr "Prancūzų šveicariškas" - -#: ../gkb-new/xmodmap/base.xml.in.h:22 -msgid "French Swiss keymap" -msgstr "Prancūzų šveicariškas išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:23 -msgid "French keymap" -msgstr "Prancūzų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:24 -msgid "French-Canadian 105-key" -msgstr "Prancūzų kanadietiškas 105 klavišų" - -#: ../gkb-new/xmodmap/base.xml.in.h:25 -msgid "GB 102-key" -msgstr "Didžiosios Britanijos 102 klavišų" - -#: ../gkb-new/xmodmap/base.xml.in.h:26 -msgid "GB 105-key" -msgstr "Didžiosios Britanijos 105 klavišų" - -#: ../gkb-new/xmodmap/base.xml.in.h:27 ../gkb-new/xmodmap.sun/base.xml.in.h:27 -msgid "Generic Keyboard" -msgstr "Standartinė klaviatūra" - -#: ../gkb-new/xmodmap/base.xml.in.h:28 -msgid "Georgian Latin" -msgstr "Gruzinų lotyniškas" - -#: ../gkb-new/xmodmap/base.xml.in.h:29 -msgid "Georgian Russian layout" -msgstr "Gruzinų rusiškas išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:30 -msgid "Georgian keymap" -msgstr "Gruzinų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:31 -msgid "German" -msgstr "Vokiečių" - -#: ../gkb-new/xmodmap/base.xml.in.h:32 -msgid "German Swiss with Euro" -msgstr "Vokiečių šveicariška su Euro" - -#: ../gkb-new/xmodmap/base.xml.in.h:33 -msgid "German keymap" -msgstr "Vokiečių išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:34 -msgid "Greek keymap" -msgstr "Graikų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:35 -msgid "Hebrew keymap" -msgstr "Hebrajų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:36 -msgid "Hungarian 101-key latin 1" -msgstr "Vengrų 101 klavišo latin1" - -#: ../gkb-new/xmodmap/base.xml.in.h:37 -msgid "Hungarian 101-key latin 2" -msgstr "Vengrų 101 klavišo latin2" - -#: ../gkb-new/xmodmap/base.xml.in.h:38 -msgid "Hungarian 105-key latin 1" -msgstr "Vengrų 105 klavišų latin1" - -#: ../gkb-new/xmodmap/base.xml.in.h:39 -msgid "Hungarian 105-key latin 2" -msgstr "Vengrų 105 klavišų latin2" - -#: ../gkb-new/xmodmap/base.xml.in.h:40 -msgid "Hungarian PC/AT 101 keyboard" -msgstr "Vengrų PC/AT 101 klaviatūra" - -#: ../gkb-new/xmodmap/base.xml.in.h:41 -msgid "Hungarian latin1" -msgstr "Vengrų latin1" - -#: ../gkb-new/xmodmap/base.xml.in.h:42 -msgid "Icelandic keymap" -msgstr "Islandų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:43 -msgid "Italian keymap" -msgstr "Italų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:44 -msgid "Japanese keymap" -msgstr "Japonų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:45 -msgid "Lao keymap" -msgstr "Laoso išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:46 ../gkb-new/xmodmap.sun/base.xml.in.h:41 -msgid "Layout shift behavior" -msgstr "Išdėstymų keitimo elgsena" - -#: ../gkb-new/xmodmap/base.xml.in.h:47 ../gkb-new/xmodmap.sun/base.xml.in.h:42 -msgid "Left Alt key changes layout." -msgstr "Kairysis Alt klavišas keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:48 ../gkb-new/xmodmap.sun/base.xml.in.h:43 -msgid "Left Ctrl key changes group." -msgstr "Kairysis Ctrl klavišas keičia grupę." - -#: ../gkb-new/xmodmap/base.xml.in.h:49 ../gkb-new/xmodmap.sun/base.xml.in.h:44 -msgid "Left Shift key changes group." -msgstr "Kairysis Shift klavišas keičia grupę." - -#: ../gkb-new/xmodmap/base.xml.in.h:50 ../gkb-new/xmodmap.sun/base.xml.in.h:45 -msgid "Left Win-key changes layout." -msgstr "Kairysis Win klavišas keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:51 -msgid "Lithuanian keymap" -msgstr "Lietuviškas išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:52 -msgid "Macedonian" -msgstr "Makedoniečių" - -#: ../gkb-new/xmodmap/base.xml.in.h:53 ../gkb-new/xmodmap.sun/base.xml.in.h:48 -msgid "Menu key changes layout." -msgstr "Meniu klavišas keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:54 -msgid "Mongolian alt keymap" -msgstr "Mongolų alt išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:55 -msgid "Mongolian keymap" -msgstr "Mongolų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:56 -msgid "Mongolian phonetic keymap" -msgstr "Mongolų fonetinis išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:57 -msgid "Norwegian" -msgstr "Norvegų" - -#: ../gkb-new/xmodmap/base.xml.in.h:58 -msgid "Plain Russian keymap" -msgstr "Paprastas rusiškas išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:59 -msgid "Polish" -msgstr "Lenkų" - -#: ../gkb-new/xmodmap/base.xml.in.h:60 -msgid "Polish deadkeys" -msgstr "Lenkų Deadkeys" - -#: ../gkb-new/xmodmap/base.xml.in.h:61 -msgid "Portugal" -msgstr "Portugalija" - -#: ../gkb-new/xmodmap/base.xml.in.h:62 -msgid "Portugal Deadkeys" -msgstr "Portugalų Deadkeys" - -#: ../gkb-new/xmodmap/base.xml.in.h:63 -msgid "Portuguese keymap" -msgstr "Portugalų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:64 ../gkb-new/xmodmap.sun/base.xml.in.h:53 -msgid "Right Alt key changes layout." -msgstr "Dešinysis Alt klavišas keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:65 ../gkb-new/xmodmap.sun/base.xml.in.h:54 -msgid "Right Ctrl key changes group." -msgstr "Dešinysis Ctrl klavišas keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:66 ../gkb-new/xmodmap.sun/base.xml.in.h:55 -msgid "Right Shift key changes group." -msgstr "Dešinysis Shift klavišas keičia grupę." - -#: ../gkb-new/xmodmap/base.xml.in.h:67 ../gkb-new/xmodmap.sun/base.xml.in.h:56 -msgid "Right Win-key changes layout." -msgstr "Dešinysis Win klavišas keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:68 -msgid "Russian Cyrillic" -msgstr "Rusų kirilica" - -#: ../gkb-new/xmodmap/base.xml.in.h:69 -msgid "Russian keymap" -msgstr "Rusų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:70 -msgid "Serbian keymap" -msgstr "Serbų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:71 ../gkb-new/xmodmap.sun/base.xml.in.h:60 -msgid "Shift+CapsLock changes layout." -msgstr "Shift+CapsLock keičia išdėstymą." - -#: ../gkb-new/xmodmap/base.xml.in.h:72 -msgid "Slovak keymap" -msgstr "Slovakų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:73 -msgid "Slovenian" -msgstr "Slovėnų" - -#: ../gkb-new/xmodmap/base.xml.in.h:74 -msgid "Slovenian keymap" -msgstr "Slovėnų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:75 -msgid "Spanish keymap" -msgstr "Ispanų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:76 -msgid "Sun (!not PC!) type5 Hungarian latin 2" -msgstr "Sun (!ne PC!) type5 Vengrų lotyniškas 2" - -#: ../gkb-new/xmodmap/base.xml.in.h:77 -msgid "Swedish" -msgstr "Švedų" - -#: ../gkb-new/xmodmap/base.xml.in.h:78 -msgid "Swedish keymap" -msgstr "Švedų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:79 -msgid "Swiss keymap" -msgstr "Šveicarų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:80 -msgid "Thai" -msgstr "Tailandiečių" - -#: ../gkb-new/xmodmap/base.xml.in.h:81 -msgid "Thai Kedmanee" -msgstr "Thai Kedmanee" - -#: ../gkb-new/xmodmap/base.xml.in.h:82 -msgid "Thai keymap" -msgstr "Tajų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:83 -msgid "Turkish \"F\" keyboard" -msgstr "Turkų „F“ klaviatūra" - -#: ../gkb-new/xmodmap/base.xml.in.h:84 -msgid "Turkish \"Q\" keyboard" -msgstr "Turkų „Q“ klaviatūra" - -#: ../gkb-new/xmodmap/base.xml.in.h:85 -msgid "Turkish keymap" -msgstr "Turkų išdėstymas" - -#: ../gkb-new/xmodmap/base.xml.in.h:86 -msgid "UK 105-key" -msgstr "Jungtinės Karalystės 105 klavišų" - -#: ../gkb-new/xmodmap/base.xml.in.h:87 -msgid "UK PC/AT keyboard" -msgstr "Jungtinės Karalystės PC/AT klaviatūra" - -#: ../gkb-new/xmodmap/base.xml.in.h:88 -msgid "US 101-key keyboard" -msgstr "JAV 101 klavišo klaviatūra" - -#: ../gkb-new/xmodmap/base.xml.in.h:89 -msgid "US 105-key keyboard (with windows keys)" -msgstr "JAV 105 klavišų klaviatūra (su windows klavišais)" - -#: ../gkb-new/xmodmap/base.xml.in.h:90 -msgid "US 84-key" -msgstr "JAV 84 klavišų" - -#: ../gkb-new/xmodmap/base.xml.in.h:91 -msgid "US DEC 450" -msgstr "JAV DEC 450" - -#: ../gkb-new/xmodmap/base.xml.in.h:92 -msgid "US IBM RS/6000" -msgstr "JAV IBM RS/6000" - -#: ../gkb-new/xmodmap/base.xml.in.h:93 -msgid "US International" -msgstr "JAV tarptautinė" - -#: ../gkb-new/xmodmap/base.xml.in.h:94 -msgid "US Macintosh" -msgstr "JAV Macintosh" - -#: ../gkb-new/xmodmap/base.xml.in.h:95 -msgid "US PC/AT 101 keyboard" -msgstr "JAV PC/AT 101 klaviatūra" - -#: ../gkb-new/xmodmap/base.xml.in.h:96 -msgid "US Silicon Graphics 101-key" -msgstr "JAV Silicon Graphics 101-klavišo" - -#: ../gkb-new/xmodmap/base.xml.in.h:97 -msgid "US Sun type5" -msgstr "JAV Sun type5" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:3 -msgid "Armenian Sun keymap" -msgstr "Armėnų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:4 -msgid "Azerbaijani Turkish Sun keymap" -msgstr "Azerbaidžano turkiškas Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:5 -msgid "Belarusian Sun keymap" -msgstr "Baltarusių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:9 -msgid "Brazil Portuguese Sun USB keymap" -msgstr "Brazilų Portugalų Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:10 -msgid "Brazil Portuguese Sun keymap" -msgstr "Brazilų Portugalų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:11 -msgid "British Sun Type-4 keymap" -msgstr "Britų Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:12 -msgid "British Sun USB keymap" -msgstr "Britų Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:13 -msgid "British Sun keymap" -msgstr "Britų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:14 -msgid "Bulgarian Sun keymap" -msgstr "Bulgarų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:15 -msgid "Canadian Sun keymap" -msgstr "Kanadiečių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:18 -msgid "Czech Sun keymap" -msgstr "Čekų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:19 -msgid "Danish Sun Type-4 keymap" -msgstr "Danų Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:20 -msgid "Danish Sun USB keymap" -msgstr "Danų Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:21 -msgid "Danish Sun keymap" -msgstr "Danų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:22 -msgid "Dutch Sun keymap" -msgstr "Olandų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:23 -msgid "Estonian Sun keymap" -msgstr "Estų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:24 -msgid "Finnish Sun keymap" -msgstr "Suomių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:25 -msgid "French Sun USB keymap" -msgstr "Prancūzų Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:26 -msgid "French Sun keymap" -msgstr "Prancūzų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:28 -msgid "German Sun Type-4 keymap" -msgstr "Vokiečių Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:29 -msgid "German Sun USB keymap" -msgstr "Vokiečių Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:30 -msgid "German Sun keymap" -msgstr "Vokiečių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:31 -msgid "Hebrew Sun keymap" -msgstr "Hebrajų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:32 -msgid "Hungarian latin2 Sun keymap" -msgstr "Vengrų latin2 Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:33 -msgid "Hungarian type5 latin 1 keymap" -msgstr "Vengrų type5 latin1 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:34 -msgid "Icelandic Sun keymap" -msgstr "Islandų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:35 -msgid "Italian Sun Type-4 keymap" -msgstr "Italų Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:36 -msgid "Italian Sun USB keymap" -msgstr "Italų Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:37 -msgid "Italian Sun keymap" -msgstr "Italų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:38 -msgid "Japanese Sun Type-4 keymap" -msgstr "Japonų Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:39 -msgid "Japanese Sun keymap" -msgstr "Japonų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:40 -msgid "Latvian Sun keymap" -msgstr "Latvių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:46 -msgid "Lithuanian Sun keymap" -msgstr "Lietuviškas Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:47 -msgid "Macedonian Sun keymap" -msgstr "Makedoniečių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:49 -msgid "Norwegian Sun keymap" -msgstr "Norvegų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:50 -msgid "Polish Sun keymap" -msgstr "Lenkų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:51 -msgid "Portuguese Sun Type-4 keymap" -msgstr "Portugalų Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:52 -msgid "Portuguese Sun keymap" -msgstr "Portugalų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:57 -msgid "Romanian Sun keymap" -msgstr "Rumunų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:58 -msgid "Russian Sun keymap" -msgstr "Rusų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:59 -msgid "Serbian Sun standard keymap" -msgstr "Serbų Sun standartinis išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:61 -msgid "Slovak Sun keymap" -msgstr "Slovakų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:62 -msgid "Slovenian Sun keymap" -msgstr "Slovėnų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:63 -msgid "Spanish Sun Type-4 keymap" -msgstr "Ispanų Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:64 -msgid "Spanish Sun USB keymap" -msgstr "Ispanų Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:65 -msgid "Spanish Sun keymap" -msgstr "Ispanų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:66 -msgid "Swedish Sun Type-4 keymap" -msgstr "Švedų Sun Type-4 išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:67 -msgid "Swedish Sun USB keymap" -msgstr "Švedų Sun USB išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:68 -msgid "Swedish Sun keymap" -msgstr "Švedų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:69 -msgid "Swiss German Sun keymap" -msgstr "Šveicarų Vokiečių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:70 -msgid "Thai Sun keymap" -msgstr "Tailandiečių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:71 -msgid "Turkish Sun keymap" -msgstr "Turkų Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:72 -msgid "US Sun Type-4 keymap" -msgstr "US Sun Type-4 klaviatūra" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:73 -msgid "US Sun USB keymap" -msgstr "US Sun USB klaviatūra" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:74 -msgid "US Sun type5 keymap" -msgstr "US Sun type5 klaviatūra" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:75 -msgid "Ukrainian Sun keymap" -msgstr "Ukrainiečių Sun išdėstymas" - -#: ../gkb-new/xmodmap.sun/base.xml.in.h:76 -msgid "Vietnamese Sun keymap" -msgstr "Vietnamiečių Sun išdėstymas" - #: ../gweather/gweather-about.c:50 msgid "© 1999-2005 by S. Papadimitriou and others" msgstr "© 1999-2005 S. Papadimitriou ir kiti" @@ -1516,24 +905,26 @@ msgid "_Details" msgstr "_Išsamiau" -#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:215 +#: ../gweather/gweather-applet.c:118 +#: ../gweather/gweather-dialog.c:215 msgid "_Update" msgstr "_Atnaujinti" #: ../gweather/gweather-applet.c:329 -#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4 +#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3 msgid "Weather Report" msgstr "Orų prognozė" -#: ../gweather/gweather-applet.c:347 ../gweather/gweather-applet.c:351 +#: ../gweather/gweather-applet.c:347 +#: ../gweather/gweather-applet.c:351 msgid "GNOME Weather" msgstr "GNOME oras" -#: ../gweather/gweather-applet.c:453 +#: ../gweather/gweather-applet.c:452 msgid "Weather Forecast" msgstr "Orų prognozė" -#: ../gweather/gweather-applet.c:465 +#: ../gweather/gweather-applet.c:464 #, c-format msgid "" "City: %s\n" @@ -1544,7 +935,7 @@ "Dangus: %s\n" "Temperatūra: %s" -#: ../gweather/gweather-applet.c:515 +#: ../gweather/gweather-applet.c:513 msgid "Updating..." msgstr "Atnaujinama..." @@ -1552,91 +943,91 @@ msgid "Details" msgstr "Išsami informacija" -#: ../gweather/gweather-dialog.c:256 +#: ../gweather/gweather-dialog.c:255 msgid "City:" msgstr "Miestas:" -#: ../gweather/gweather-dialog.c:264 +#: ../gweather/gweather-dialog.c:263 msgid "Last update:" msgstr "Paskutinis atnaujinimas:" -#: ../gweather/gweather-dialog.c:272 +#: ../gweather/gweather-dialog.c:271 msgid "Conditions:" msgstr "Sąlygos:" -#: ../gweather/gweather-dialog.c:280 +#: ../gweather/gweather-dialog.c:279 msgid "Sky:" msgstr "Dangus:" -#: ../gweather/gweather-dialog.c:288 +#: ../gweather/gweather-dialog.c:287 msgid "Temperature:" msgstr "Temperatūra:" -#: ../gweather/gweather-dialog.c:296 +#: ../gweather/gweather-dialog.c:295 msgid "Feels like:" msgstr "Jaučiama kaip:" -#: ../gweather/gweather-dialog.c:304 +#: ../gweather/gweather-dialog.c:303 msgid "Dew point:" msgstr "Rasos taškas:" -#: ../gweather/gweather-dialog.c:312 +#: ../gweather/gweather-dialog.c:311 msgid "Relative humidity:" msgstr "Santykinis drėgnumas:" -#: ../gweather/gweather-dialog.c:320 +#: ../gweather/gweather-dialog.c:319 msgid "Wind:" msgstr "Vėjas:" -#: ../gweather/gweather-dialog.c:328 +#: ../gweather/gweather-dialog.c:327 msgid "Pressure:" msgstr "Slėgis:" -#: ../gweather/gweather-dialog.c:336 +#: ../gweather/gweather-dialog.c:335 msgid "Visibility:" msgstr "Matomumas:" -#: ../gweather/gweather-dialog.c:344 +#: ../gweather/gweather-dialog.c:343 msgid "Sunrise:" msgstr "Saulėtekis:" -#: ../gweather/gweather-dialog.c:352 +#: ../gweather/gweather-dialog.c:351 msgid "Sunset:" msgstr "Saulėlydis:" -#: ../gweather/gweather-dialog.c:486 +#: ../gweather/gweather-dialog.c:485 msgid "Current Conditions" msgstr "Dabartinės sąlygos" -#: ../gweather/gweather-dialog.c:503 +#: ../gweather/gweather-dialog.c:502 msgid "Forecast Report" msgstr "Prognozės ataskaita" -#: ../gweather/gweather-dialog.c:503 +#: ../gweather/gweather-dialog.c:502 msgid "See the ForeCast Details" msgstr "Žiūrėti išsamesnę prognozę" -#: ../gweather/gweather-dialog.c:513 +#: ../gweather/gweather-dialog.c:512 msgid "Forecast" msgstr "Prognozė" -#: ../gweather/gweather-dialog.c:521 +#: ../gweather/gweather-dialog.c:520 msgid "Radar Map" msgstr "Radarinis žemėlapis" -#: ../gweather/gweather-dialog.c:552 +#: ../gweather/gweather-dialog.c:551 msgid "_Visit Weather.com" msgstr "_Aplankyti Weather.com" -#: ../gweather/gweather-dialog.c:553 +#: ../gweather/gweather-dialog.c:552 msgid "Visit Weather.com" msgstr "Aplankyti Weather.com" -#: ../gweather/gweather-dialog.c:553 +#: ../gweather/gweather-dialog.c:552 msgid "Click to Enter Weather.com" msgstr "Spustelėkite, jei norite aplankyti Weather.com" -#: ../gweather/gweather-dialog.c:638 +#: ../gweather/gweather-dialog.c:637 msgid "Forecast not currently available for this location." msgstr "Šiuo metu prognozė šiai vietovei yra neprieinama." @@ -1665,16 +1056,16 @@ msgid "Enter the URL" msgstr "Įveskite URL" -#: ../gweather/gweather-pref.c:317 -msgid "" -"Failed to load the Locations XML database. Please report this as a bug." +#: ../gweather/gweather-pref.c:315 +msgid "Failed to load the Locations XML database. Please report this as a bug." msgstr "Nepavyko įkelti vietovių XML duomenų bazės. Praneškite apie klaidą" -#: ../gweather/gweather-pref.c:807 +#: ../gweather/gweather-pref.c:805 msgid "Weather Preferences" msgstr "Oro sąlygų stebyklės nustatymai" -#: ../gweather/gweather-pref.c:839 ../gweather/gweather-pref.c:1024 +#: ../gweather/gweather-pref.c:836 +#: ../gweather/gweather-pref.c:1021 msgid "_Automatically update every:" msgstr "_Automatiškai atnaujinti kas:" @@ -1682,479 +1073,571 @@ #. * Units settings page. #. #. Temperature Unit -#: ../gweather/gweather-pref.c:852 +#: ../gweather/gweather-pref.c:849 msgid "_Temperature unit:" msgstr "_Temperatūros vienetai:" -#: ../gweather/gweather-pref.c:861 ../gweather/gweather-pref.c:881 -#: ../gweather/gweather-pref.c:907 ../gweather/gweather-pref.c:935 +#: ../gweather/gweather-pref.c:858 +#: ../gweather/gweather-pref.c:878 +#: ../gweather/gweather-pref.c:904 +#: ../gweather/gweather-pref.c:932 msgid "Default" msgstr "Numatytieji" -#: ../gweather/gweather-pref.c:862 +#: ../gweather/gweather-pref.c:859 msgid "Kelvin" msgstr "Kelvino" #. TRANSLATORS: Celsius is sometimes referred Centigrade -#: ../gweather/gweather-pref.c:864 +#: ../gweather/gweather-pref.c:861 msgid "Celsius" msgstr "Celsijaus" -#: ../gweather/gweather-pref.c:865 +#: ../gweather/gweather-pref.c:862 msgid "Fahrenheit" msgstr "Farenheito" #. Speed Unit -#: ../gweather/gweather-pref.c:872 +#: ../gweather/gweather-pref.c:869 msgid "_Wind speed unit:" msgstr "_Vėjo greičio vienetai:" #. TRANSLATOR: The wind speed unit "meters per second" -#: ../gweather/gweather-pref.c:883 +#: ../gweather/gweather-pref.c:880 msgid "m/s" msgstr "m/s" #. TRANSLATOR: The wind speed unit "kilometers per hour" -#: ../gweather/gweather-pref.c:885 +#: ../gweather/gweather-pref.c:882 msgid "km/h" msgstr "km/h" #. TRANSLATOR: The wind speed unit "miles per hour" -#: ../gweather/gweather-pref.c:887 +#: ../gweather/gweather-pref.c:884 msgid "mph" msgstr "mph" #. TRANSLATOR: The wind speed unit "knots" -#: ../gweather/gweather-pref.c:889 +#: ../gweather/gweather-pref.c:886 msgid "knots" msgstr "mazgai" -#: ../gweather/gweather-pref.c:891 +#: ../gweather/gweather-pref.c:888 msgid "Beaufort scale" msgstr "Boforto skalė" #. Pressure Unit -#: ../gweather/gweather-pref.c:898 +#: ../gweather/gweather-pref.c:895 msgid "_Pressure unit:" msgstr "_Slėgio vienetai:" #. TRANSLATOR: The pressure unit "kiloPascals" -#: ../gweather/gweather-pref.c:909 +#: ../gweather/gweather-pref.c:906 msgid "kPa" msgstr "kPa" #. TRANSLATOR: The pressure unit "hectoPascals" -#: ../gweather/gweather-pref.c:911 +#: ../gweather/gweather-pref.c:908 msgid "hPa" msgstr "hPa" #. TRANSLATOR: The pressure unit "millibars" -#: ../gweather/gweather-pref.c:913 +#: ../gweather/gweather-pref.c:910 msgid "mb" msgstr "mb" #. TRANSLATOR: The pressure unit "millibars of mercury" -#: ../gweather/gweather-pref.c:915 +#: ../gweather/gweather-pref.c:912 msgid "mmHg" msgstr "mmHg" #. TRANSLATOR: The pressure unit "inches of mercury" -#: ../gweather/gweather-pref.c:917 +#: ../gweather/gweather-pref.c:914 msgid "inHg" msgstr "colHg" #. TRANSLATOR: The pressure unit "atmospheres" -#: ../gweather/gweather-pref.c:919 +#: ../gweather/gweather-pref.c:916 msgid "atm" msgstr "atm" #. Distance Unit -#: ../gweather/gweather-pref.c:926 +#: ../gweather/gweather-pref.c:923 msgid "_Visibility unit:" msgstr "_Matomumo vienetai:" #. TRANSLATOR: The distance unit "meters" -#: ../gweather/gweather-pref.c:937 +#: ../gweather/gweather-pref.c:934 msgid "meters" msgstr "metrai" #. TRANSLATOR: The distance unit "kilometers" -#: ../gweather/gweather-pref.c:939 +#: ../gweather/gweather-pref.c:936 msgid "km" msgstr "km" #. TRANSLATOR: The distance unit "miles" -#: ../gweather/gweather-pref.c:941 +#: ../gweather/gweather-pref.c:938 msgid "miles" msgstr "mylios" -#: ../gweather/gweather-pref.c:975 +#: ../gweather/gweather-pref.c:972 msgid "Enable _radar map" msgstr "Įjungti _radarinį žemėlapį" -#: ../gweather/gweather-pref.c:989 +#: ../gweather/gweather-pref.c:986 msgid "Use _custom address for radar map" msgstr "Naudoti _pasirinktinį adresą radaro žemėlapiui" -#: ../gweather/gweather-pref.c:1006 +#: ../gweather/gweather-pref.c:1003 msgid "A_ddress:" msgstr "A_dresas:" -#: ../gweather/gweather-pref.c:1020 +#: ../gweather/gweather-pref.c:1017 msgid "Update" msgstr "Atnaujinimas" -#: ../gweather/gweather-pref.c:1044 +#: ../gweather/gweather-pref.c:1041 msgid "minutes" msgstr "minutę (-čių)" -#: ../gweather/gweather-pref.c:1060 +#: ../gweather/gweather-pref.c:1057 msgid "Display" msgstr "Rodymas" -#: ../gweather/gweather-pref.c:1075 -#: ../mini-commander/src/mini-commander.ui.h:9 +#: ../gweather/gweather-pref.c:1072 +#: ../mini-commander/src/mini-commander.ui.h:12 msgid "General" msgstr "Pagrindiniai" -#: ../gweather/gweather-pref.c:1088 +#: ../gweather/gweather-pref.c:1085 msgid "_Select a location:" msgstr "_Pasirinkite vietovę:" -#: ../gweather/gweather-pref.c:1113 +#: ../gweather/gweather-pref.c:1110 msgid "_Find:" msgstr "_Rasti:" -#: ../gweather/gweather-pref.c:1120 +#: ../gweather/gweather-pref.c:1117 msgid "Find _Next" msgstr "Rasti _kitą" -#: ../gweather/gweather-pref.c:1142 +#: ../gweather/gweather-pref.c:1139 msgid "Location" msgstr "Vietovė" #: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1 -msgid "Factory for creating the weather applet." -msgstr "Gamykla oro įtaisui sukurti." - -#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2 msgid "Gweather Applet Factory" msgstr "Gweather įtaiso gamykla" -#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3 +#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2 +msgid "Factory for creating the weather applet." +msgstr "Gamykla oro įtaisui sukurti." + +#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4 msgid "Monitor the current weather conditions, and forecasts" msgstr "Stebėkite esamas oro sąlygas ir prognozes" -#: ../invest-applet/data/Invest_Applet.server.in.in.h:1 +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:1 +#| msgid "Geyes Applet Factory" +msgid "Invest Applet Factory" +msgstr "Investicijų įtaiso gamykla" + +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:2 +#| msgid "Factory for creating the weather applet." +msgid "Factory for creating the invest applet." +msgstr "Gamykla investicijų įtaisui sukurti." + +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:3 #: ../invest-applet/invest/about.py:17 msgid "Invest" msgstr "Investuokite" -#: ../invest-applet/data/Invest_Applet.server.in.in.h:2 +#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:4 #: ../invest-applet/invest/about.py:20 msgid "Track your invested money." msgstr "Stebėkite savo investicijas." -#: ../invest-applet/data/Invest_Applet.xml.h:4 -msgid "_Refresh" -msgstr "_Atnaujinti" - #: ../invest-applet/data/financialchart.ui.h:1 -msgid "1 Year" -msgstr "1 metai" +#: ../invest-applet/invest/chart.py:112 +msgid "Financial Chart" +msgstr "Finansinis grafikas" #: ../invest-applet/data/financialchart.ui.h:2 -msgid "10" -msgstr "10" +msgid "_Ticker symbol: " +msgstr "_Slenkančios eilutės simbolis: " #: ../invest-applet/data/financialchart.ui.h:3 -msgid "100" -msgstr "100" +msgid "Auto _refresh" +msgstr "Automatinis at_naujinimas" #: ../invest-applet/data/financialchart.ui.h:4 -msgid "20" -msgstr "20" +msgid "Today" +msgstr "Šiandien" #: ../invest-applet/data/financialchart.ui.h:5 -msgid "200" -msgstr "200" +msgid "5 Days" +msgstr "5 dienos" #: ../invest-applet/data/financialchart.ui.h:6 msgid "3 Months" msgstr "3 mėnesiai" #: ../invest-applet/data/financialchart.ui.h:7 -msgid "5" -msgstr "5" +msgid "6 Months" +msgstr "6 mėnesiai" #: ../invest-applet/data/financialchart.ui.h:8 -msgid "5 Days" -msgstr "5 dienos" +msgid "1 Year" +msgstr "1 metai" #: ../invest-applet/data/financialchart.ui.h:9 msgid "5 Years" msgstr "5 metai" #: ../invest-applet/data/financialchart.ui.h:10 -msgid "50" -msgstr "50" +msgid "Maximum" +msgstr "Didžiausias" #: ../invest-applet/data/financialchart.ui.h:11 -msgid "6 Months" -msgstr "6 mėnesiai" - -#: ../invest-applet/data/financialchart.ui.h:12 -msgid "Auto _refresh" -msgstr "Automatinis at_naujinimas" - -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide13.html and http://en.wikipedia.org/wiki/Bollinger_bands -#: ../invest-applet/data/financialchart.ui.h:14 -msgid "Bollinger" -msgstr "Bolindžeris" +msgid "_Graph style: " +msgstr "_Grafiko stilius: " -#: ../invest-applet/data/financialchart.ui.h:15 -msgid "Downloading chart from Yahoo!" -msgstr "Atsiųsti grafiką iš Yahoo!" +#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average +#: ../invest-applet/data/financialchart.ui.h:13 +msgid "Moving average: " +msgstr "Slankusis vidurkis: " #. see http://biz.yahoo.com/charts/guide12.html and http://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average -#: ../invest-applet/data/financialchart.ui.h:17 +#: ../invest-applet/data/financialchart.ui.h:15 msgid "Exponential moving average: " msgstr "Eksponentinis slankusis vidurkis: " -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator +#: ../invest-applet/data/financialchart.ui.h:16 +msgid "5" +msgstr "5" + +#: ../invest-applet/data/financialchart.ui.h:17 +msgid "10" +msgstr "10" + +#: ../invest-applet/data/financialchart.ui.h:18 +msgid "20" +msgstr "20" + #: ../invest-applet/data/financialchart.ui.h:19 -msgid "Fast stoch" -msgstr "Greita stochastika" +msgid "50" +msgstr "50" #: ../invest-applet/data/financialchart.ui.h:20 -#: ../invest-applet/invest/chart.py:107 -msgid "Financial Chart" -msgstr "Finansinis grafikas" +msgid "100" +msgstr "100" -#. see http://biz.yahoo.com/charts/guide10.html and http://en.wikipedia.org/wiki/Technical_indicator#Charting_terms_and_indicators -#: ../invest-applet/data/financialchart.ui.h:22 -msgid "Indicators: " -msgstr "Indikatoriai: " +#: ../invest-applet/data/financialchart.ui.h:21 +msgid "200" +msgstr "200" -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/MACD -#: ../invest-applet/data/financialchart.ui.h:24 -msgid "MACD" -msgstr "MACD" +#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays +#: ../invest-applet/data/financialchart.ui.h:23 +msgid "Overlays: " +msgstr "Perdengimai: " -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Money_flow_index -#: ../invest-applet/data/financialchart.ui.h:26 -msgid "MFI" -msgstr "MFI" +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide13.html and http://en.wikipedia.org/wiki/Bollinger_bands +#: ../invest-applet/data/financialchart.ui.h:25 +msgid "Bollinger" +msgstr "Bolindžeris" +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide16.html and http://en.wikipedia.org/wiki/Parabolic_SAR #: ../invest-applet/data/financialchart.ui.h:27 -msgid "Maximum" -msgstr "Didžiausias" +msgid "SAR" +msgstr "SAR" -#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide6.html and http://en.wikipedia.org/wiki/Stock_split #: ../invest-applet/data/financialchart.ui.h:29 -msgid "Moving average: " -msgstr "Slankusis vidurkis: " +msgid "Splits" +msgstr "Padalinimai" -#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays +#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide20.html and http://en.wikipedia.org/wiki/Volume_%28finance%29 #: ../invest-applet/data/financialchart.ui.h:31 -msgid "Overlays: " -msgstr "Perdengimai: " +msgid "Volumes" +msgstr "Kiekiai" -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Rate_of_change_%28technical_analysis%29 +#. see http://biz.yahoo.com/charts/guide10.html and http://en.wikipedia.org/wiki/Technical_indicator#Charting_terms_and_indicators #: ../invest-applet/data/financialchart.ui.h:33 -msgid "ROC" -msgstr "ROC" +msgid "Indicators: " +msgstr "Indikatoriai: " #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Relative_Strength_Index #: ../invest-applet/data/financialchart.ui.h:35 msgid "RSI" msgstr "RSI" -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide16.html and http://en.wikipedia.org/wiki/Parabolic_SAR +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29 #: ../invest-applet/data/financialchart.ui.h:37 -msgid "SAR" -msgstr "SAR" +msgid "Vol" +msgstr "Kiek" -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Money_flow_index #: ../invest-applet/data/financialchart.ui.h:39 -msgid "Slow stoch" -msgstr "Lėta stochastika" +msgid "MFI" +msgstr "MFI" -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide6.html and http://en.wikipedia.org/wiki/Stock_split +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator #: ../invest-applet/data/financialchart.ui.h:41 -msgid "Splits" -msgstr "Padalinimai" - -#: ../invest-applet/data/financialchart.ui.h:42 -msgid "Today" -msgstr "Šiandien" - -#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29 -#: ../invest-applet/data/financialchart.ui.h:44 -msgid "Vol" -msgstr "Kiek" +msgid "Slow stoch" +msgstr "Lėta stochastika" #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29 -#: ../invest-applet/data/financialchart.ui.h:46 +#: ../invest-applet/data/financialchart.ui.h:43 msgid "Vol+MA" msgstr "Kiekiai+MA" -#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide20.html and http://en.wikipedia.org/wiki/Volume_%28finance%29 -#: ../invest-applet/data/financialchart.ui.h:48 -msgid "Volumes" -msgstr "Kiekiai" +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Rate_of_change_%28technical_analysis%29 +#: ../invest-applet/data/financialchart.ui.h:45 +msgid "ROC" +msgstr "ROC" + +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator +#: ../invest-applet/data/financialchart.ui.h:47 +msgid "Fast stoch" +msgstr "Greita stochastika" #. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Williams_%25R -#: ../invest-applet/data/financialchart.ui.h:51 +#: ../invest-applet/data/financialchart.ui.h:50 #, no-c-format msgid "W%R" msgstr "W%R" +#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/MACD #: ../invest-applet/data/financialchart.ui.h:52 -msgid "_Graph style: " -msgstr "_Grafiko stilius: " +msgid "MACD" +msgstr "MACD" #: ../invest-applet/data/financialchart.ui.h:53 -msgid "_Options" -msgstr "_Parinktys" +#| msgid "minute" +#| msgid_plural "minutes" +msgid "Line" +msgstr "Eilutė" #: ../invest-applet/data/financialchart.ui.h:54 -msgid "_Ticker symbol: " -msgstr "_Slenkančios eilutės simbolis: " +msgid "Bar" +msgstr "Juosta" -#: ../invest-applet/data/prefs-dialog.ui.h:1 -msgid "" -"Note: Quotes are delayed at least 15 minutes.\n" -"Source: Yahoo!" -msgstr "" -"Pastaba: Įrašai vėluoja bent 15 minučių.\n" -"Šaltinis: Yahoo!" +#: ../invest-applet/data/financialchart.ui.h:55 +#| msgid "Command line" +msgid "Candle" +msgstr "Žvakė" + +#: ../invest-applet/data/financialchart.ui.h:56 +msgid "Scale: " +msgstr "Skalė:" + +#: ../invest-applet/data/financialchart.ui.h:57 +msgid "Linear" +msgstr "Tiesinė" + +#: ../invest-applet/data/financialchart.ui.h:58 +msgid "Logarithmic" +msgstr "Logaritminė" -#: ../invest-applet/data/prefs-dialog.ui.h:3 -msgid "Currency" -msgstr "Valiuta" +#: ../invest-applet/data/financialchart.ui.h:59 +msgid "_Options" +msgstr "_Parinktys" -#: ../invest-applet/data/prefs-dialog.ui.h:4 +#: ../invest-applet/data/financialchart.ui.h:60 +msgid "Downloading chart from Yahoo!" +msgstr "Atsiųsti grafiką iš Yahoo!" + +#: ../invest-applet/data/prefs-dialog.ui.h:1 msgid "Invest Preferences" msgstr "Invest nustatymai" -#: ../invest-applet/data/prefs-dialog.ui.h:5 +#: ../invest-applet/data/prefs-dialog.ui.h:2 +msgid "label" +msgstr "užrašas" + +#: ../invest-applet/data/prefs-dialog.ui.h:3 msgid "Stocks" msgstr "Akcijos" -#: ../invest-applet/data/prefs-dialog.ui.h:6 -msgid "label" -msgstr "užrašas" +#. Instead of adding a single stock to the list of stocks, the 'Add Group' button adds a group (kind of a sub folder) to which numerous stocks can be added. A group here refers to a group of stocks. +#: ../invest-applet/data/prefs-dialog.ui.h:5 +#| msgid "_Groups" +msgctxt " " +msgid "Add Group" +msgstr "Pridėti grupę" + +#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to also show the quotes of the stocks an index is based on. +#: ../invest-applet/data/prefs-dialog.ui.h:7 +msgid "Show stocks of index values" +msgstr "Rodyti akcijų indeksų vertes" + +#: ../invest-applet/data/prefs-dialog.ui.h:8 +msgid "An index value, for instance the NASDAQ Composite (^IXIC), is based on a number of stocks. This option allows to also show the quotes of the stocks an index is based on." +msgstr "Indekso vertė, pavyzdžiui NASDAQ Composite (^IXIC) , yra grindžiama keliomis akcijomis. Tai leidžia taip pat rodyti akcijas, kuriomis grindžiamas indeksas." + +#: ../invest-applet/data/prefs-dialog.ui.h:9 +msgid "Hide charts in quotes list" +msgstr "Slėpti grafikus iš sąrašo" + +#: ../invest-applet/data/prefs-dialog.ui.h:10 +msgid "A small chart image is shown next to each quote. The retrieval of each chart image causes network traffic. Hiding charts reduces the network bandwidth demand significantly." +msgstr "Mažas grafiko paveikslėlis rodomas kiekvienai vertei. Kiekvieno paveikslėlio gavimas sukelio tinklo srautą. Grafikų slėpimas reikšmingai sumažina tinklo srautą." + +#: ../invest-applet/data/prefs-dialog.ui.h:11 +msgid "Source: Yahoo! Finance (at least 15 minutes delayed)" +msgstr "Šaltinis: Yahoo! Finance (rodoma su bent 15 minučių delsa)" + +#: ../invest-applet/data/prefs-dialog.ui.h:12 +msgid "Currency" +msgstr "Valiuta" + +#: ../invest-applet/data/prefs-dialog.ui.h:13 +msgid "Type the target currency to which all stock quotes will be converted to." +msgstr "Tikslo valiuda, į kurią bus konvertuojamos visos akcijų vertės." + +#. name, stock_id, label, accellerator, tooltip, callback +#: ../invest-applet/invest/applet.py:24 +#| msgid "_About" +msgid "About" +msgstr "Apie" + +#: ../invest-applet/invest/applet.py:25 +#| msgid "_Help" +msgid "Help" +msgstr "Žinynas" + +#: ../invest-applet/invest/applet.py:26 +#| msgid "_Preferences" +msgid "Preferences" +msgstr "Nustatymai" + +#: ../invest-applet/invest/applet.py:27 +#| msgid "_Refresh" +msgid "Refresh" +msgstr "Atnaujinti" #. a) We aren't configured yet -#: ../invest-applet/invest/applet.py:50 +#: ../invest-applet/invest/applet.py:60 msgid "You have not entered any stock information yet" msgstr "Neįvedėte akcijų informacijos" -#: ../invest-applet/invest/applet.py:55 +#: ../invest-applet/invest/applet.py:65 msgid "No stock quotes are currently available" msgstr "Akcijų verčių negauta" -#: ../invest-applet/invest/applet.py:56 -msgid "" -"The server could not be contacted. The computer is either offline or the " -"servers are down. Try again later." -msgstr "" -"Nepavyko susisiekti su serveriu. Kompiuteris išjungtas arba serveriai " -"nepasiekiami. Bandykite vėliau." +#: ../invest-applet/invest/applet.py:66 +msgid "The server could not be contacted. The computer is either offline or the servers are down. Try again later." +msgstr "Nepavyko susisiekti su serveriu. Kompiuteris išjungtas arba serveriai nepasiekiami. Bandykite vėliau." -#: ../invest-applet/invest/chart.py:156 +#: ../invest-applet/invest/chart.py:161 #, python-format msgid "Financial Chart - %s" msgstr "Finansinis grafikas – %s" -#: ../invest-applet/invest/chart.py:223 +#: ../invest-applet/invest/chart.py:228 msgid "Opening Chart" msgstr "Atveriamas grafikas" -#: ../invest-applet/invest/chart.py:238 +#: ../invest-applet/invest/chart.py:243 msgid "Chart downloaded" msgstr "Grafikas parsiųstas" -#: ../invest-applet/invest/chart.py:240 +#: ../invest-applet/invest/chart.py:245 msgid "Chart could not be downloaded" msgstr "Grafiko parsiųsti nepavyko" -#: ../invest-applet/invest/invest-applet.py:41 -msgid "Invest Applet" -msgstr "Invest įtaisas" - -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Symbol" msgstr "Simbolis" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Label" msgstr "Užrašas" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Amount" msgstr "Kiekis" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Price" msgstr "Kaina" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Commission" msgstr "Komisiniai" -#: ../invest-applet/invest/preferences.py:31 +#: ../invest-applet/invest/preferences.py:44 msgid "Currency Rate" msgstr "Valiutos kursas" -#: ../invest-applet/invest/quotes.py:131 +#: ../invest-applet/invest/preferences.py:244 +msgid "Stock Group" +msgstr "Akcijų grupė" + +#. translators: Asks the user to confirm deletion of a group of stocks +#: ../invest-applet/invest/preferences.py:269 +#| msgid "Delete this sticky note?" +msgid "Delete entire stock group?" +msgstr "Ištrinti visą akcijų grupę?" + +#. translators: stocks can be grouped together into a "stock group". +#. The user wants to delete a group, but the group still contains stocks. +#. By deleting the group, also all stocks will be removed from configuration +#: ../invest-applet/invest/preferences.py:277 +msgid "" +"This removes all stocks contained in this stock group!\n" +"Do you really want to remove this stock group?" +msgstr "" +"Tai pašalina visas akcijas iš šios grupės!\n" +"Ar tikrai norite pašalinti šią akcijų grupę?" + +#: ../invest-applet/invest/quotes.py:284 msgid "Invest could not connect to Yahoo! Finance" msgstr "Invest nepavyko prisijungti prie Yahoo! Finance" -#. Translators: %s is an hour (%H:%M) -#: ../invest-applet/invest/quotes.py:134 ../invest-applet/invest/quotes.py:163 -#, python-format -msgid "Updated at %s" -msgstr "Atnaujinta %s" - #. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s gets replaced with the string value of the change (localized), including the percent sign. -#: ../invest-applet/invest/quotes.py:153 +#: ../invest-applet/invest/quotes.py:327 #, python-format msgid "Average change: %s" msgstr "Vidutinis pokytis: %s" #. Translators: This is share-market jargon. It refers to the total difference between the current price and purchase price for all the shares put together for a particular currency. i.e. How much money would be earned if they were sold right now. The first string is the change value, the second the currency, and the third value is the percentage of the change, formatted using user's locale. -#: ../invest-applet/invest/quotes.py:162 +#: ../invest-applet/invest/quotes.py:336 #, python-format msgid "Positions balance: %s %s (%s)" msgstr "Pozicijų balansas: %s %s (%s)" +#: ../invest-applet/invest/quotes.py:338 +#, python-format +msgid "Updated at %s" +msgstr "Atnaujinta %s" + #. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB #. Translators: these words all refer to a stock. Last is short #. for "last price". Gain is referring to the gain since the #. stock was purchased. -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Ticker" msgstr "Skydelis" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Last" msgstr "Paskutinis" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Change %" msgstr "Pokytis %" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Chart" msgstr "Grafikas" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Gain" msgstr "Augimas" -#: ../invest-applet/invest/widgets.py:51 +#: ../invest-applet/invest/widgets.py:52 msgid "Gain %" msgstr "Augimas %" @@ -2167,27 +1650,23 @@ msgstr "Deskbar (atnaujinimas nuo Mini-Commander)" #: ../mini-commander/src/about.c:48 -msgid "" -"This GNOME applet adds a command line to the panel. It features command " -"completion, command history, and changeable macros." -msgstr "" -"Šis GNOME įtaisas įdeda į skydelį komandų eilutę. Jame yra komandų " -"pabaigimas, komandų istorija ir keičiamos makro komandos." +msgid "This GNOME applet adds a command line to the panel. It features command completion, command history, and changeable macros." +msgstr "Šis GNOME įtaisas įdeda į skydelį komandų eilutę. Jame yra komandų pabaigimas, komandų istorija ir keičiamos makro komandos." -#: ../mini-commander/src/command_line.c:345 +#: ../mini-commander/src/command_line.c:362 msgid "No items in history" msgstr "Įrašų istorijoje nėra" #. build file select dialog -#: ../mini-commander/src/command_line.c:469 +#: ../mini-commander/src/command_line.c:488 msgid "Start program" msgstr "Paleisti programą" -#: ../mini-commander/src/command_line.c:522 +#: ../mini-commander/src/command_line.c:541 msgid "Command line" msgstr "Komandinė eilutė" -#: ../mini-commander/src/command_line.c:523 +#: ../mini-commander/src/command_line.c:542 msgid "Type a command here and Gnome will execute it for you" msgstr "Įveskite čia komandą – GNOME ją įvykdys" @@ -2209,9 +1688,7 @@ #: ../mini-commander/src/mc-install-default-macros.c:129 #, c-format msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n" -msgstr "" -"Yra nustatyta GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL, todėl schemas nebus " -"diegiamos\n" +msgstr "Yra nustatyta GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL, todėl schemas nebus diegiamos\n" #: ../mini-commander/src/mc-install-default-macros.c:137 #, c-format @@ -2229,205 +1706,201 @@ msgstr "Klaida suvienodinant nustatymų duomenis: %s " #: ../mini-commander/src/mini-commander-global.schemas.in.h:1 -msgid "List of GConfValue entries containing strings for the macro commands." -msgstr "GConfValue elementų, turinčių makrokomandų eilutes, sąrašas." +#: ../mini-commander/src/mini-commander.schemas.in.h:26 +msgid "Macro pattern list" +msgstr "Makrokomandų šablonų sąrašas" #: ../mini-commander/src/mini-commander-global.schemas.in.h:2 msgid "List of GConfValue entries containing strings for the macro patterns." msgstr "GConfValue elementų, turinčių makrokomandų šablonų eilutes, sąrašas" #: ../mini-commander/src/mini-commander-global.schemas.in.h:3 -#: ../mini-commander/src/mini-commander.schemas.in.h:10 +#: ../mini-commander/src/mini-commander.schemas.in.h:28 msgid "Macro command list" msgstr "Makrokomandų sąrašas" #: ../mini-commander/src/mini-commander-global.schemas.in.h:4 -#: ../mini-commander/src/mini-commander.schemas.in.h:11 -msgid "Macro pattern list" -msgstr "Makrokomandų šablonų sąrašas" +msgid "List of GConfValue entries containing strings for the macro commands." +msgstr "GConfValue elementų, turinčių makrokomandų eilutes, sąrašas." #: ../mini-commander/src/mini-commander.ui.h:1 -msgid "Add New Macro" -msgstr "Pridėti naują makrokomandą" +msgid "Command Line Preferences" +msgstr "Komandinės eilutės nustatymai" #: ../mini-commander/src/mini-commander.ui.h:2 msgid "Auto Completion" msgstr "Automatinis užbaigimas" #: ../mini-commander/src/mini-commander.ui.h:3 -msgid "Co_mmand:" -msgstr "Ko_manda:" +msgid "E_nable history-based auto completion" +msgstr "L_eisti istorija paremtą auto-papildymą" -#: ../mini-commander/src/mini-commander.ui.h:4 ../multiload/properties.c:571 -msgid "Colors" -msgstr "Spalvos" +#: ../mini-commander/src/mini-commander.ui.h:4 +msgid "Size" +msgstr "Dydis" #: ../mini-commander/src/mini-commander.ui.h:5 -msgid "Command Line Preferences" -msgstr "Komandinės eilutės nustatymai" +#: ../stickynotes/stickynotes.ui.h:19 +msgid "_Width:" +msgstr "_Plotis:" #: ../mini-commander/src/mini-commander.ui.h:6 -msgid "Command line _background:" -msgstr "Komandinės eilutės _fonas:" +#: ../multiload/properties.c:524 +msgid "pixels" +msgstr "taškų" #: ../mini-commander/src/mini-commander.ui.h:7 -msgid "Command line _foreground:" -msgstr "Komandinės eilutės _priekinis planas:" +#: ../multiload/properties.c:569 +msgid "Colors" +msgstr "Spalvos" #: ../mini-commander/src/mini-commander.ui.h:8 -msgid "E_nable history-based auto completion" -msgstr "L_eisti istorija paremtą auto-papildymą" +msgid "_Use default theme colors" +msgstr "_Naudoti numatytąsias temos spalvas" + +#: ../mini-commander/src/mini-commander.ui.h:9 +msgid "Command line _foreground:" +msgstr "Komandinės eilutės _priekinis planas:" #: ../mini-commander/src/mini-commander.ui.h:10 -msgid "Macros" -msgstr "Makrokomandos" +msgid "Command line _background:" +msgstr "Komandinės eilutės _fonas:" #: ../mini-commander/src/mini-commander.ui.h:11 msgid "Pick a color" msgstr "Pasirinkite spalvą" -#: ../mini-commander/src/mini-commander.ui.h:12 -msgid "Size" -msgstr "Dydis" - #: ../mini-commander/src/mini-commander.ui.h:13 +msgid "_Macros:" +msgstr "_Makrokomandos:" + +#: ../mini-commander/src/mini-commander.ui.h:14 msgid "_Add Macro..." msgstr "_Pridėti makrokomandą..." -#: ../mini-commander/src/mini-commander.ui.h:14 +#: ../mini-commander/src/mini-commander.ui.h:15 msgid "_Delete Macro" msgstr "_Pašalinti makrokomandą" -#: ../mini-commander/src/mini-commander.ui.h:15 -msgid "_Macros:" -msgstr "_Makrokomandos:" - #: ../mini-commander/src/mini-commander.ui.h:16 -msgid "_Pattern:" -msgstr "_Šablonas:" +msgid "Macros" +msgstr "Makrokomandos" #: ../mini-commander/src/mini-commander.ui.h:17 -msgid "_Use default theme colors" -msgstr "_Naudoti numatytąsias temos spalvas" +msgid "Add New Macro" +msgstr "Pridėti naują makrokomandą" #: ../mini-commander/src/mini-commander.ui.h:18 -#: ../stickynotes/stickynotes.ui.h:46 -msgid "_Width:" -msgstr "_Plotis:" +msgid "_Pattern:" +msgstr "_Šablonas:" -#: ../mini-commander/src/mini-commander.ui.h:19 ../multiload/properties.c:526 -msgid "pixels" -msgstr "taškų" +#: ../mini-commander/src/mini-commander.ui.h:19 +msgid "Co_mmand:" +msgstr "Ko_manda:" #: ../mini-commander/src/mini-commander.schemas.in.h:1 -msgid "Attempt to autocomplete a command from the history of commands entered." -msgstr "" -"Bandyti automatiškai užbaigti vesti komandą remiantis įvestų komandų " -"retrospektyva." +msgid "Show handle" +msgstr "Rodyti rankenėlę" #: ../mini-commander/src/mini-commander.schemas.in.h:2 -msgid "Background color, blue component" -msgstr "Fono spalva, mėlynas komponentas" +msgid "Show a handle so the applet can be detached from the panel." +msgstr "Rodyti rankeną, kad būtų galima atkabinti įtaisą nuo skydelio." #: ../mini-commander/src/mini-commander.schemas.in.h:3 -msgid "Background color, green component" -msgstr "Fono spalva, žalias komponentas" +msgid "Show frame" +msgstr "Rodyti rėmelį" #: ../mini-commander/src/mini-commander.schemas.in.h:4 -msgid "Background color, red component" -msgstr "Fono spalva, raudonas komponentas" +msgid "Show a frame surrounding the applet." +msgstr "Rodyti aplink įtaisą rėmelį." #: ../mini-commander/src/mini-commander.schemas.in.h:5 -msgid "Foreground color, blue component" -msgstr "Pirmo plano spalva, mėlynas komponentas" +msgid "Perform history autocompletion" +msgstr "Automatiškai užbaigti remiantis retrospektyva" #: ../mini-commander/src/mini-commander.schemas.in.h:6 -msgid "Foreground color, green component" -msgstr "Pirmo plano spalva, žalias komponentas" +msgid "Attempt to autocomplete a command from the history of commands entered." +msgstr "Bandyti automatiškai užbaigti vesti komandą remiantis įvestų komandų retrospektyva." #: ../mini-commander/src/mini-commander.schemas.in.h:7 -msgid "Foreground color, red component" -msgstr "Pirmo plano spalva, raudonas komponentas" +msgid "Width" +msgstr "Plotis" #: ../mini-commander/src/mini-commander.schemas.in.h:8 -msgid "History list" -msgstr "Žurnalas" +msgid "Width of the applet" +msgstr "Priedo plotis" #: ../mini-commander/src/mini-commander.schemas.in.h:9 -msgid "List of GConfValue entries containing strings for history entries." -msgstr "GConfValue elementų, turinčių istorijos žurnalo eilutes, sąrašas." - -#: ../mini-commander/src/mini-commander.schemas.in.h:12 msgid "Not used anymore" msgstr "Daugiau nebenaudojamas" +#: ../mini-commander/src/mini-commander.schemas.in.h:10 +msgid "Use the default theme colors" +msgstr "Naudoti numatytasias temos spalvas" + +#: ../mini-commander/src/mini-commander.schemas.in.h:11 +msgid "Use theme colors instead of custom ones." +msgstr "Naudoti temos spalvas vietoje pasirinktų." + +#: ../mini-commander/src/mini-commander.schemas.in.h:12 +msgid "Foreground color, red component" +msgstr "Pirmo plano spalva, raudonas komponentas" + #: ../mini-commander/src/mini-commander.schemas.in.h:13 -msgid "Perform history autocompletion" -msgstr "Automatiškai užbaigti remiantis retrospektyva" +msgid "The red component of the foreground color." +msgstr "Priekinio plano spalvos raudonas komponentas." #: ../mini-commander/src/mini-commander.schemas.in.h:14 -msgid "Show a frame surrounding the applet." -msgstr "Rodyti aplink įtaisą rėmelį." +msgid "Foreground color, green component" +msgstr "Pirmo plano spalva, žalias komponentas" #: ../mini-commander/src/mini-commander.schemas.in.h:15 -msgid "Show a handle so the applet can be detached from the panel." -msgstr "Rodyti rankeną, kad būtų galima atkabinti įtaisą nuo skydelio." +msgid "The green component of the foreground color." +msgstr "Priekinio plano spalvos žalias komponentas." #: ../mini-commander/src/mini-commander.schemas.in.h:16 -msgid "Show frame" -msgstr "Rodyti rėmelį" +msgid "Foreground color, blue component" +msgstr "Pirmo plano spalva, mėlynas komponentas" #: ../mini-commander/src/mini-commander.schemas.in.h:17 -msgid "Show handle" -msgstr "Rodyti rankenėlę" +msgid "The blue component of the foreground color." +msgstr "Priekinio plano spalvos mėlynas komponentas." #: ../mini-commander/src/mini-commander.schemas.in.h:18 -msgid "The blue component of the background color." -msgstr "Fono spalvos mėlynas elementas." +msgid "Background color, red component" +msgstr "Fono spalva, raudonas komponentas" #: ../mini-commander/src/mini-commander.schemas.in.h:19 -msgid "The blue component of the foreground color." -msgstr "Priekinio plano spalvos mėlynas komponentas." +msgid "The red component of the background color." +msgstr "Fono spalvos raudonas komponentas." #: ../mini-commander/src/mini-commander.schemas.in.h:20 -msgid "The green component of the background color." -msgstr "Fono spalvos žalias komponentas." +msgid "Background color, green component" +msgstr "Fono spalva, žalias komponentas" #: ../mini-commander/src/mini-commander.schemas.in.h:21 -msgid "The green component of the foreground color." -msgstr "Priekinio plano spalvos žalias komponentas." +msgid "The green component of the background color." +msgstr "Fono spalvos žalias komponentas." #: ../mini-commander/src/mini-commander.schemas.in.h:22 -msgid "The red component of the background color." -msgstr "Fono spalvos raudonas komponentas." +msgid "Background color, blue component" +msgstr "Fono spalva, mėlynas komponentas" #: ../mini-commander/src/mini-commander.schemas.in.h:23 -msgid "The red component of the foreground color." -msgstr "Priekinio plano spalvos raudonas komponentas." +msgid "The blue component of the background color." +msgstr "Fono spalvos mėlynas elementas." #: ../mini-commander/src/mini-commander.schemas.in.h:24 -msgid "" -"This per-applet key is deprecated in favour of the global key, /schemas/apps/" -"mini-commander-global/macro_patterns." -msgstr "" -"Šis kiekvienam įtaisui atskiras raktas yra nebenaudojamas dėl naujo, " -"globalaus rakto, /schemas/apps/mini-commander-global/macro_patterns." +msgid "History list" +msgstr "Žurnalas" #: ../mini-commander/src/mini-commander.schemas.in.h:25 -msgid "Use the default theme colors" -msgstr "Naudoti numatytasias temos spalvas" - -#: ../mini-commander/src/mini-commander.schemas.in.h:26 -msgid "Use theme colors instead of custom ones." -msgstr "Naudoti temos spalvas vietoje pasirinktų." +msgid "List of GConfValue entries containing strings for history entries." +msgstr "GConfValue elementų, turinčių istorijos žurnalo eilutes, sąrašas." #: ../mini-commander/src/mini-commander.schemas.in.h:27 -msgid "Width" -msgstr "Plotis" - -#: ../mini-commander/src/mini-commander.schemas.in.h:28 -msgid "Width of the applet" -msgstr "Priedo plotis" +msgid "This per-applet key is deprecated in favour of the global key, /schemas/apps/mini-commander-global/macro_patterns." +msgstr "Šis kiekvienam įtaisui atskiras raktas yra nebenaudojamas dėl naujo, globalaus rakto, /schemas/apps/mini-commander-global/macro_patterns." #: ../mini-commander/src/mini-commander_applet.c:242 #: ../mini-commander/src/mini-commander_applet.c:246 @@ -2451,27 +1924,27 @@ msgid "Command line has been disabled by your system administrator" msgstr "Komandinė eilutė buvo išjungta sistemos administratoriaus" -#: ../mini-commander/src/mini-commander_applet.c:361 -#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1 +#: ../mini-commander/src/mini-commander_applet.c:360 +#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2 msgid "Command Line" msgstr "Komandinė eilutė" -#: ../mini-commander/src/mini-commander_applet.c:407 +#: ../mini-commander/src/mini-commander_applet.c:406 msgid "Mini-Commander applet" msgstr "Mini-Commander įtaisas" -#: ../mini-commander/src/mini-commander_applet.c:408 +#: ../mini-commander/src/mini-commander_applet.c:407 msgid "This applet adds a command line to the panel" msgstr "Šis įtaisas į skydelį įdeda komandinę eilutę" -#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2 -msgid "Mini-Commander" -msgstr "Komandinė eilutė" - -#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3 +#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1 msgid "MiniCommander Applet Factory" msgstr "MiniCommander įtaiso gamykla" +#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3 +msgid "Mini-Commander" +msgstr "Komandinė eilutė" + #: ../mini-commander/src/preferences.c:401 msgid "You must specify a pattern" msgstr "Turite nurodyti raštą" @@ -2488,57 +1961,49 @@ msgid "You may not specify duplicate patterns" msgstr "Negalite nurodyti dubliuotų raštų" -#: ../mini-commander/src/preferences.c:773 +#: ../mini-commander/src/preferences.c:779 msgid "Pattern" msgstr "Raštas" -#: ../mini-commander/src/preferences.c:783 +#: ../mini-commander/src/preferences.c:789 msgid "Command" msgstr "Komanda" -#: ../mixer/applet.c:184 +#: ../mixer/applet.c:179 msgid "Volume Applet" msgstr "Garsumo įtaisas" #. tooltip over applet -#: ../mixer/applet.c:200 ../mixer/applet.c:221 ../null_applet/null_applet.c:44 -#: ../null_applet/null_applet.c:46 +#: ../mixer/applet.c:195 +#: ../mixer/applet.c:216 +#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:1 +#: ../null_applet/null_applet.c:55 +#: ../null_applet/null_applet.c:57 msgid "Volume Control" msgstr "Garsumo valdymas" -#: ../mixer/applet.c:384 +#: ../mixer/applet.c:378 msgid "_Open Volume Control" msgstr "_Atverti garso valdymą" -#: ../mixer/applet.c:398 +#: ../mixer/applet.c:392 msgid "Mu_te" msgstr "_Nutildyti" -#: ../mixer/applet.c:564 -msgid "" -"The volume control did not find any elements and/or devices to control. This " -"means either that you don't have the right GStreamer plugins installed, or " -"that you don't have a sound card configured." -msgstr "" -"Garsumo valdymo programa nerado jokių kontroliuotinų elementų ir/arba " -"įrenginių. Tai reiškia, kad neturite įdiegtų reikiamų GStreamer įskiepių, " -"arba garso plokštė yra nesukonfigūruota." - -#: ../mixer/applet.c:568 -msgid "" -"You can remove the volume control from the panel by right-clicking the " -"speaker icon on the panel and selecting \"Remove From Panel\" from the menu." -msgstr "" -"Galite pašalinti garso kontrolę iš skydelio paspaudę dešinįjį klavišą ant " -"garsiakalbio piktogramos, esančios skydelyje, ir meniu pasirinkę „Pašalinti " -"iš skydelio“." +#: ../mixer/applet.c:558 +msgid "The volume control did not find any elements and/or devices to control. This means either that you don't have the right GStreamer plugins installed, or that you don't have a sound card configured." +msgstr "Garsumo valdymo programa nerado jokių kontroliuotinų elementų ir/arba įrenginių. Tai reiškia, kad neturite įdiegtų reikiamų GStreamer įskiepių, arba garso plokštė yra nesukonfigūruota." + +#: ../mixer/applet.c:562 +msgid "You can remove the volume control from the panel by right-clicking the speaker icon on the panel and selecting \"Remove From Panel\" from the menu." +msgstr "Galite pašalinti garso kontrolę iš skydelio paspaudę dešinįjį klavišą ant garsiakalbio piktogramos, esančios skydelyje, ir meniu pasirinkę „Pašalinti iš skydelio“." -#: ../mixer/applet.c:754 +#: ../mixer/applet.c:745 #, c-format msgid "Failed to start Volume Control: %s" msgstr "Nepavyko paleisti Garsumo valdymo: %s" -#: ../mixer/applet.c:1203 +#: ../mixer/applet.c:1160 #, c-format msgid "%s: muted" msgstr "%s: nutildytas" @@ -2547,29 +2012,29 @@ #. * to mark as a translation, but anyway. The string is a list of #. * selected tracks, the number is the volume in percent. You #. * most likely want to keep this as-is. -#: ../mixer/applet.c:1209 +#: ../mixer/applet.c:1166 #, c-format msgid "%s: %d%%" msgstr "%s: %d%%" -#: ../mixer/applet.c:1445 +#: ../mixer/applet.c:1402 #, c-format msgid "Failed to display help: %s" msgstr "Nepavyko parodyti žinyno: %s" -#: ../mixer/applet.c:1458 +#: ../mixer/applet.c:1415 msgid "Volume control for your GNOME Panel." msgstr "Garsumo valdymas GNOME skydelyje." -#: ../mixer/applet.c:1459 +#: ../mixer/applet.c:1416 msgid "Using GStreamer 0.10." msgstr "Naudojama GStreamer 0.10" -#: ../mixer/dock.c:218 +#: ../mixer/dock.c:219 msgid "Mute" msgstr "Nutildyti" -#: ../mixer/dock.c:224 +#: ../mixer/dock.c:225 msgid "Volume Control..." msgstr "Garsumo valdymas..." @@ -2590,12 +2055,16 @@ msgid "Saved volume to restore on startup" msgstr "Išsaugotas garsumo lygis atstatomas paleidmo metu" +#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:2 +msgid "Adjust the sound volume" +msgstr "Reguliuoti garsumą" + #. make window look cute #: ../mixer/preferences.c:90 msgid "Volume Control Preferences" msgstr "Garsumo valdymo nustatymai" -#: ../mixer/preferences.c:103 +#: ../mixer/preferences.c:102 msgid "Select the device and track to control." msgstr "Pasirinkite valdomą įrenginį ir takelį." @@ -2607,12 +2076,13 @@ msgid "_Deactivate" msgstr "_Deaktyvuoti" -#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:43 +#: ../modemlights/modem-applet.c:148 +#: ../stickynotes/stickynotes.ui.h:4 msgid "_Properties" msgstr "_Savybės" #: ../modemlights/modem-applet.c:184 -#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2 +#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1 msgid "Modem Monitor" msgstr "Modemo stebyklė" @@ -2630,31 +2100,20 @@ msgstr "Neprijungta" #: ../modemlights/modem-applet.c:752 -msgid "" -"To connect to your Internet service provider, you need administrator " -"privileges" -msgstr "" -"Norint prisijungti prie Interneto paslaugų tiekėjo, reikalingos " -"administratoriaus privilegijos" +msgid "To connect to your Internet service provider, you need administrator privileges" +msgstr "Norint prisijungti prie Interneto paslaugų tiekėjo, reikalingos administratoriaus privilegijos" #: ../modemlights/modem-applet.c:753 -msgid "" -"To disconnect from your Internet service provider, you need administrator " -"privileges" -msgstr "" -"Norint atsijungti nuo Interneto paslaugų tiekėjo, reikalingos " -"administratoriaus privilegijos" +msgid "To disconnect from your Internet service provider, you need administrator privileges" +msgstr "Norint atsijungti nuo Interneto paslaugų tiekėjo, reikalingos administratoriaus privilegijos" #: ../modemlights/modem-applet.c:828 msgid "The entered password is invalid" msgstr "Įvestas slaptažodis yra netinkamas" #: ../modemlights/modem-applet.c:830 -msgid "" -"Check that you have typed it correctly and that you haven't activated the " -"\"caps lock\" key" -msgstr "" -"Patikrinkite ar įvedėte teisingai, ir ar neaktyvavote „Caps Lock“ klavišo" +msgid "Check that you have typed it correctly and that you haven't activated the \"caps lock\" key" +msgstr "Patikrinkite ar įvedėte teisingai, ir ar neaktyvavote „Caps Lock“ klavišo" #: ../modemlights/modem-applet.c:932 msgid "Do you want to connect?" @@ -2677,78 +2136,80 @@ msgstr "Nepavyko paleisti tinklo konfigūravimo įrankio" #: ../modemlights/modem-applet.c:997 -msgid "" -"Check that it's installed in the correct path and that it has the correct " -"permissions" -msgstr "" -"Patikrinkite ar jis įdiegtas teisingame kelyje, ir ar turite teises jį " -"paleisti" +msgid "Check that it's installed in the correct path and that it has the correct permissions" +msgstr "Patikrinkite ar jis įdiegtas teisingame kelyje, ir ar turite teises jį paleisti" #: ../modemlights/modem-applet.c:1020 msgid "Applet for activating and monitoring a dial-up network connection." msgstr "Įtaisas skirtas aktyvuoti ir stebėti telefoninio ryšio prijungimą." #: ../modemlights/modemlights.ui.h:1 -msgid "Connecting with Internet Service Provider" -msgstr "Jungiamasi prie Interneto paslaugų tiekėjo" - -#: ../modemlights/modemlights.ui.h:2 msgid "Enter password" msgstr "Įveskite slaptažodį" +#: ../modemlights/modemlights.ui.h:2 +msgid "Root password required" +msgstr "Reikalingas administratoriaus slaptažodis" + #: ../modemlights/modemlights.ui.h:3 msgid "Password:" msgstr "Slaptažodis:" #: ../modemlights/modemlights.ui.h:4 -msgid "Root password required" -msgstr "Reikalingas administratoriaus slaptažodis" +msgid "Connecting with Internet Service Provider" +msgstr "Jungiamasi prie Interneto paslaugų tiekėjo" -#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1 +#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2 msgid "Activate and monitor a dial-up network connection" msgstr "Aktyvuoti ir stebėti telefoninio ryšio prisijungimą" #: ../multiload/main.c:56 -msgid "" -"A system load monitor capable of displaying graphs for CPU, ram, and swap " -"space use, plus network traffic." -msgstr "" -"Sistemos apkrovos stebyklė, galinti grafiškai rodyti procesoriaus, RAM, swap " -"failo ir tinklo apkrovą." +msgid "A system load monitor capable of displaying graphs for CPU, ram, and swap space use, plus network traffic." +msgstr "Sistemos apkrovos stebyklė, galinti grafiškai rodyti procesoriaus, RAM, swap failo ir tinklo apkrovą." -#: ../multiload/main.c:124 +#: ../multiload/main.c:129 +#| msgid "System Monitor" +msgid "Start system-monitor" +msgstr "Paleisti sistemos stebyklę" + +#: ../multiload/main.c:150 #, c-format msgid "There was an error executing '%s': %s" msgstr "Įvyko klaida vykdant „%s“: %s" -#: ../multiload/main.c:252 ../multiload/properties.c:596 +#: ../multiload/main.c:278 +#: ../multiload/properties.c:594 msgid "Processor" msgstr "Procesorius" -#: ../multiload/main.c:254 ../multiload/properties.c:604 +#: ../multiload/main.c:280 +#: ../multiload/properties.c:602 msgid "Memory" msgstr "Atmintis" -#: ../multiload/main.c:256 ../multiload/properties.c:612 +#: ../multiload/main.c:282 +#: ../multiload/properties.c:610 msgid "Network" msgstr "Tinklas" -#: ../multiload/main.c:258 ../multiload/properties.c:619 +#: ../multiload/main.c:284 +#: ../multiload/properties.c:617 msgid "Swap Space" msgstr "Swap talpa" -#: ../multiload/main.c:260 ../multiload/main.c:339 +#: ../multiload/main.c:286 +#: ../multiload/main.c:365 msgid "Load Average" msgstr "Apkrovos vidurkis" -#: ../multiload/main.c:262 +#: ../multiload/main.c:288 msgid "Disk" msgstr "Diskas" #. xgettext: use and cache are > 1 most of the time, #. please assume that they always are. #. -#: ../multiload/main.c:278 +#: ../multiload/main.c:304 #, c-format msgid "" "%s:\n" @@ -2759,13 +2220,13 @@ "%u%% naudojama programų\n" "%u%% naudojama kaip podėlis" -#: ../multiload/main.c:286 +#: ../multiload/main.c:312 #, c-format msgid "The system load average is %0.02f" msgstr "Sistemos apkrovos vidurkis yra %0.02f" #. xgettext: same as in graphic tab of g-s-m -#: ../multiload/main.c:294 +#: ../multiload/main.c:320 #, c-format msgid "" "%s:\n" @@ -2776,7 +2237,7 @@ "Gaunama %s\n" "Siunčiama %s" -#: ../multiload/main.c:310 +#: ../multiload/main.c:336 #, c-format msgid "" "%s:\n" @@ -2794,158 +2255,154 @@ "%s:\n" "naudojama %u%% " -#: ../multiload/main.c:335 +#: ../multiload/main.c:361 msgid "CPU Load" msgstr "CPU apkrova" -#: ../multiload/main.c:336 +#: ../multiload/main.c:362 msgid "Memory Load" msgstr "Atminties apkrova" -#: ../multiload/main.c:337 +#: ../multiload/main.c:363 msgid "Net Load" msgstr "Tinklo apkrovimas" -#: ../multiload/main.c:338 +#: ../multiload/main.c:364 msgid "Swap Load" msgstr "Swap apkrova" -#: ../multiload/main.c:340 +#: ../multiload/main.c:366 msgid "Disk Load" msgstr "Disko apkrova" -#: ../multiload/main.c:436 +#: ../multiload/main.c:462 msgid "_Open System Monitor" msgstr "_Atverti sistemos stebyklę" -#: ../multiload/main.c:464 -#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2 +#: ../multiload/main.c:490 +#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1 msgid "System Monitor" msgstr "Sistemos stebyklė" #: ../multiload/multiload.schemas.in.h:1 -msgid "Applet refresh rate in milliseconds" -msgstr "Įtaiso atnaujinimo dažnis milisekundėmis" +msgid "Enable CPU load graph" +msgstr "Įjungti CPU apkrovos grafiką" #: ../multiload/multiload.schemas.in.h:2 -msgid "Background color for disk load graph" -msgstr "Disko apkrovos grafiko fono spalva" +msgid "Enable memory load graph" +msgstr "Įjungti atminties apkrovos grafiką" #: ../multiload/multiload.schemas.in.h:3 -msgid "CPU graph background color" -msgstr "CPU grafiko fono spalva" +msgid "Enable network load graph" +msgstr "Įjungti tinklo apkrovos grafiką" #: ../multiload/multiload.schemas.in.h:4 -msgid "Enable CPU load graph" -msgstr "Įjungti CPU apkrovos grafiką" +msgid "Enable swap load graph" +msgstr "Įjungti swap apkrovos grafiką" #: ../multiload/multiload.schemas.in.h:5 -msgid "Enable disk load graph" -msgstr "Įjungti disko apkrovos grafiką" - -#: ../multiload/multiload.schemas.in.h:6 msgid "Enable load average graph" msgstr "Įjungti vidutinės apkrovos grafiką" +#: ../multiload/multiload.schemas.in.h:6 +msgid "Enable disk load graph" +msgstr "Įjungti disko apkrovos grafiką" + #: ../multiload/multiload.schemas.in.h:7 -msgid "Enable memory load graph" -msgstr "Įjungti atminties apkrovos grafiką" +msgid "Applet refresh rate in milliseconds" +msgstr "Įtaiso atnaujinimo dažnis milisekundėmis" #: ../multiload/multiload.schemas.in.h:8 -msgid "Enable network load graph" -msgstr "Įjungti tinklo apkrovos grafiką" +msgid "Graph size" +msgstr "Grafiko dydis" #: ../multiload/multiload.schemas.in.h:9 -msgid "Enable swap load graph" -msgstr "Įjungti swap apkrovos grafiką" +msgid "For horizontal panels, the width of the graphs in pixels. For vertical panels, this is the height of the graphs." +msgstr "Horizontaliems skydeliams, grafikų plotis taškais. Vertikaliems skydeliams, tai yra grafikų aukštis." #: ../multiload/multiload.schemas.in.h:10 -msgid "" -"For horizontal panels, the width of the graphs in pixels. For vertical " -"panels, this is the height of the graphs." -msgstr "" -"Horizontaliems skydeliams, grafikų plotis taškais. Vertikaliems skydeliams, " -"tai yra grafikų aukštis." +msgid "Graph color for user-related CPU activity" +msgstr "Grafiko, susijusio su vartotojo CPU veikla, spalva" #: ../multiload/multiload.schemas.in.h:11 -msgid "Graph color for buffer memory" -msgstr "Buferio atminties grafiko spalva" +msgid "Graph color for system-related CPU activity" +msgstr "Grafiko, susijusio su sistemos CPU veikla, spalva" #: ../multiload/multiload.schemas.in.h:12 -msgid "Graph color for cached memory" -msgstr "Sparčiosios atmintinės grafiko spalva" +msgid "Graph color for nice-related CPU activity" +msgstr "Grafiko, susijusio su nice CPU veikla, spalva" #: ../multiload/multiload.schemas.in.h:13 -msgid "Graph color for disk read" -msgstr "Disko skaitymo grafiko spalva" +msgid "Graph color for iowait related CPU activity" +msgstr "CPU veiklos, susijusios su iowait, grafiko spalva" #: ../multiload/multiload.schemas.in.h:14 -msgid "Graph color for disk write" -msgstr "Disko rašymo grafiko spalva" +msgid "CPU graph background color" +msgstr "CPU grafiko fono spalva" #: ../multiload/multiload.schemas.in.h:15 -msgid "Graph color for input network activity" -msgstr "Tinklo gaunamų duomenų grafiko spalva" +msgid "Graph color for user-related memory usage" +msgstr "Grafiko, susijusio su vartotojo naudojama atmintimi, spalva" #: ../multiload/multiload.schemas.in.h:16 -msgid "Graph color for iowait related CPU activity" -msgstr "CPU veiklos, susijusios su iowait, grafiko spalva" +msgid "Graph color for shared memory" +msgstr "Bendrai naudojamos atminties grafiko spalva" #: ../multiload/multiload.schemas.in.h:17 -msgid "Graph color for load average" -msgstr "Vidutinės apkrovos grafiko spalva" +msgid "Graph color for buffer memory" +msgstr "Buferio atminties grafiko spalva" #: ../multiload/multiload.schemas.in.h:18 -msgid "Graph color for loopback network usage" -msgstr "„Loopback“ tinklo grafiko spalva" +msgid "Graph color for cached memory" +msgstr "Sparčiosios atmintinės grafiko spalva" #: ../multiload/multiload.schemas.in.h:19 -msgid "Graph color for nice-related CPU activity" -msgstr "Grafiko, susijusio su nice CPU veikla, spalva" +msgid "Memory graph background color" +msgstr "Atminties grafiko fono spalva" #: ../multiload/multiload.schemas.in.h:20 -msgid "Graph color for output network activity" -msgstr "Tinklo siunčiamų duomenų grafiko spalva" +msgid "Graph color for input network activity" +msgstr "Tinklo gaunamų duomenų grafiko spalva" #: ../multiload/multiload.schemas.in.h:21 -msgid "Graph color for shared memory" -msgstr "Bendrai naudojamos atminties grafiko spalva" +msgid "Graph color for output network activity" +msgstr "Tinklo siunčiamų duomenų grafiko spalva" #: ../multiload/multiload.schemas.in.h:22 -msgid "Graph color for system-related CPU activity" -msgstr "Grafiko, susijusio su sistemos CPU veikla, spalva" +msgid "Graph color for loopback network usage" +msgstr "„Loopback“ tinklo grafiko spalva" #: ../multiload/multiload.schemas.in.h:23 -msgid "Graph color for user-related CPU activity" -msgstr "Grafiko, susijusio su vartotojo CPU veikla, spalva" +msgid "Network graph background color" +msgstr "Tinklo grafiko fono spalva" #: ../multiload/multiload.schemas.in.h:24 -msgid "Graph color for user-related memory usage" -msgstr "Grafiko, susijusio su vartotojo naudojama atmintimi, spalva" - -#: ../multiload/multiload.schemas.in.h:25 msgid "Graph color for user-related swap usage" msgstr "Grafiko, susijusio su vartotojo swap naudojimu, spalva" +#: ../multiload/multiload.schemas.in.h:25 +msgid "Swap graph background color" +msgstr "Mainų srities grafiko fono spalva" + #: ../multiload/multiload.schemas.in.h:26 -msgid "Graph size" -msgstr "Grafiko dydis" +msgid "Graph color for load average" +msgstr "Vidutinės apkrovos grafiko spalva" #: ../multiload/multiload.schemas.in.h:27 msgid "Load graph background color" msgstr "Apkrovos grafiko fono spalva" #: ../multiload/multiload.schemas.in.h:28 -msgid "Memory graph background color" -msgstr "Atminties grafiko fono spalva" +msgid "Graph color for disk read" +msgstr "Disko skaitymo grafiko spalva" #: ../multiload/multiload.schemas.in.h:29 -msgid "Network graph background color" -msgstr "Tinklo grafiko fono spalva" +msgid "Graph color for disk write" +msgstr "Disko rašymo grafiko spalva" #: ../multiload/multiload.schemas.in.h:30 -msgid "Swap graph background color" -msgstr "Mainų srities grafiko fono spalva" +msgid "Background color for disk load graph" +msgstr "Disko apkrovos grafiko fono spalva" #: ../multiload/multiload.schemas.in.h:31 msgid "The desktop description file to execute as the system monitor" @@ -2956,220 +2413,170 @@ msgid "%s/s" msgstr "%s/s" -#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1 +#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2 msgid "A system load indicator" msgstr "Sistemos apkrovos indikatorius" -#: ../multiload/properties.c:357 +#: ../multiload/properties.c:355 msgid "Monitored Resources" msgstr "Stebimi ištekliai" -#: ../multiload/properties.c:382 +#: ../multiload/properties.c:380 msgid "_Processor" msgstr "_Procesorius" -#: ../multiload/properties.c:395 +#: ../multiload/properties.c:393 msgid "_Memory" msgstr "_Atmintis" -#: ../multiload/properties.c:408 +#: ../multiload/properties.c:406 msgid "_Network" msgstr "_Tinklas" -#: ../multiload/properties.c:421 +#: ../multiload/properties.c:419 msgid "S_wap Space" msgstr "_Mainų srities vieta" -#: ../multiload/properties.c:434 +#: ../multiload/properties.c:432 msgid "_Load" msgstr "_Apkrova" -#: ../multiload/properties.c:447 +#: ../multiload/properties.c:445 msgid "_Harddisk" msgstr "_Standusis diskas" -#: ../multiload/properties.c:463 +#: ../multiload/properties.c:461 msgid "Options" msgstr "Nustatymai" -#: ../multiload/properties.c:493 +#: ../multiload/properties.c:491 msgid "System m_onitor width: " msgstr "Sistemos stebėtuvo plotis:" -#: ../multiload/properties.c:495 +#: ../multiload/properties.c:493 msgid "System m_onitor height: " msgstr "Sistemos stebėtuvo aukštis:" -#: ../multiload/properties.c:534 +#: ../multiload/properties.c:532 msgid "Sys_tem monitor update interval: " msgstr "Sis_temos stebėtuvo atnaujinimo intervalas:" -#: ../multiload/properties.c:560 +#: ../multiload/properties.c:558 msgid "milliseconds" msgstr "milisekundžių" -#: ../multiload/properties.c:598 ../multiload/properties.c:606 +#: ../multiload/properties.c:596 +#: ../multiload/properties.c:604 msgid "_User" msgstr "_Naudotojas" -#: ../multiload/properties.c:599 +#: ../multiload/properties.c:597 msgid "S_ystem" msgstr "S_istema" -#: ../multiload/properties.c:600 +#: ../multiload/properties.c:598 msgid "N_ice" msgstr "N_ice" -#: ../multiload/properties.c:601 +#: ../multiload/properties.c:599 msgid "I_OWait" msgstr "I_OLaukimas" -#: ../multiload/properties.c:602 +#: ../multiload/properties.c:600 msgid "I_dle" msgstr "Ne_veikli" -#: ../multiload/properties.c:607 +#: ../multiload/properties.c:605 msgid "Sh_ared" msgstr "Be_ndra" -#: ../multiload/properties.c:608 +#: ../multiload/properties.c:606 msgid "_Buffers" msgstr "_Buferiai" -#: ../multiload/properties.c:609 +#: ../multiload/properties.c:607 msgid "Cach_ed" msgstr "K_ešuota" -#: ../multiload/properties.c:610 +#: ../multiload/properties.c:608 msgid "F_ree" msgstr "L_aisva" -#: ../multiload/properties.c:614 +#: ../multiload/properties.c:612 msgid "_In" msgstr "_Į" -#: ../multiload/properties.c:615 +#: ../multiload/properties.c:613 msgid "_Out" msgstr "_Iš" -#: ../multiload/properties.c:616 +#: ../multiload/properties.c:614 msgid "_Local" msgstr "_Vietinis" -#: ../multiload/properties.c:617 ../multiload/properties.c:627 -#: ../multiload/properties.c:633 +#: ../multiload/properties.c:615 +#: ../multiload/properties.c:625 +#: ../multiload/properties.c:631 msgid "_Background" msgstr "_Fonas" -#: ../multiload/properties.c:621 +#: ../multiload/properties.c:619 msgid "_Used" msgstr "_Užimta" -#: ../multiload/properties.c:622 +#: ../multiload/properties.c:620 msgid "_Free" msgstr "_Laisva" -#: ../multiload/properties.c:624 +#: ../multiload/properties.c:622 msgid "Load" msgstr "Apkrova" -#: ../multiload/properties.c:626 +#: ../multiload/properties.c:624 msgid "_Average" msgstr "_Vidurkis" -#: ../multiload/properties.c:629 +#: ../multiload/properties.c:627 msgid "Harddisk" msgstr "Standusis diskas" -#: ../multiload/properties.c:631 +#: ../multiload/properties.c:629 msgid "_Read" msgstr "_Skaitymas" -#: ../multiload/properties.c:632 +#: ../multiload/properties.c:630 msgid "_Write" msgstr "_Rašymas" -#: ../multiload/properties.c:657 +#: ../multiload/properties.c:655 msgid "System Monitor Preferences" msgstr "Sistemos stebėtuvo nustatymai" -#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:1 -msgid "CD Player (Deprecated)" -msgstr "CD grotuvas (pasenęs)" - -#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:2 -msgid "Panel applet for playing audio CDs" -msgstr "Skydelio įtaisas CD grojimui" - -#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:1 -msgid "Alert you when new mail arrives" -msgstr "Perspėti, kai gaunamas naujas paštas" - -#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:2 -msgid "Inbox Monitor (Deprecated)" -msgstr "Inbox stebyklė (nenaudojama)" - -#: ../null_applet/GNOME_MixerApplet.server.in.h:1 -msgid "Adjust the sound volume" -msgstr "Reguliuoti garsumą" - -#: ../null_applet/GNOME_MixerApplet.server.in.h:2 -msgid "Volume Control (Deprecated)" -msgstr "Garsumo valdymas (pasenęs)" - -#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:1 -msgid "Factory for deprecating applets" -msgstr "Įtaisų sendinimo gamykla" - -#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:2 -msgid "Null Applet Factory" -msgstr "Null įtaiso gamykla" - -#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:1 -msgid "Monitor the quality of a wireless network link" -msgstr "Stebėti bevielio tinklo ryšio kokybei" - -#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:2 -msgid "Wireless Link Monitor" -msgstr "Bevielio ryšio stebėtuvas" - -#: ../null_applet/GNOME_KeyboardApplet.server.in.h:1 -msgid "Keyboard Indicator (Deprecated)" -msgstr "Klaviatūros indikatorius (nebenaudotinas)" - -#: ../null_applet/GNOME_KeyboardApplet.server.in.h:2 -msgid "Keyboard layout indicator" -msgstr "Klaviatūros išdėstymo indikatorius" - -#: ../null_applet/null_applet.c:40 +#: ../null_applet/null_applet.c:51 msgid "Inbox Monitor" msgstr "Pranešimų stebyklė" -#: ../null_applet/null_applet.c:42 +#: ../null_applet/null_applet.c:53 msgid "CD Player" msgstr "CD grotuvas" -#: ../null_applet/null_applet.c:48 +#: ../null_applet/null_applet.c:59 msgid "Keyboard Indicator" msgstr "Klaviatūros indikatorius" -#: ../null_applet/null_applet.c:151 +#: ../null_applet/null_applet.c:157 msgid "Some panel items are no longer available" msgstr "Kai kurie skydelio elementai yra daugiau nebeprieinami" -#: ../null_applet/null_applet.c:152 -msgid "" -"One or more panel items (also referred to as applets) are no longer " -"available in the GNOME desktop." -msgstr "" -"Vienas ar keletas skydelio elementų (įtaisų) yra daugiau nebeprieinami GNOME " -"aplinkoje." +#: ../null_applet/null_applet.c:158 +msgid "One or more panel items (also referred to as applets) are no longer available in the GNOME desktop." +msgstr "Vienas ar keletas skydelio elementų (įtaisų) yra daugiau nebeprieinami GNOME aplinkoje." -#: ../null_applet/null_applet.c:154 +#: ../null_applet/null_applet.c:160 msgid "These items will now be removed from your configuration:" msgstr "Šie elementai dabar bus pašalinti iš konfigūracijos:" -#: ../null_applet/null_applet.c:157 +#: ../null_applet/null_applet.c:163 msgid "You will not receive this message again." msgstr "Ši žinutė Jums daugiau nebus rodoma." @@ -3182,349 +2589,307 @@ msgstr "Tomboy (sklandus lipnių raštelių atnaujinimas)" #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1 -msgid "Create, view, and manage sticky notes on the desktop" -msgstr "Kurkite, žiūrėkite ir tvarkykite lipnius darbastalio raštelius" +msgid "Sticky Notes Applet Factory" +msgstr "Lipnių raštelių priedo gamykla" #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2 -#: ../stickynotes/stickynotes_applet.c:148 -#: ../stickynotes/stickynotes_applet.c:429 +#: ../stickynotes/stickynotes_applet.c:146 +#: ../stickynotes/stickynotes_applet.c:427 msgid "Sticky Notes" msgstr "Lipnūs rašteliai" #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3 -msgid "Sticky Notes Applet Factory" -msgstr "Lipnių raštelių priedo gamykla" +msgid "Create, view, and manage sticky notes on the desktop" +msgstr "Kurkite, žiūrėkite ir tvarkykite lipnius darbastalio raštelius" -#: ../stickynotes/stickynotes.c:635 +#: ../stickynotes/stickynotes.c:630 msgid "This note is locked." msgstr "Šis raštelis yra užrakintas." -#: ../stickynotes/stickynotes.c:639 +#: ../stickynotes/stickynotes.c:634 msgid "This note is unlocked." msgstr "Šis raštelis yra atrakintas." #: ../stickynotes/stickynotes.ui.h:1 -msgid "Behavior" -msgstr "Veikimas" +#: ../stickynotes/stickynotes_applet.c:33 +msgid "_New Note" +msgstr "_Naujas raštelis" #: ../stickynotes/stickynotes.ui.h:2 -msgid "Choose a base color to use for all sticky notes" -msgstr "Pasirinkite pagrindo spalvą, naudotiną visuose lipniuose rašteliuose" +msgid "_Delete Note..." +msgstr "_Pašalinti raštelį..." #: ../stickynotes/stickynotes.ui.h:3 -msgid "Choose a color for the note" -msgstr "Pasirinkite raštelio spalvą" - -#: ../stickynotes/stickynotes.ui.h:4 -msgid "Choose a font for the note" -msgstr "Pasirinkite raštelio šriftą" +msgid "_Lock Note" +msgstr "_Užrakinti raštelį" #: ../stickynotes/stickynotes.ui.h:5 -msgid "Choose a font to use for all sticky notes" -msgstr "Pasirinkite šriftą, naudotiną visuose lipniuose rašteliuose" +msgid "Sticky Notes Preferences" +msgstr "Lipnių raštelių nustatymai" #: ../stickynotes/stickynotes.ui.h:6 -msgid "Choose if notes are visible on all workspaces" -msgstr "Pasirinkite, jeigu rašteliai yra matomi visose darbo erdvėse" +msgid "Default Note Properties" +msgstr "Numatytosios raštelio savybės" #: ../stickynotes/stickynotes.ui.h:7 -msgid "Choose if the default style is forced on all notes" -msgstr "" -"Pasirinkite, jeigu visuose rašteliuose priverstinai naudojamas numatytasis " -"stilius" +msgid "Choose a font to use for all sticky notes" +msgstr "Pasirinkite šriftą, naudotiną visuose lipniuose rašteliuose" #: ../stickynotes/stickynotes.ui.h:8 -msgid "Choose whether to hide all notes when selecting on the desktop" -msgstr "" -"Pasirinkite, ar norite paslėpti visus raštelius, kuomet pasirenkama " -"darbastalyje" +msgid "Pick a default sticky note font" +msgstr "Pasirinkite numatytąją lipnaus raštelio šriftą" #: ../stickynotes/stickynotes.ui.h:9 -msgid "Close note" -msgstr "Užverti raštelį" +msgid "_Font:" +msgstr "Šri_ftas:" #: ../stickynotes/stickynotes.ui.h:10 -msgid "Default Note Properties" -msgstr "Numatytosios raštelio savybės" +msgid "Use fo_nt from the system theme" +msgstr "Naudoti sistemos temos šri_ftą" #: ../stickynotes/stickynotes.ui.h:11 -msgid "Delete all sticky notes?" -msgstr "Ištrinti visus lipnius raštelius?" +msgid "Note C_olor:" +msgstr "Raštelio sp_alva:" #: ../stickynotes/stickynotes.ui.h:12 -msgid "Delete this sticky note?" -msgstr "Ištrinti šį lipnų raštelį?" +msgid "Font Co_lor:" +msgstr "Šrifto spa_lva:" #: ../stickynotes/stickynotes.ui.h:13 -msgid "Font C_olor:" -msgstr "Šrifto s_palva:" +msgid "Choose a base color to use for all sticky notes" +msgstr "Pasirinkite pagrindo spalvą, naudotiną visuose lipniuose rašteliuose" #: ../stickynotes/stickynotes.ui.h:14 -msgid "Font Co_lor:" -msgstr "Šrifto spa_lva:" +msgid "Pick a default sticky note color" +msgstr "Pasirinkite numatytąją lipnaus raštelio spalvą" #: ../stickynotes/stickynotes.ui.h:15 -msgid "Force _default color and font on notes" -msgstr "Priverstinai nau_doti numatytąjį šriftą ir spalvas" +msgid "Use co_lor from the system theme" +msgstr "Naudoti sistemos temos _spalvą" #: ../stickynotes/stickynotes.ui.h:16 -msgid "H_eight:" -msgstr "_Aukštis:" +msgid "Specify the default height (in pixels) of new notes" +msgstr "Nurodykite numatytąją naujų raštelių aukštį (taškais)" #: ../stickynotes/stickynotes.ui.h:17 -msgid "Hide notes when the des_ktop is clicked on" -msgstr "Paslėpti raštelius spustelėjus _darbastalyje" +msgid "Specify the default width (in pixels) of new notes" +msgstr "Nurodykite numatytąją naujų raštelių plotį (taškais)" #: ../stickynotes/stickynotes.ui.h:18 -msgid "Lock/Unlock note" -msgstr "Užrakinti/atrakinti raštelį" - -#: ../stickynotes/stickynotes.ui.h:19 -msgid "Note C_olor:" -msgstr "Raštelio sp_alva:" +msgid "H_eight:" +msgstr "_Aukštis:" #: ../stickynotes/stickynotes.ui.h:20 -msgid "Note _Color:" -msgstr "Raštelio _spalva:" +msgid "Behavior" +msgstr "Veikimas" #: ../stickynotes/stickynotes.ui.h:21 -msgid "Pick a color for the sticky note" -msgstr "Pasirinkite lipnaus raštelio spalvą" +msgid "Hide notes when the des_ktop is clicked on" +msgstr "Paslėpti raštelius spustelėjus _darbastalyje" #: ../stickynotes/stickynotes.ui.h:22 -msgid "Pick a default sticky note color" -msgstr "Pasirinkite numatytąją lipnaus raštelio spalvą" +msgid "Choose whether to hide all notes when selecting on the desktop" +msgstr "Pasirinkite, ar norite paslėpti visus raštelius, kuomet pasirenkama darbastalyje" #: ../stickynotes/stickynotes.ui.h:23 -msgid "Pick a default sticky note font" -msgstr "Pasirinkite numatytąją lipnaus raštelio šriftą" +msgid "Force _default color and font on notes" +msgstr "Priverstinai nau_doti numatytąjį šriftą ir spalvas" #: ../stickynotes/stickynotes.ui.h:24 -msgid "Pick a font for the sticky note" -msgstr "Pasirinkite lipnaus raštelio šriftą" +msgid "Choose if the default style is forced on all notes" +msgstr "Pasirinkite, jeigu visuose rašteliuose priverstinai naudojamas numatytasis stilius" #: ../stickynotes/stickynotes.ui.h:25 -msgid "Properties" -msgstr "Savybės" +msgid "_Put notes on all workspaces" +msgstr "_Patalpinti visuose darbalaukiuose" #: ../stickynotes/stickynotes.ui.h:26 -msgid "Resize note" -msgstr "Pakeisti raštelio dydį" +msgid "Choose if notes are visible on all workspaces" +msgstr "Pasirinkite, jeigu rašteliai yra matomi visose darbo erdvėse" #: ../stickynotes/stickynotes.ui.h:27 -msgid "Specify a title for the note" -msgstr "Nurodykite raštelio antraštę" +msgid "Delete this sticky note?" +msgstr "Ištrinti šį lipnų raštelį?" #: ../stickynotes/stickynotes.ui.h:28 -msgid "Specify the default height (in pixels) of new notes" -msgstr "Nurodykite numatytąją naujų raštelių aukštį (taškais)" +msgid "This cannot be undone." +msgstr "Veiksmas negali būti atšauktas." #: ../stickynotes/stickynotes.ui.h:29 -msgid "Specify the default width (in pixels) of new notes" -msgstr "Nurodykite numatytąją naujų raštelių plotį (taškais)" +msgid "Delete all sticky notes?" +msgstr "Ištrinti visus lipnius raštelius?" #: ../stickynotes/stickynotes.ui.h:30 -msgid "Sticky Note" -msgstr "Lipnus raštelis" +msgid "_Delete All" +msgstr "_Pašalinti visus" #: ../stickynotes/stickynotes.ui.h:31 -msgid "Sticky Note Properties" -msgstr "Lipnių raštelių savybės" +msgid "Sticky Note" +msgstr "Lipnus raštelis" #: ../stickynotes/stickynotes.ui.h:32 -msgid "Sticky Notes Preferences" -msgstr "Lipnių raštelių nustatymai" +msgid "Lock/Unlock note" +msgstr "Užrakinti/atrakinti raštelį" #: ../stickynotes/stickynotes.ui.h:33 -msgid "This cannot be undone." -msgstr "Veiksmas negali būti atšauktas." +msgid "Close note" +msgstr "Užverti raštelį" #: ../stickynotes/stickynotes.ui.h:34 -msgid "Use co_lor from the system theme" -msgstr "Naudoti sistemos temos _spalvą" +msgid "Resize note" +msgstr "Pakeisti raštelio dydį" #: ../stickynotes/stickynotes.ui.h:35 -msgid "Use default co_lor" -msgstr "Naudoti numatytąją spa_lvą" +msgid "Sticky Note Properties" +msgstr "Lipnių raštelių savybės" #: ../stickynotes/stickynotes.ui.h:36 -msgid "Use default fo_nt" -msgstr "Naudoti numatytąjį š_riftą" +msgid "Properties" +msgstr "Savybės" #: ../stickynotes/stickynotes.ui.h:37 -msgid "Use fo_nt from the system theme" -msgstr "Naudoti sistemos temos šri_ftą" +msgid "Choose a font for the note" +msgstr "Pasirinkite raštelio šriftą" #: ../stickynotes/stickynotes.ui.h:38 -msgid "_Delete All" -msgstr "_Pašalinti visus" +msgid "Pick a font for the sticky note" +msgstr "Pasirinkite lipnaus raštelio šriftą" #: ../stickynotes/stickynotes.ui.h:39 -msgid "_Delete Note..." -msgstr "_Pašalinti raštelį..." +msgid "Use default fo_nt" +msgstr "Naudoti numatytąjį š_riftą" #: ../stickynotes/stickynotes.ui.h:40 -msgid "_Font:" -msgstr "Šri_ftas:" +msgid "Choose a color for the note" +msgstr "Pasirinkite raštelio spalvą" #: ../stickynotes/stickynotes.ui.h:41 -msgid "_Lock Note" -msgstr "_Užrakinti raštelį" +msgid "Pick a color for the sticky note" +msgstr "Pasirinkite lipnaus raštelio spalvą" -#: ../stickynotes/stickynotes.ui.h:42 ../stickynotes/stickynotes_applet.c:33 -msgid "_New Note" -msgstr "_Naujas raštelis" +#: ../stickynotes/stickynotes.ui.h:42 +msgid "Note _Color:" +msgstr "Raštelio _spalva:" + +#: ../stickynotes/stickynotes.ui.h:43 +msgid "Font C_olor:" +msgstr "Šrifto s_palva:" #: ../stickynotes/stickynotes.ui.h:44 -msgid "_Put notes on all workspaces" -msgstr "_Patalpinti visuose darbalaukiuose" +msgid "Use default co_lor" +msgstr "Naudoti numatytąją spa_lvą" #: ../stickynotes/stickynotes.ui.h:45 +msgid "Specify a title for the note" +msgstr "Nurodykite raštelio antraštę" + +#: ../stickynotes/stickynotes.ui.h:46 msgid "_Title:" msgstr "_Antraštė:" #: ../stickynotes/stickynotes.schemas.in.h:1 -msgid "" -"By default, sticky notes are given the current date as the title when they " -"are created. This format is used; anything that can be parsed by strftime() " -"is valid." -msgstr "" -"Standartiškai, lipniems rašteliams yra priskiriama dabartinė data kaip " -"pavadinimas kai tik jie sukuriami. Naudojamas šis formatas; viskas kas gali " -"būti apdorojama strftime() funkcijos tinka." +msgid "Default width for new notes" +msgstr "Numatytasis naujų raštelių plotis" #: ../stickynotes/stickynotes.schemas.in.h:2 -msgid "Date format of note's title" -msgstr "Datos formatas raštelio antraštėje" +msgid "Default width for new sticky notes in pixels." +msgstr "Numatytasis naujų raštelių plotis taškais." #: ../stickynotes/stickynotes.schemas.in.h:3 -msgid "Default color for font" -msgstr "Numatytoji šrifto spalva" +msgid "Default height for new notes" +msgstr "Numatytasis naujų raštelių aukštis" #: ../stickynotes/stickynotes.schemas.in.h:4 -msgid "Default color for new notes" -msgstr "Numatytoji naujų raštelių spalva" +msgid "Default height for new sticky notes in pixels." +msgstr "Numatytasis naujų raštelių aukštis taškais." #: ../stickynotes/stickynotes.schemas.in.h:5 -msgid "" -"Default color for new sticky notes. This should be in html hex " -"specification, for example \"#30FF50\"." -msgstr "" -"Numatytoji lipnių raštelių spalva. Ji turėtų būti nurodyta šešioliktaine " -"HTML išraiška, pvz., „#30FF50“." +msgid "Default color for new notes" +msgstr "Numatytoji naujų raštelių spalva" #: ../stickynotes/stickynotes.schemas.in.h:6 -msgid "" -"Default font color for new sticky notes. This should be in html hex " -"specification, for example \"#000000\"." -msgstr "" -"Numatytoji naujų lipnių raštelių šrifto spalva. Ji turėtų būti nurodyta " -"šešioliktaine HTML išraiška, pvz., „#000000“." +msgid "Default color for new sticky notes. This should be in html hex specification, for example \"#30FF50\"." +msgstr "Numatytoji lipnių raštelių spalva. Ji turėtų būti nurodyta šešioliktaine HTML išraiška, pvz., „#30FF50“." #: ../stickynotes/stickynotes.schemas.in.h:7 -msgid "Default font for new notes" -msgstr "Numatytasis naujų raštelių šriftas" +msgid "Default color for font" +msgstr "Numatytoji šrifto spalva" #: ../stickynotes/stickynotes.schemas.in.h:8 -msgid "" -"Default font for new sticky notes. This should be a Pango Font Name, for " -"example \"Sans Italic 10\"." -msgstr "" -"Numatytasis naujų lipnių raštelių šriftas. Tai turėtų būti Pango šrifto " -"vardas, pvz., „Sans Italic 10“." +msgid "Default font color for new sticky notes. This should be in html hex specification, for example \"#000000\"." +msgstr "Numatytoji naujų lipnių raštelių šrifto spalva. Ji turėtų būti nurodyta šešioliktaine HTML išraiška, pvz., „#000000“." #: ../stickynotes/stickynotes.schemas.in.h:9 -msgid "Default height for new notes" -msgstr "Numatytasis naujų raštelių aukštis" +msgid "Default font for new notes" +msgstr "Numatytasis naujų raštelių šriftas" #: ../stickynotes/stickynotes.schemas.in.h:10 -msgid "Default height for new sticky notes in pixels." -msgstr "Numatytasis naujų raštelių aukštis taškais." +msgid "Default font for new sticky notes. This should be a Pango Font Name, for example \"Sans Italic 10\"." +msgstr "Numatytasis naujų lipnių raštelių šriftas. Tai turėtų būti Pango šrifto vardas, pvz., „Sans Italic 10“." #: ../stickynotes/stickynotes.schemas.in.h:11 -msgid "Default width for new notes" -msgstr "Numatytasis naujų raštelių plotis" +msgid "Sticky notes' workspace stickyness" +msgstr "Lipnių raštelių darbo erdvių lipnumas" #: ../stickynotes/stickynotes.schemas.in.h:12 -msgid "Default width for new sticky notes in pixels." -msgstr "Numatytasis naujų raštelių plotis taškais." +msgid "Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not." +msgstr "Nurodo, ar lipnūs rašteliai yra matomi VISOSE darbo erdvėse darbastalyje, ar ne" #: ../stickynotes/stickynotes.schemas.in.h:13 -msgid "Empty notes are always deleted without confirmation." -msgstr "Tušti rašteliai visada ištrinami neprašant patvirtinimo." +msgid "Sticky notes' locked state" +msgstr "Lipnių raštelių užrakinimo būsena" #: ../stickynotes/stickynotes.schemas.in.h:14 -msgid "" -"If this option is disabled, a custom color can be used as the default color " -"for all sticky notes." -msgstr "" -"Jeigu šis nustatymas yra atjungtas, bus naudojama vartotojo parinkta spalva " -"kaip numatytoji spalva visiems lipniems lapeliams." +msgid "Specifies whether the sticky notes are locked (non-editable) or not." +msgstr "Nurodo, ar lipnūs rašteliai yra užrakinti (ne redaguojami) ar ne." #: ../stickynotes/stickynotes.schemas.in.h:15 -msgid "" -"If this option is disabled, a custom font can be used as the default font " -"for all sticky notes." -msgstr "" -"Jeigu šis nustatymas yra atjungtas, bus naudojmas vartotojo parinktas " -"šriftas kaip numatytasis šriftas visuose lipniuose lapaliuose." +msgid "Date format of note's title" +msgstr "Datos formatas raštelio antraštėje" #: ../stickynotes/stickynotes.schemas.in.h:16 -msgid "" -"If this option is enabled, selecting the desktop in any way will " -"automatically hide all the open notes." -msgstr "" -"Jei ši parinktis įjungta, spustelėjus darbastalį ar jame esantį elementą, " -"automatiškai bus paslėpti visi atverti rašteliai." +msgid "By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid." +msgstr "Standartiškai, lipniems rašteliams yra priskiriama dabartinė data kaip pavadinimas kai tik jie sukuriami. Naudojamas šis formatas; viskas kas gali būti apdorojama strftime() funkcijos tinka." #: ../stickynotes/stickynotes.schemas.in.h:17 -msgid "" -"If this option is enabled, the custom colors and fonts that have been " -"assigned to individual notes will be ignored." -msgstr "" -"Jeigu ši parinktis yra įjungta, bus nepaisoma paskiriems rašteliams " -"priskirtų pasirinktinių spalvų ir šriftų." +msgid "Whether to use the default system color" +msgstr "Ar naudoti numatytąsias sistemos spalvas" #: ../stickynotes/stickynotes.schemas.in.h:18 -msgid "Specifies whether the sticky notes are locked (non-editable) or not." -msgstr "Nurodo, ar lipnūs rašteliai yra užrakinti (ne redaguojami) ar ne." +msgid "If this option is disabled, a custom color can be used as the default color for all sticky notes." +msgstr "Jeigu šis nustatymas yra atjungtas, bus naudojama vartotojo parinkta spalva kaip numatytoji spalva visiems lipniems lapeliams." #: ../stickynotes/stickynotes.schemas.in.h:19 -msgid "" -"Specifies whether the sticky notes are visible on ALL workspaces on the " -"desktop, or not." -msgstr "" -"Nurodo, ar lipnūs rašteliai yra matomi VISOSE darbo erdvėse darbastalyje, ar " -"ne" +msgid "Whether to use the default system font" +msgstr "Ar naudoti numatytąjį sistemos šriftą" #: ../stickynotes/stickynotes.schemas.in.h:20 -msgid "Sticky notes' locked state" -msgstr "Lipnių raštelių užrakinimo būsena" +msgid "If this option is disabled, a custom font can be used as the default font for all sticky notes." +msgstr "Jeigu šis nustatymas yra atjungtas, bus naudojmas vartotojo parinktas šriftas kaip numatytasis šriftas visuose lipniuose lapaliuose." #: ../stickynotes/stickynotes.schemas.in.h:21 -msgid "Sticky notes' workspace stickyness" -msgstr "Lipnių raštelių darbo erdvių lipnumas" +msgid "Whether to force the default color and font on all notes" +msgstr "Ar priverstinai naudoti numatytąjį šriftą ir spalvas visuose rašteliuose" #: ../stickynotes/stickynotes.schemas.in.h:22 -msgid "Whether to ask for confirmation when deleting a note" -msgstr "Ar klausti patvirtinimo ištrinant raštelį" +msgid "If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored." +msgstr "Jeigu ši parinktis yra įjungta, bus nepaisoma paskiriems rašteliams priskirtų pasirinktinių spalvų ir šriftų." #: ../stickynotes/stickynotes.schemas.in.h:23 -msgid "Whether to force the default color and font on all notes" -msgstr "" -"Ar priverstinai naudoti numatytąjį šriftą ir spalvas visuose rašteliuose" - -#: ../stickynotes/stickynotes.schemas.in.h:24 msgid "Whether to hide all notes when the desktop is selected" msgstr "Ar paslėpti visus raštelius, kuomet pažymimas darbastalis" +#: ../stickynotes/stickynotes.schemas.in.h:24 +msgid "If this option is enabled, selecting the desktop in any way will automatically hide all the open notes." +msgstr "Jei ši parinktis įjungta, spustelėjus darbastalį ar jame esantį elementą, automatiškai bus paslėpti visi atverti rašteliai." + #: ../stickynotes/stickynotes.schemas.in.h:25 -msgid "Whether to use the default system color" -msgstr "Ar naudoti numatytąsias sistemos spalvas" +msgid "Whether to ask for confirmation when deleting a note" +msgstr "Ar klausti patvirtinimo ištrinant raštelį" #: ../stickynotes/stickynotes.schemas.in.h:26 -msgid "Whether to use the default system font" -msgstr "Ar naudoti numatytąjį sistemos šriftą" +msgid "Empty notes are always deleted without confirmation." +msgstr "Tušti rašteliai visada ištrinami neprašant patvirtinimo." #: ../stickynotes/stickynotes_applet.c:36 msgid "Hi_de Notes" @@ -3538,7 +2903,7 @@ msgid "_Lock Notes" msgstr "_Užrakinti raštelius" -#: ../stickynotes/stickynotes_applet.c:622 +#: ../stickynotes/stickynotes_applet.c:620 #, c-format msgid "%d note" msgid_plural "%d notes" @@ -3546,23 +2911,24 @@ msgstr[1] "%d rašteliai" msgstr[2] "%d raštelių" -#: ../stickynotes/stickynotes_applet.c:623 +#: ../stickynotes/stickynotes_applet.c:621 msgid "Show sticky notes" msgstr "Rodyti lipnius raštelius" -#: ../stickynotes/stickynotes_applet_callbacks.c:421 +#: ../stickynotes/stickynotes_applet_callbacks.c:379 msgid "Sticky Notes for the GNOME Desktop Environment" msgstr "Lipnūs rašteliai skirti GNOME darbo aplinkai" #: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1 -msgid "Go to Trash" -msgstr "Eiti į šiukšlinę" - -#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2 msgid "Trash" msgstr "Šiukšlinė" -#: ../trashapplet/src/trashapplet.c:69 ../trashapplet/src/trash-empty.c:351 +#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2 +msgid "Go to Trash" +msgstr "Eiti į šiukšlinę" + +#: ../trashapplet/src/trashapplet.c:69 +#: ../trashapplet/src/trash-empty.c:343 msgid "_Empty Trash" msgstr "_Išvalyti šiukšlinę" @@ -3582,7 +2948,7 @@ msgid "No Items in Trash" msgstr "Šiukšlinėje nieko nėra" -#: ../trashapplet/src/trashapplet.c:378 +#: ../trashapplet/src/trashapplet.c:377 #, c-format msgid "" "Error while spawning nautilus:\n" @@ -3591,58 +2957,45 @@ "Iškviečiant nautilių, įvyko klaida:\n" "%s" -#: ../trashapplet/src/trashapplet.c:427 -msgid "" -"A GNOME trash bin that lives in your panel. You can use it to view the trash " -"or drag and drop items into the trash." -msgstr "" -"Skydelyje esanti GNOME šiukšlinė. Galite ją naudoti norėdami pamatyti " -"išmestus failus arba ant jos užvilkti ir paleisti norimus ištrinti " -"elementus." +#: ../trashapplet/src/trashapplet.c:426 +msgid "A GNOME trash bin that lives in your panel. You can use it to view the trash or drag and drop items into the trash." +msgstr "Skydelyje esanti GNOME šiukšlinė. Galite ją naudoti norėdami pamatyti išmestus failus arba ant jos užvilkti ir paleisti norimus ištrinti elementus." -#: ../trashapplet/src/trashapplet.c:452 +#: ../trashapplet/src/trashapplet.c:451 msgid "Delete Immediately?" msgstr "Ištrinti tuojau pat?" -#: ../trashapplet/src/trashapplet.c:482 +#: ../trashapplet/src/trashapplet.c:480 msgid "Cannot move items to trash, do you want to delete them immediately?" msgstr "Perkelti elementų į šiukšlinę nepavyko, ar norite juos iškart ištrinti?" -#: ../trashapplet/src/trashapplet.c:487 -msgid "" -"Cannot move some items to trash, do you want to delete these immediately?" -msgstr "" -"Kai kurių elementų nepavyko perkelti į šiukšlinę, ar norite juos iškart " -"ištrinti?" +#: ../trashapplet/src/trashapplet.c:485 +msgid "Cannot move some items to trash, do you want to delete these immediately?" +msgstr "Kai kurių elementų nepavyko perkelti į šiukšlinę, ar norite juos iškart ištrinti?" -#: ../trashapplet/src/trashapplet.c:617 +#: ../trashapplet/src/trashapplet.c:615 msgid "Trash Applet" msgstr "Šiukšlinės įtaisas" #. Translators: the %s in this string should be read as %d. -#: ../trashapplet/src/trash-empty.c:81 +#: ../trashapplet/src/trash-empty.c:73 #, c-format msgid "Removing item %s of %s" msgstr "Šalinamas %s elementas iš %s" #. Translators: %s is a file name -#: ../trashapplet/src/trash-empty.c:107 +#: ../trashapplet/src/trash-empty.c:99 #, c-format msgid "Removing: %s" msgstr "Šalinama: %s" -#: ../trashapplet/src/trash-empty.c:330 +#: ../trashapplet/src/trash-empty.c:322 msgid "Empty all of the items from the trash?" msgstr "Iš šiukšlinės išvalyti visus elementus?" -#: ../trashapplet/src/trash-empty.c:337 -msgid "" -"If you choose to empty the trash, all items in it will be permanently lost. " -"Please note that you can also delete them separately." -msgstr "" -"Jeigu pasirinksite išvalyti šiukšlinę, visi elementai joje bus negrįžtamai " -"prarasti. Turėkite omenyje, kad taip pat galite ištrinti kiekvieną elementą " -"atskirai." +#: ../trashapplet/src/trash-empty.c:329 +msgid "If you choose to empty the trash, all items in it will be permanently lost. Please note that you can also delete them separately." +msgstr "Jeigu pasirinksite išvalyti šiukšlinę, visi elementai joje bus negrįžtamai prarasti. Turėkite omenyje, kad taip pat galite ištrinti kiekvieną elementą atskirai." #: ../trashapplet/trashapplet-empty-progress.ui.h:1 msgid "Emptying the Trash" @@ -3652,153 +3005,3 @@ msgid "From:" msgstr "Nuo:" -#~ msgid "Keyboard _Preferences" -#~ msgstr "Klaviatūros _nustatymai" - -#~ msgid "Pl_ugins" -#~ msgstr "Į_skiepiai" - -#~ msgid "Show Current _Layout" -#~ msgstr "Rodyti esamą _išdėstymą" - -#~ msgid "_Groups" -#~ msgstr "_Grupės" - -#~ msgid "Keyboard applet factory" -#~ msgstr "Klaviatūros įtaiso gamykla" - -#~ msgid "Unknown" -#~ msgstr "Nežinomas" - -#~ msgid "Keyboard Layout \"%s\"" -#~ msgstr "Klaviatūros išdėstymas „%s“" - -#~ msgid "Copyright (c) Sergey V. Udaltsov 1999-2004" -#~ msgstr "Autorinės teisės (c) Sergey V. Udaltsov 1999-2004" - -#~ msgid "Keyboard layout indicator applet for GNOME" -#~ msgstr "Klaviatūros išdėstymo indikatoriaus įtaisas skirtas GNOME" - -#~ msgid "Keyboard Layout" -#~ msgstr "Klaviatūros išdėstymas" - -#~ msgid "Appearance" -#~ msgstr "Išvaizda" - -#~ msgid " " -#~ msgstr " " - -#~ msgid "*" -#~ msgstr "*" - -#~ msgid "Colors" -#~ msgstr "Spalvos" - -#~ msgid "Size" -#~ msgstr "Dydis" - -#~ msgid "Root password required" -#~ msgstr "" -#~ "Reikalingas root slaptažodis" - -#~ msgid "" -#~ "Delete all sticky notes?\n" -#~ "\n" -#~ "This cannot be undone." -#~ msgstr "" -#~ "Pašalinti visus lipnius raštelius?\n" -#~ "\n" -#~ "Šio veiksmo nebus galima atšaukti." - -#~ msgid "" -#~ "Delete this sticky note?\n" -#~ "\n" -#~ "This cannot be undone." -#~ msgstr "" -#~ "Pašalinti šį lipnų raštelį?\n" -#~ "\n" -#~ "Šio veiksmo nebus galima atšaukti." - -#~ msgid "Properties" -#~ msgstr "Savybės" - -#~ msgid "From:" -#~ msgstr "Iš:" - -#~ msgid "Emptying the Trash" -#~ msgstr "Valoma šiukšlinė" - -#~ msgid "(not connected)" -#~ msgstr "(neprijungtas)" - -#~ msgid "Mount Error" -#~ msgstr "Klaida prijungiant" - -#~ msgid "Unmount Error" -#~ msgstr "Klaida atjungiant" - -#~ msgid "Eject Error" -#~ msgstr "Klaida išmetant" - -#~ msgid "Error" -#~ msgstr "Klaida" - -#~ msgid "Using GStreamer 0.8." -#~ msgstr "Naudojama GStreamer 0.8" - -#~ msgid "-" -#~ msgstr "-" - -#~ msgid "+" -#~ msgstr "+" - -#~ msgid "Graph color for PLIP network activity" -#~ msgstr "PLIP tinklo veiklos grafiko spalva" - -#~ msgid "Graph color for SLIP network activity" -#~ msgstr "SLIP tinklo veiklos grafiko spalva" - -#~ msgid "_SLIP" -#~ msgstr "_SLIP" - -#~ msgid "PL_IP" -#~ msgstr "PL_IP" - -#~ msgid "_Ethernet" -#~ msgstr "_Ethernet" - -#~ msgid "Othe_r" -#~ msgstr "Kito_kia" - -#~ msgid "_Open" -#~ msgstr "_Atverti" - -#~ msgid "" -#~ "1d\n" -#~ "5d\n" -#~ "3m\n" -#~ "6m\n" -#~ "1y\n" -#~ "3y" -#~ msgstr "" -#~ "1d\n" -#~ "5d\n" -#~ "3mėn\n" -#~ "6mėn\n" -#~ "1m\n" -#~ "3m" - -#~ msgid "" -#~ "l\n" -#~ "b\n" -#~ "c" -#~ msgstr "" -#~ "l\n" -#~ "b\n" -#~ "c" - -#~ msgid "Downloading Chart" -#~ msgstr "Atsiunčiamas grafikas" - -#~ msgid "Reading Chart chunk" -#~ msgstr "Skaitoma grafiko dalis" diff -Nru gnome-applets-3.5.91/po/pl.po gnome-applets-3.5.92/po/pl.po --- gnome-applets-3.5.91/po/pl.po 2012-08-30 18:29:58.000000000 +0000 +++ gnome-applets-3.5.92/po/pl.po 2012-09-20 01:07:34.000000000 +0000 @@ -4,12 +4,22 @@ # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: # gnomepl@aviary.pl # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Zbigniew Chyla , 1998-2003. +# Kuba Winnicki , 1999. +# Artur Flinta , 2003-2006. +# Zbigniew Braniecki , 2007. +# Stanisław Małolepszy , 2007. +# Tomasz Dominikowski , 2008-2009. +# Joanna Mazgaj , 2009. +# Wadim Dziedzic , 2009. +# Piotr Drąg , 2010-2012. +# Aviary.pl , 2007-2012. msgid "" msgstr "" "Project-Id-Version: gnome-applets\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-22 02:01+0200\n" -"PO-Revision-Date: 2012-08-22 02:02+0200\n" +"POT-Creation-Date: 2012-09-03 22:36+0200\n" +"PO-Revision-Date: 2012-09-03 22:37+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -23,7 +33,7 @@ #: ../accessx-status/applet.c:139 msgid "Shows the state of AccessX features such as latched modifiers" -msgstr "Wyświetla stan właściwości AccessX, takich jak modyfikatory zapadkowe" +msgstr "Wyświetla stan funkcji AccessX, takich jak modyfikatory zapadkowe" #. about.set_artists([]) #. about.set_documenters([]) @@ -38,7 +48,17 @@ #: ../stickynotes/stickynotes_applet_callbacks.c:383 #: ../trashapplet/src/trashapplet.c:431 msgid "translator-credits" -msgstr "Aviary.pl , 2008, 2009, 2010, 2011, 2012" +msgstr "" +"Zbigniew Chyla , 1998-2003\n" +"Kuba Winnicki , 1999\n" +"Artur Flinta , 2003-2006\n" +"Zbigniew Braniecki , 2007\n" +"Stanisław Małolepszy , 2007\n" +"Tomasz Dominikowski , 2008-2009\n" +"Joanna Mazgaj , 2009\n" +"Wadim Dziedzic , 2009\n" +"Piotr Drąg , 2010-2012\n" +"Aviary.pl , 2007-2012" #: ../accessx-status/applet.c:169 #, c-format @@ -90,7 +110,7 @@ #: ../accessx-status/applet.c:982 ../accessx-status/applet.c:1125 msgid "Shows keyboard status when accessibility features are used." -msgstr "Wyświetla stan klawiatury, gdy używane są właściwości dostępności." +msgstr "Wyświetla stan klawiatury, gdy używane są funkcje dostępności." #: ../accessx-status/applet.c:1017 msgid "XKB Extension is not enabled" @@ -112,7 +132,7 @@ #: ../accessx-status/applet.c:1292 msgid "Displays current state of keyboard accessibility features" -msgstr "Wyświetla bieżący stan właściwości dostępności klawiatury" +msgstr "Wyświetla bieżący stan funkcji dostępności klawiatury" #: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:1 msgid "AccessX Status Applet Factory" @@ -124,7 +144,7 @@ #: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:4 msgid "Shows the status of keyboard accessibility features" -msgstr "Wyświetla stan właściwości dostępności klawiatury" +msgstr "Wyświetla stan funkcji dostępności klawiatury" #: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:716 #: ../cpufreq/src/cpufreq-applet.c:123 ../geyes/geyes.c:315 @@ -2096,7 +2116,7 @@ #: ../modemlights/modem-applet.c:145 msgid "_Deactivate" -msgstr "_Dezaktywuj" +msgstr "_Deaktywuj" #: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:4 msgid "_Properties" diff -Nru gnome-applets-3.5.91/py-compile gnome-applets-3.5.92/py-compile --- gnome-applets-3.5.91/py-compile 2011-10-23 17:44:06.000000000 +0000 +++ gnome-applets-3.5.92/py-compile 2012-09-19 22:33:03.000000000 +0000 @@ -1,10 +1,9 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-06-08.12; # UTC -# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,28 +31,36 @@ PYTHON=python fi +me=py-compile + +usage_error () +{ + echo "$me: $*" >&2 + echo "Try '$me --help' for more information." >&2 + exit 1 +} + basedir= destdir= -files= while test $# -ne 0; do case "$1" in --basedir) - basedir=$2 - if test -z "$basedir"; then - echo "$0: Missing argument to --basedir." 1>&2 - exit 1 + if test $# -lt 2; then + usage_error "option '--basedir' requires an argument" + else + basedir=$2 fi shift ;; --destdir) - destdir=$2 - if test -z "$destdir"; then - echo "$0: Missing argument to --destdir." 1>&2 - exit 1 + if test $# -lt 2; then + usage_error "option '--destdir' requires an argument" + else + destdir=$2 fi shift ;; - -h|--h*) + -h|--help) cat <<\EOF Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." @@ -69,20 +76,27 @@ EOF exit $? ;; - -v|--v*) - echo "py-compile $scriptversion" + -v|--version) + echo "$me $scriptversion" exit $? ;; + --) + shift + break + ;; + -*) + usage_error "unrecognized option '$1'" + ;; *) - files="$files $1" + break ;; esac shift done +files=$* if test -z "$files"; then - echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 - exit 1 + usage_error "no files given" fi # if basedir was given, then it should be prepended to filenames before diff -Nru gnome-applets-3.5.91/stickynotes/Makefile.in gnome-applets-3.5.92/stickynotes/Makefile.in --- gnome-applets-3.5.91/stickynotes/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/stickynotes/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -37,7 +53,8 @@ @BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS = \ @BUILD_STICKYNOTES_APPLET_TRUE@ stickynotes_applet$(EXEEXT) subdir = stickynotes -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -74,9 +91,22 @@ @BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_STICKYNOTES_APPLET_TRUE@ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -87,22 +117,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(stickynotes_applet_SOURCES) DIST_SOURCES = $(am__stickynotes_applet_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -112,6 +138,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -133,6 +164,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } DATA = $(applet_DATA) $(builder_DATA) $(schemas_DATA) $(service_DATA) \ $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -220,6 +257,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -231,6 +269,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -256,6 +295,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -371,6 +414,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -381,6 +425,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -492,8 +538,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -533,7 +582,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -stickynotes_applet$(EXEEXT): $(stickynotes_applet_OBJECTS) $(stickynotes_applet_DEPENDENCIES) +stickynotes_applet$(EXEEXT): $(stickynotes_applet_OBJECTS) $(stickynotes_applet_DEPENDENCIES) $(EXTRA_stickynotes_applet_DEPENDENCIES) @rm -f stickynotes_applet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(stickynotes_applet_OBJECTS) $(stickynotes_applet_LDADD) $(LIBS) @@ -552,26 +601,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -580,8 +626,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -595,13 +644,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-builderDATA: $(builder_DATA) @$(NORMAL_INSTALL) - test -z "$(builderdir)" || $(MKDIR_P) "$(DESTDIR)$(builderdir)" @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(builderdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(builderdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -615,13 +665,14 @@ @$(NORMAL_UNINSTALL) @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(builderdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(builderdir)" && rm -f $$files + dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir) install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) - test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -635,13 +686,14 @@ @$(NORMAL_UNINSTALL) @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(schemasdir)" && rm -f $$files + dir='$(DESTDIR)$(schemasdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -655,13 +707,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -675,17 +728,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -695,7 +746,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -709,37 +764,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -748,6 +772,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -811,6 +839,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -846,13 +888,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -890,10 +929,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -983,28 +1027,30 @@ uninstall-libexecPROGRAMS uninstall-schemasDATA \ uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-builderDATA install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-schemasDATA install-serviceDATA install-strip \ - install-uiDATA installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-appletDATA \ - uninstall-builderDATA uninstall-libexecPROGRAMS \ - uninstall-schemasDATA uninstall-serviceDATA uninstall-uiDATA + clean-libexecPROGRAMS clean-libtool cscopelist \ + cscopelist-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appletDATA install-builderDATA \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-schemasDATA \ + install-serviceDATA install-strip install-uiDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-appletDATA uninstall-builderDATA \ + uninstall-libexecPROGRAMS uninstall-schemasDATA \ + uninstall-serviceDATA uninstall-uiDATA @BUILD_STICKYNOTES_APPLET_TRUE@@INTLTOOL_SCHEMAS_RULE@ diff -Nru gnome-applets-3.5.91/stickynotes/data/Makefile.in gnome-applets-3.5.92/stickynotes/data/Makefile.in --- gnome-applets-3.5.91/stickynotes/data/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/stickynotes/data/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,6 +18,23 @@ # VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -37,7 +53,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = stickynotes/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -52,14 +69,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -81,6 +109,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(serverdir)" DATA = $(server_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -135,6 +169,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -146,6 +181,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -171,6 +207,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -286,6 +326,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -296,6 +337,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -368,8 +411,11 @@ -rm -rf .libs _libs install-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) - test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(serverdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(serverdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -383,15 +429,15 @@ @$(NORMAL_UNINSTALL) @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(serverdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(serverdir)" && rm -f $$files + dir='$(DESTDIR)$(serverdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -440,10 +486,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/stickynotes/docs/Makefile.in gnome-applets-3.5.92/stickynotes/docs/Makefile.in --- gnome-applets-3.5.91/stickynotes/docs/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/stickynotes/docs/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = stickynotes/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -461,6 +511,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -482,6 +533,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -530,10 +583,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -707,7 +765,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -721,7 +778,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -729,7 +786,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -768,18 +825,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -789,10 +843,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -860,7 +914,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -928,8 +1004,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -955,7 +1031,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1023,7 +1110,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/stickynotes/pixmaps/Makefile.in gnome-applets-3.5.92/stickynotes/pixmaps/Makefile.in --- gnome-applets-3.5.91/stickynotes/pixmaps/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/stickynotes/pixmaps/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -34,7 +50,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = stickynotes/pixmaps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -49,14 +66,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -78,6 +106,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(stickynotes_applet_pixmapsdir)" DATA = $(stickynotes_applet_pixmaps_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -132,6 +166,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -143,6 +178,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -168,6 +204,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -283,6 +323,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -293,6 +334,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -378,8 +421,11 @@ -rm -rf .libs _libs install-stickynotes_applet_pixmapsDATA: $(stickynotes_applet_pixmaps_DATA) @$(NORMAL_INSTALL) - test -z "$(stickynotes_applet_pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(stickynotes_applet_pixmapsdir)" @list='$(stickynotes_applet_pixmaps_DATA)'; test -n "$(stickynotes_applet_pixmapsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(stickynotes_applet_pixmapsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(stickynotes_applet_pixmapsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -393,15 +439,15 @@ @$(NORMAL_UNINSTALL) @list='$(stickynotes_applet_pixmaps_DATA)'; test -n "$(stickynotes_applet_pixmapsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(stickynotes_applet_pixmapsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(stickynotes_applet_pixmapsdir)" && rm -f $$files + dir='$(DESTDIR)$(stickynotes_applet_pixmapsdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -450,10 +496,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru gnome-applets-3.5.91/trashapplet/Makefile.in gnome-applets-3.5.92/trashapplet/Makefile.in --- gnome-applets-3.5.91/trashapplet/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/trashapplet/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -34,7 +50,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = trashapplet -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -49,12 +66,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -64,6 +87,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -85,6 +113,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(appletdir)" "$(DESTDIR)$(builderdir)" \ "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)" DATA = $(applet_DATA) $(builder_DATA) $(service_DATA) $(ui_DATA) @@ -173,6 +207,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -184,6 +219,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -209,6 +245,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -324,6 +364,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,6 +375,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -416,8 +459,11 @@ -rm -rf .libs _libs install-appletDATA: $(applet_DATA) @$(NORMAL_INSTALL) - test -z "$(appletdir)" || $(MKDIR_P) "$(DESTDIR)$(appletdir)" @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appletdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appletdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -431,13 +477,14 @@ @$(NORMAL_UNINSTALL) @list='$(applet_DATA)'; test -n "$(appletdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appletdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appletdir)" && rm -f $$files + dir='$(DESTDIR)$(appletdir)'; $(am__uninstall_files_from_dir) install-builderDATA: $(builder_DATA) @$(NORMAL_INSTALL) - test -z "$(builderdir)" || $(MKDIR_P) "$(DESTDIR)$(builderdir)" @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(builderdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(builderdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -451,13 +498,14 @@ @$(NORMAL_UNINSTALL) @list='$(builder_DATA)'; test -n "$(builderdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(builderdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(builderdir)" && rm -f $$files + dir='$(DESTDIR)$(builderdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -471,13 +519,14 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -491,17 +540,15 @@ @$(NORMAL_UNINSTALL) @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -511,7 +558,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -525,37 +576,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -564,6 +584,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -627,6 +651,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -662,13 +700,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -706,10 +741,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -790,24 +830,26 @@ uninstall-am: uninstall-appletDATA uninstall-builderDATA \ uninstall-serviceDATA uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-appletDATA \ - install-builderDATA install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-serviceDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-appletDATA \ - uninstall-builderDATA uninstall-serviceDATA uninstall-uiDATA + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-appletDATA install-builderDATA install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-serviceDATA install-strip \ + install-uiDATA installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-appletDATA uninstall-builderDATA \ + uninstall-serviceDATA uninstall-uiDATA $(applet_in_files): $(applet_in_files).in Makefile diff -Nru gnome-applets-3.5.91/trashapplet/docs/Makefile.in gnome-applets-3.5.92/trashapplet/docs/Makefile.in --- gnome-applets-3.5.91/trashapplet/docs/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/trashapplet/docs/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,6 +38,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -57,7 +73,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gnome-doc-utils.make + $(top_srcdir)/gnome-doc-utils.make $(top_srcdir)/mkinstalldirs subdir = trashapplet/docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ @@ -73,14 +89,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkgdatadir = @pkgdatadir@ ACLOCAL = @ACLOCAL@ @@ -133,6 +160,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -144,6 +172,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -169,6 +198,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -284,6 +317,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -294,6 +328,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -329,6 +365,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -456,6 +506,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gnome-doc-utils.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -477,6 +528,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -525,10 +578,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -702,7 +760,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -716,7 +773,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -724,7 +781,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -763,18 +820,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -784,10 +838,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -855,7 +909,29 @@ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ $(mkinstalldirs) "$(distdir)/$$lc"; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ + @list='$(_DOC_C_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; \ + for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + if ! test -d "$(distdir)/$$docdir"; then \ + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ + $(mkinstalldirs) "$(distdir)/$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ + done + @list='$(_DOC_POFILES)'; \ for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ @@ -923,8 +999,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done @@ -950,7 +1026,18 @@ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ + if ! test -d "$$docdir"; then \ + echo "$(mkinstalldirs) $$docdir"; \ + $(mkinstalldirs) "$$docdir"; \ + fi; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ @@ -1018,7 +1105,11 @@ # $(if $(_DOC_DSK_IN),uninstall-doc-dsk) uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + done + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done diff -Nru gnome-applets-3.5.91/trashapplet/src/Makefile.in gnome-applets-3.5.92/trashapplet/src/Makefile.in --- gnome-applets-3.5.91/trashapplet/src/Makefile.in 2012-08-30 18:36:49.000000000 +0000 +++ gnome-applets-3.5.92/trashapplet/src/Makefile.in 2012-09-20 01:10:30.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -35,7 +51,8 @@ host_triplet = @host@ libexec_PROGRAMS = trashapplet$(EXEEXT) subdir = trashapplet/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-define-dir.m4 \ $(top_srcdir)/m4/acinclude.m4 \ @@ -58,9 +75,22 @@ am__DEPENDENCIES_1 = trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -71,24 +101,25 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(trashapplet_SOURCES) DIST_SOURCES = $(trashapplet_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -143,6 +174,7 @@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GIT_CFLAGS = @GIT_CFLAGS@ GIT_LIBS = @GIT_LIBS@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -154,6 +186,7 @@ GNOME_SETTINGS_DAEMON_CFLAGS = @GNOME_SETTINGS_DAEMON_CFLAGS@ GNOME_SETTINGS_DAEMON_LIBS = @GNOME_SETTINGS_DAEMON_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTK_BUILDERDIR = @GTK_BUILDERDIR@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_FLAGS = @GTK_FLAGS@ @@ -179,6 +212,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ JW = @JW@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -294,6 +331,7 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gnomelocaledir = @gnomelocaledir@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -304,6 +342,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -382,8 +422,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -423,7 +466,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -trashapplet$(EXEEXT): $(trashapplet_OBJECTS) $(trashapplet_DEPENDENCIES) +trashapplet$(EXEEXT): $(trashapplet_OBJECTS) $(trashapplet_DEPENDENCIES) $(EXTRA_trashapplet_DEPENDENCIES) @rm -f trashapplet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(trashapplet_OBJECTS) $(trashapplet_LDADD) $(LIBS) @@ -440,26 +483,23 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -516,6 +556,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -566,10 +620,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -655,7 +714,7 @@ .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags distclean \ + clean-libexecPROGRAMS clean-libtool cscopelist ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \