--- a/ChangeLog Tue Aug 09 11:42:33 2005 +0000
+++ b/ChangeLog Tue Aug 09 21:56:40 2005 +0000
@@ -1,3 +1,15 @@
+2005-08-09 Laszlo Peter <[email protected]>
+
+ * *.spec: remove Sun specific l10n & docs stuff, reorder
+ Source definitions.
+ * patches/*-l10n-online-help.diff: remove
+ * patches/*-potfiles.diff: remove
+ * patches/*-alllinguas.diff: remove
+ * patches/*-docs.diff: remove
+ * patches/<random stuff>: remove unused patches
+ * ext-sources/<random stuff>: remove unused ext-sources
+ or move to /sgnome/tarballs
+
2005-08-09 Glynn Foster <[email protected]>
* GNOME-Default.spec.tmpl: Update the copyright.
--- a/GConf.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/GConf.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,10 +15,8 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Configuration Framework
Source: http://ftp.gnome.org/pub/GNOME/sources/GConf/2.10/GConf-%{version}.tar.bz2
-#FIXME: Source1: GConf-l10n-po-1.16.tar.bz2
-Source2: gconftool-2.1.gz
-Source3: libgconf-2.3.gz
-Source4: l10n-configure.sh
+Source1: gconftool-2.1.gz
+Source2: libgconf-2.3.gz
Patch1: GConf-01-apoc-path-update.diff
Patch2: GConf-02-daemon-hanged-solaris.diff
Patch3: GConf-03-g11n-locale-alias.diff
@@ -64,8 +62,6 @@
%patch2 -p1
%patch3 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-
%ifos solaris
%ifarch amd64 sparcv9
cd ..
@@ -73,7 +69,6 @@
%endif
%endif
-bash -x %SOURCE4
%build
%ifos linux
@@ -151,8 +146,8 @@
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/acroread.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/acroread.spec Tue Aug 09 21:56:40 2005 +0000
@@ -21,8 +21,7 @@
%ifos solaris
Source: acroread-solaris-5010.tar.gz
-Source1: l10n-configure.sh
-Source2: acroread-509-fonts.tar.bz2
+Source1: acroread-509-fonts.tar.bz2
%define acro_dir Acrobat5
%define base_install_dir /usr/sfw/lib/Acrobat5
%define replace_dir \/usr\/sfw\/lib\/Acrobat5\/Reader
@@ -34,8 +33,7 @@
%define plugin_link_target ../../%{acro_dir}/Browsers/%{platform_browser_dir}/nppdf.so
%else
Source: acroread-linux-5010.tar.gz
-Source1: l10n-configure.sh
-Source2: acroread-509-fonts.tar.bz2
+Source1: acroread-509-fonts.tar.bz2
%define base_install_dir /usr/X11R6/lib/Acrobat5
%define replace_dir \\/usr\\/X11R6\\/lib\\/Acrobat5\\/Reader
%define acrobin_dir %{_prefix}/X11R6/bin
@@ -57,9 +55,7 @@
tar xvf COMMON.TAR
sed -e 's/REPLACE_ME/%{replace_dir}/' bin/acroread.sh > bin/acroread
-
-bash -x %SOURCE1
-bzcat %SOURCE2 | tar xf -
+bzcat %SOURCE1 | tar xf -
%install
cd installers
--- a/apoc-adapter-gconf.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/apoc-adapter-gconf.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Apoc GConf Adapter
Source: apoc-adapter-gconf-%{version}.tar.bz2
-Source1: apoc-adapter-gconf-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Patch1: apoc-adapter-gconf-01-g11n-alllinguas.diff
Patch2: apoc-adapter-gconf-02-shutdown-protect.diff
URL: http://www.sun.com
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -37,11 +34,7 @@
%prep
%setup -q -n apoc-adapter-gconf-%{version}
-%patch1 -p1
%patch2 -p1
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
-
-bash -x %SOURCE2
%build
%ifos linux
--- a/apoc.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/apoc.spec Tue Aug 09 21:56:40 2005 +0000
@@ -27,7 +27,6 @@
Autoreqprov: on
BuildRoot: %{_builddir}/apoc/%{PLATFORM}/class/packages_build_root
Source: apoc-cb%{t_suffix}.tar.bz2
-Source1: l10n-configure.sh
BuildRequires: ant
Group: Applications/Internet
@@ -146,8 +145,6 @@
%prep
%setup -n apoc
-bash -x %SOURCE1
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
--- a/aspell-en.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/aspell-en.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Autoreqprov: on
BuildArch: noarch
Source: %{name}-%{version}.tar.gz
-Source1: l10n-configure.sh
Summary: English dictionaries for ASpell
Group: Applications/Text
@@ -36,7 +35,6 @@
%prep
%setup -q -n %{name}-%{version}
-bash -x %SOURCE1
%build
./configure
--- a/aspell.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/aspell.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
URL: http://www.sun.com/software/javadesktopsystem/
Epoch: 2
Source: %{name}-%{version}.tar.gz
-Source1: l10n-configure.sh
Patch: aspell-01-forte.diff
Summary: A spelling checker.
Group: Applications/Text
@@ -57,7 +56,6 @@
%prep
%setup -q -n %{name}-%{version}
%patch -p1
-bash -x %SOURCE1
%build
%ifos linux
--- a/at-poke.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/at-poke.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Summary: Tool to poke around accessibility infrastructure
Source: http://ftp.gnome.org/pub/GNOME/sources/at-poke/0.2/%{name}-%{version}.tar.bz2
Source1: at-poke.1.gz
-Source2: l10n-configure.sh
URL: http://developer.gnome.org/projects/gap
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -45,7 +44,6 @@
%prep
%setup -q
-bash -x %SOURCE2
%build
%ifos linux
--- a/at-spi.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/at-spi.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi/1.6/%{name}-%{version}.tar.bz2
Source1: at-spi.3.gz
Source2: libcspi.3.gz
-Source3: l10n-configure.sh
URL: http://developer.gnome.org/projects/gap/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -57,7 +56,6 @@
%prep
%setup -q
-bash -x %SOURCE3
%build
%ifos linux
--- a/atk.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/atk.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: ATK - Accesibility Toolkit Libraries
Source: http://ftp.gnome.org/pub/GNOME/sources/atk/1.9/%{name}-%{version}.tar.bz2
-#FIXME: Source1: atk-l10n-po-1.16.tar.bz2
-Source2: libatk-1.0.3.gz
-Source3: l10n-configure.sh
+Source1: libatk-1.0.3.gz
URL: http://www.gtk.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -42,7 +40,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xf -
%ifos solaris
%ifarch amd64 sparcv9
@@ -51,7 +48,6 @@
%endif
%endif
-bash -x %SOURCE3
%build
%ifos linux
@@ -120,7 +116,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
--- a/blueprint-cursor.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/blueprint-cursor.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Group: System/GUI/GNOME
Source: %{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://www.gnome.org
@@ -37,7 +36,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/blueprint.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/blueprint.spec Tue Aug 09 21:56:40 2005 +0000
@@ -18,8 +18,6 @@
Vendor: Sun Microsystems, Inc.
Group: System/GUI/GNOME
Source: %{name}-%{version}.tar.bz2
-#FIXME Source1: blueprint-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: blueprint-01-fix-configure.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://www.sun.com/software/javadesktopsystem/
@@ -34,12 +32,9 @@
%prep
%setup -q
-#FIXME /usr/bin/bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
--- a/bug-buddy.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/bug-buddy.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,12 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Bug Reporting Tool
Source: http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.10/bug-buddy-%{version}.tar.bz2
-#FIXME: Source1: bug-buddy-l10n-po-1.16.tar.bz2
-Source2: bug-buddy.1.gz
-Source3: l10n-configure.sh
-#FIXME: Source4: bug-buddy-l10n-online-help-ci-linux-1.2.tar.bz2
-#FIXME: Source5: bug-buddy-docs-0.4.tar.bz2
-#FIXME: Source6: bug-buddy-docs-0.6linux.tar.bz2
+Source1: bug-buddy.1.gz
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,15 +39,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xf -
-%ifos solaris
-#FIXME: bzcat %SOURCE5 | tar xf -
-%else
-#FIXME: bzcat %SOURCE6 | tar xf -
-%endif
-#FIXME: bzcat %SOURCE4 | tar xf -
-
-bash -x %SOURCE3
%build
%ifos linux
@@ -75,7 +61,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/control-center.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/control-center.spec Tue Aug 09 21:56:40 2005 +0000
@@ -7,7 +7,7 @@
Vendor: Sun Microsystems, Inc.
Summary: The GNOME control center for GNOME 2.6
Source: http://ftp.gnome.org/pub/GNOME/sources/control-center/2.6/control-center-%{version}.tar.bz2
-#FIXME: Source1: control-center-l10n-po-1.16.tar.bz2
+Source1: gnome-font-viewer.1.gz
Source2: gnome-accessibility-keyboard-properties.1.gz
Source3: gnome-background-properties.1.gz
Source4: gnome-control-center.1.gz
@@ -25,8 +25,6 @@
Source16: gnome-theme-manager.1.gz
Source17: gnome-window-properties.1.gz
Source19: gnome-at-properties.1.gz
-Source20: gnome-font-viewer.1.gz
-Source21: l10n-configure.sh
Patch1: control-center-01-keybindings-close.diff
Patch2: control-center-02-ctrl-alt-del.diff
Patch3: control-center-03-gsd-not-session-managed.diff
@@ -97,7 +95,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xvf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -121,7 +118,6 @@
%patch19 -p1
%patch20 -p1
-bash -x %SOURCE21
%build
%ifos linux
@@ -155,6 +151,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -172,7 +169,6 @@
install --mode=0644 %SOURCE16 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE17 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE19 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE20 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/dasher.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/dasher.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Predictive text entry system
Source: http://ftp.gnome.org/pub/GNOME/sources/dasher/3.2/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -47,7 +46,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/db_evo.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/db_evo.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Berkeley Data Base Library
Source: http://www.sleepycat.com/update/snapshot/db-3.1.17.tar.gz
-Source1: l10n-configure.sh
URL: http://www.sleepycat.com/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -27,7 +26,6 @@
%prep
%setup -q -n db-%{version}
-bash -x %SOURCE1
%build
%ifos linux
--- a/eel.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/eel.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,8 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Eazel Extensions Library
Source: http://ftp.gnome.org/pub/GNOME/sources/eel/2.6/eel-%{version}.tar.bz2
-#FIXME: Source1: eel-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
URL: http://www.gnome.org
Patch1: eel-01-multibyte-bookmark-menu.diff
Patch2: eel-02-assertion.diff
@@ -61,10 +59,6 @@
%patch2 -p1
%patch3 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
--- a/eog.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/eog.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Eye Of GNOME Image Viewer
Source: http://ftp.gnome.org/pub/GNOME/sources/eog/2.10/eog-%{version}.tar.bz2
-#FIXME: Source1: eog-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: eog.1.gz
-#FIXME: Source4: eog-l10n-online-help-ci-linux-1.1.tar.bz2
-#FIXME: Source5: eog_docs-0.3.tar.bz2
-#FIXME: Source6: eog_docs-0.4linux.tar.bz2
-#FIXME: Patch1: eog-01-l10n-online-help.diff
+Source1: eog.1.gz
Patch2: eog-02-full-screen-show.diff
Patch3: eog-03-jpeg.diff
URL: http://www.gnome.org
@@ -51,20 +45,9 @@
%prep
%setup -q
-#FIXME: %patch1 -p1
%patch2 -p1
%patch3 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-%ifos solaris
-#FIXME: bzcat %SOURCE5 | tar xvf -
-%else
-#FIXME: bzcat %SOURCE6 | tar xvf -
-%endif
-#FIXME: bzcat %SOURCE4 | tar xvf -
-
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -95,7 +78,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/evolution.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/evolution.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Evolution
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.2/%{name}-%{version}.tar.bz2
-#FIXME: l10n stuff missing
Patch1: evolution-01-solaris-ldap.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Binary file ext-sources/freefont-ttf-20030709.tar.gz has changed
Binary file ext-sources/freetts.jar has changed
--- a/file-roller.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/file-roller.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,12 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: An archive manager for GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: file-roller-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: file-roller.1.gz
-#FIXME: Source4: file-roller-l10n-online-help-ci-linux-1.1.tar.bz2
-#FIXME: Source5: file-roller_docs-0.4.tar.bz2
-#FIXME: Source6: file-roller_docs-0.5linux.tar.bz2
+Source1: file-roller.1.gz
Patch1: file-roller-01-rm-jar-association.diff
Patch2: file-roller-02-move-menuitem.diff
Patch3: file-roller-03-zip-command.diff
@@ -65,16 +60,6 @@
%patch3 -p1
%patch4 -p1
-#FIXME: bzcat %SOURCE1 | tar xf -
-%ifos solaris
-#FIXME: bzcat %SOURCE5 | tar xf -
-%else
-#FIXME: bzcat %SOURCE6 | tar xf -
-%endif
-#FIXME: bzcat %SOURCE4 | tar xf -
-
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -104,7 +89,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/fontconfig.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/fontconfig.spec Tue Aug 09 21:56:40 2005 +0000
@@ -39,7 +39,6 @@
Source10: suse-generic-names.conf
Source11: suse-pre-user.conf
Source12: suse-post-user.conf
-Source13: l10n-configure.sh
Patch2: fontconfig-02-euro.diff
Patch3: fontconfig-03-doc.diff
Patch4: fontconfig-04-fc-match.diff
@@ -94,7 +93,6 @@
%patch8 -p1 -b .other-family
%patch10 -p1 -b .fonts.conf
-bash -x %SOURCE13
%build
%define myprefix /usr
--- a/gail.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gail.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,8 +16,6 @@
URL: http://www.gnome.org
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.8/%{name}-%{version}.tar.bz2
Source1: libgailutil.3.gz
-#FIXME: Source2: gail-l10n-po-1.16.tar.bz2
-Source3: l10n-configure.sh
Patch1: gail-01-combo-fix.diff
Patch2: gail-02-model-row-deleted-fix.diff
Patch3: gail-03-garbage-collect-6278812.diff
@@ -57,10 +55,6 @@
%patch2 -p0
%patch3 -p0
-#FIXME: bzcat -dc %SOURCE2|tar xf -
-
-bash -x %SOURCE3
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
--- a/gaim.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gaim.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,26 +14,17 @@
Vendor: Sun Microsystems, Inc.
Summary: Multiprotocol Instant Messaging Client
Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gaim-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-#FIXME: Source3: gaim-l10n-online-help-ci-linux-1.1.tar.bz2
-#FIXME: Source4: gaim-docs-0.2.tar.bz2
-#FIXME: Source5: gaim-docs-0.3linux.tar.bz2
Patch1: gaim-01-g11n-menu-entry.diff
Patch2: gaim-02-remove-unwanted-protocols.diff
Patch3: gaim-03-perl-common-argc.diff
Patch4: gaim-04-uint_max.diff
Patch5: gaim-05-po-mkinstalldirs.diff
Patch6: gaim-06-gettext.diff
-Patch7: gaim-07-g11n-potfiles.diff
Patch8: gaim-08-void-return.diff
-#FIXME: Patch9: gaim-09-online-help.diff
Patch10: gaim-10-sound_errors.diff
Patch11: gaim-11-add-help.diff
-#FIXME: Patch12: gaim-12-l10n-online-help.diff
Patch13: gaim-13-long-preferences.diff
Patch14: gaim-14-g11n-enable-im.diff
-#FIXME: Patch15: gaim-X-g11n-filename.diff
#GONE: Patch9: gaim-09-ebook-checks.diff
#GONE: Patch12: gaim-12-msn-security-fix.diff
@@ -69,30 +60,18 @@
%prep
%setup -q
-bzcat -dc %SOURCE1|tar xf -
-%ifos solaris
-bzcat -dc %SOURCE4|tar xf -
-%else
-bzcat -dc %SOURCE5|tar xf -
-%endif
-#FIXME: bzcat -dc %SOURCE3|tar xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%patch8 -p1
-#FIXME: %patch9 -p1
%patch10 -p1
%patch11 -p1
-#FIXME: %patch12 -p1
%patch13 -p1
%patch14 -p1
-#FIXME: %patch15 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/gcalctool.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gcalctool.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,13 +16,8 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Calculator
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/5.5/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gcalctool-l10n-po-1.16.tar.bz2
-Source2: gnome-calculator.1.gz
-Source3: gcalctool.1.gz
-#FIXME: Source4: gcalctool_docs-0.3.tar.bz2
-#FIXME: Source5: gcalctool-l10n-online-help-ci-linux-1.2.tar.bz2
-Source6: l10n-configure.sh
-#FIXME: Patch1: gcalctool-01-l10n-online-help.diff
+Source1: gnome-calculator.1.gz
+Source2: gcalctool.1.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -54,13 +49,6 @@
%prep
%setup -q
-#FIXME: %patch1 -p1
-
-#FIXME: bzcat %SOURCE1 | tar xvf -
-#FIXME: bzcat %SOURCE4 | tar xvf -
-#FIXME: bzcat %SOURCE5 | tar xvf -
-
-bash -x %SOURCE6
%build
%ifos linux
@@ -87,8 +75,8 @@
make -i install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
--- a/gconf-editor.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gconf-editor.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Editor/admin tool for GConf
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-Source1: gconf-editor-l10n-po-1.16.tar.bz2
-Source2: gconf-editor.1.gz
-Source3: l10n-configure.sh
-Source4: gconf-editor-l10n-online-help-ci-linux-1.2.tar.bz2
-Source5: gconf-editor-docs-0.3.tar.bz2
-Source6: gconf-editor-docs-0.4linux.tar.bz2
-Patch1: gconf-editor-01-l10n-online-help.diff
+Source1: gconf-editor.1.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -39,17 +33,6 @@
%prep
%setup -q
-bzcat %SOURCE1 | tar xvf -
-%ifos solaris
-bzcat %SOURCE5 | tar xvf -
-%else
-bzcat %SOURCE6 | tar xvf -
-%endif
-bzcat %SOURCE4 | tar xvf -
-%patch1 -p1
-
-bash -x %SOURCE3
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -78,7 +61,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/gdm.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gdm.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,9 @@
Vendor: Sun Microsystems, Inc.
Summary: The GNOME 2.x Display Manager
Source: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.6/gdm-%{version}.tar.bz2
-Source1: gdm-l10n-po-1.16.tar.bz2
-Source2: gdm-docs-0.3.tar.bz2
-Source3: gdm-l10n-online-help-ci-linux-1.2.tar.bz2
+Source1: gdm-stop.1m.gz
+Source2: gdmconfig.1m.gz
+Source3: gdm-binary.1.gz
Source4: gdm.1.gz
Source5: gdmXnest.1.gz
Source6: gdmXnestchooser.1.gz
@@ -29,10 +29,6 @@
Source13: gdmthemetester.1.gz
Source14: gdm-restart.1m.gz
Source15: gdm-safe-restart.1m.gz
-Source16: gdm-stop.1m.gz
-Source17: gdmconfig.1m.gz
-Source18: gdm-binary.1.gz
-Source19: l10n-configure.sh
%ifos solaris
Patch1: gdm-01-branding-defaults-solaris.diff
%else
@@ -43,11 +39,7 @@
Patch4: gdm-04-zh-hk-greeter-languages.diff
Patch5: gdm-05-normalise-locale-xiim-broken-filenames.diff
Patch6: gdm-06-g11n-truncated-username.diff
-Patch7: gdm-07-docs-figures.diff
-Patch8: gdm-08-help.diff
Patch9: gdm-09-fix-a11y-crash.diff
-Patch10: gdm-10-g11n-alllinguas.diff
-Patch11: gdm-11-l10n-online-help.diff
Patch12: gdm-12-current-locale.diff
Patch13: gdm-13-system-locale.diff
URL: www.gnome.org
@@ -113,24 +105,16 @@
%prep
%setup -q
-bzcat %SOURCE1 | tar -xf -
-bzcat %SOURCE2 | tar -xf -
-bzcat %SOURCE3 | tar -xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%patch9 -p1
-%patch10 -p1
-%patch11 -p1
%patch12 -p1
%patch13 -p1
-bash -x %SOURCE19
%build
%ifos linux
@@ -183,6 +167,9 @@
# rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexi*.desktop
rm -rf $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -195,9 +182,6 @@
install --mode=0644 %SOURCE13 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE14 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE15 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE16 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE17 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE18 $RPM_BUILD_ROOT%{_mandir}/man1
javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
--- a/gedit.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gedit.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,15 +14,9 @@
Vendor: Sun Microsystems, Inc.
Summary: Text Editor for GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gedit-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: gedit.1.gz
-Source4: gnome-text-editor.1.gz
-#FIXME: Source5: gedit-l10n-online-help-ci-linux-1.2.tar.bz2
-#FIXME: Source6: gedit_docs-0.4.tar.bz2
-#FIXME: Source7: gedit_docs-0.5linux.tar.bz2
+Source1: gedit.1.gz
+Source2: gnome-text-editor.1.gz
Patch1: gedit-01-g11n-utf8-autodetect.diff
-#FIXME: Patch2: gedit-02-l10n-online-help.diff
Patch3: gedit-03-command-pipe.diff
Patch4: gedit-04-g11n-i18n-ms-euc.diff
Patch5: gedit-05-spellcheck-fallback-to-enus.diff
@@ -60,21 +54,10 @@
%prep
%setup -q
%patch1 -p1
-#FIXME: %patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-%ifos solaris
-#FIXME: bzcat %SOURCE6 | tar xvf -
-%else
-#FIXME: bzcat %SOURCE7 | tar xvf -
-%endif
-#FIXME: bzcat %SOURCE5 | tar xvf -
-
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -105,8 +88,8 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
rm -rf $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
--- a/ggv.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/ggv.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,16 +14,10 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Ghostview
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
-#FIXME Source1: ggv-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: ggv.1.gz
-#FIXME Source4: ggv-l10n-online-help-ci-linux-1.2.tar.bz2
-#FIXME Source5: ggv_docs-0.3.tar.bz2
-#FIXME Source6: ggv_docs-0.4linux.tar.bz2
+Source1: ggv.1.gz
Patch1: ggv-01-menu-entry.diff
Patch2: ggv-02-solaris-print-path-issue.diff
Patch3: ggv-03-orientation.diff
-#FIXME Patch4: ggv-04-l10n-online-help.diff
Patch5: ggv-05-convert-uri-to-display-name.diff
Patch6: ggv-06-zoom-factor.diff
URL: http://www.gnome.org
@@ -49,18 +43,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-#FIXME %patch4 -p1
%patch5 -p1
%patch6 -p1
-#FIXME bzcat %SOURCE1 | tar xvf -
-%ifos solaris
-#FIXME bzcat %SOURCE5 | tar xvf -
-%else
-#FIXME bzcat %SOURCE6 | tar xvf -
-%endif
-#FIXME bzcat %SOURCE4 | tar xvf -
-
-bash -x %SOURCE2
%build
%ifos linux
@@ -96,7 +80,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
--- a/gimp.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gimp.spec Tue Aug 09 21:56:40 2005 +0000
@@ -20,12 +20,9 @@
Vendor: Sun Microsystems, Inc.
Summary: The GIMP (GNU Image Manipulation Program)
Source: ftp://ftp.gimp.org/pub/%{name}/v2.1/%{name}-%{version}.tar.bz2
-#FIXME Source1: gimp-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: gimp-help-2-0.%{help_version}.tar.bz2
+Source1: gimp-help-2-0.%{help_version}.tar.bz2
Patch1: gimp-01-menu-entry.diff
Patch2: gimp-02-remove-keys.diff
-#FIXME Patch3: gimp-03-g11n-potfiles.diff
URL: http://www.gimp.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -90,13 +87,10 @@
%prep
%setup -q
-#FIXME /usr/bin/bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
%patch2 -p1
-#FIXME %patch3 -p1
-/usr/bin/bzcat -dc %SOURCE3|tar xf -
+/usr/bin/bzcat -dc %SOURCE1|tar xf -
-bash -x %SOURCE2
%build
%ifos linux
--- a/glade.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/glade.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: GLADE User Interface Builder for GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-Source1: glade-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: glade-docs-0.1.tar.bz2
-Source4: glade-l10n-online-help-ci-linux-1.2.tar.bz2
Patch1: glade-01-menu-entry.diff
-Patch3: glade-03-g11n-potfiles.diff
-Patch4: glade-04-l10n-online-help.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_docdir}/doc
@@ -41,15 +35,7 @@
%prep
%setup -q
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
-/bin/touch `/usr/bin/bzcat -dc %SOURCE1|tar tf -`
-/usr/bin/bzcat -dc %SOURCE4 |tar xf -
%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-
-bash -x %SOURCE2
-bzcat %SOURCE3 | tar xf -
%build
%ifos linux
--- a/glib2.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/glib2.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Low level core compatibility library for GTK+ and GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/glib/2.6/glib-%{version}.tar.bz2
-# FIXME: Source1: glib2-l10n-po-1.16.tar.bz2
+Source1: libgthread-2.0.3.gz
Source2: glib-genmarshal.1.gz
Source3: glib-mkenums.1.gz
Source4: glib-gettextize.1.gz
@@ -22,8 +22,6 @@
Source6: libglib-2.0.3.gz
Source7: libgmodule-2.0.3.gz
Source8: libgobject-2.0.3.gz
-Source9: libgthread-2.0.3.gz
-Source10: l10n-configure.sh
Patch1: glib-01-gettext-macro.diff
Patch2: glib-02-convert-utf8.diff
Patch3: glib-03-default-patch.diff
@@ -63,8 +61,6 @@
%patch2 -p1
%patch3 -p1
-# FIXME: bzcat %SOURCE1 | tar xvf -
-
%ifos solaris
%ifarch amd64 sparcv9
cd ..
@@ -72,7 +68,6 @@
%endif
%endif
-bash -x %SOURCE10
%build
%ifos linux
@@ -149,6 +144,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -156,7 +152,6 @@
install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man3
install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man3
install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT%{_mandir}/man3
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/gnome-applets.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-applets.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,9 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Applets
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-applets-l10n-po-1.16.tar.bz2
-#FIXME: Source2: gnome-applets_docs-0.13linux.tar.bz2
-#FIXME: Source3: gnome-applets-l10n-online-help-ci-linux-1.2.tar.bz2
-Source4: gkb_xmmap.1.gz
-Source5: gnome-keyboard-layout.1.gz
-Source6: gswitchit-plugins-capplet.1.gz
-Source7: l10n-configure.sh
+Source1: gkb_xmmap.1.gz
+Source2: gnome-keyboard-layout.1.gz
+Source3: gswitchit-plugins-capplet.1.gz
Patch1: gnome-applets-01-disable-drivemount.diff
Patch2: gnome-applets-02-mini-commander-tooltip.diff
Patch3: gnome-applets-03-non-utf8-date-title.diff
@@ -58,9 +54,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xf -
-#FIXME: bzcat %SOURCE2 | tar xf -
-#FIXME: bzcat %SOURCE3 | tar xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -69,7 +62,6 @@
%patch5 -p1
%endif
-bash -x %SOURCE7
%build
libtoolize --force
@@ -93,9 +85,9 @@
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
# 6265900: Change xml file in accessx-status-C.omf from accessx-status.xml to
# gnome-access-guide.xml#dtconfig-21 (as in submitted file).
--- a/gnome-audio.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-audio.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Sounds for GNOME events.
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -29,7 +28,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%install
mkdir -p $RPM_BUILD_ROOT
--- a/gnome-backgrounds.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-backgrounds.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,8 +16,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Selection of backgrounds for the GNOME desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
-Source2: sun-backgrounds.tar.bz2
+Source1: sun-backgrounds.tar.bz2
Patch1: gnome-backgrounds-01-sun-backgrounds.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,10 +33,9 @@
%prep
%setup -q
-bzcat %SOURCE2 | tar xf -
+bzcat %SOURCE1 | tar xf -
%patch1 -p1
-bash -x %SOURCE1
%build
%ifos linux
--- a/gnome-cups-manager.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-cups-manager.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,18 +16,15 @@
Source: gnome-cups-manager-%{version}.tar.bz2
Source1: sun-testpage-a4.eps.bz2
Source2: sun-testpage-letter.eps.bz2
-#FIXME Source3: gnome-cups-manager-l10n-po-1.16.tar.bz2
Source4: gnome-cups-add.1.gz
Source5: gnome-cups-manager.1.gz
Source6: cupsd.conf.jds
#FIXME Source7: gnome-cups-manager.glade
#FIXME Source8: gnome-cups-add.glade
-Source9: l10n-configure.sh
Patch1: gnome-cups-manager-01-testpages.diff
Patch2: gnome-cups-manager-02-g11n-icon.diff
Patch3: gnome-cups-manager-03-g11n-i18n-ui.diff
Patch4: gnome-cups-manager-04-help-button.diff
-Patch5: gnome-cups-manager-05-g11n-potfiles.diff
Patch6: gnome-cups-manager-06-a11y.diff
Patch7: gnome-cups-manager-07-crash.diff
URL: http://www.gnome.org
@@ -85,17 +82,14 @@
%prep
%setup -q
-#FIXME bzcat %SOURCE3 | tar xvf -
cp %SOURCE1 %SOURCE2 gnome-cups-manager
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p1
-bash -x %SOURCE9
%build
bzip2 -d gnome-cups-manager/sun-testpage-a4.eps.bz2
--- a/gnome-desktop.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-desktop.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,16 +15,13 @@
Summary: GNOME Desktop Library
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
Source1: blueprint-extra-icons.tar.bz2
-#FIXME: Source2: gnome-desktop-l10n-po-1.16.tar.bz2
+Source2: gnome-feedback.xml
Source3: sun-gnome-version.xml
Source4: jds-64.gif
Source5: header-bg-jds1.png
Source6: gnome-about.1.gz
Source7: gnome-std-options.5.gz
Source8: gnome-cleanup
-Source9: gnome-feedback.xml
-Source10: l10n-configure.sh
-#FIXME: Source11: gnome-desktop-l10n-online-help-ci-linux-1.2.tar.bz2
Patch1: gnome-desktop-01-jds-about-branding.diff
Patch2: gnome-desktop-02-hicolor-icons.diff
URL: http://www.gnome.org
@@ -68,15 +65,11 @@
%prep
%setup -q
bzcat %SOURCE1 | tar xvf -
-#FIXME: bzcat %SOURCE2 | tar xvf -
+cp %SOURCE2 desktop-docs/gnome-feedback/C/gnome-feedback.xml
cp %SOURCE3 gnome-version.xml.in.in
cp %SOURCE4 gnome-about/gnome-64.gif
-cp %SOURCE9 desktop-docs/gnome-feedback/C/gnome-feedback.xml
%patch1 -p1
%patch2 -p1
-#FIXME: bzcat %SOURCE11 | tar xvf -
-
-bash -x %SOURCE10
%build
%ifos linux
--- a/gnome-games.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-games.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,8 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME games
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-games-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -38,9 +36,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xvf -
-
-bash -x %SOURCE2
%build
%ifos linux
--- a/gnome-icon-theme.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-icon-theme.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Icon Themes
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME:Source1: gnome-icon-theme-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Source3: branded-throbber.tar.gz
Source4: sun_java.png
Patch1: gnome-icon-theme-01-sun-java-icon.diff
@@ -37,13 +35,10 @@
%prep
%setup -q
-
-#FIXME: bzcat %SOURCE1 | tar xf -
gzip -dc %SOURCE3 | tar xvf -
cp %SOURCE4 48x48/apps/
%patch1 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/gnome-im-switcher.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-im-switcher.spec Tue Aug 09 21:56:40 2005 +0000
@@ -19,13 +19,8 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Input Method Switcher Applet
Source: %{name}-%{version}.tar.bz2
-Source1: %{name}-l10n-po-1.16.tar.bz2
-Source2: mkinstalldirs
-Source3: gnome-im-switcher-l10n-online-help-ci-linux-1.2.tar.bz2
-Source4: l10n-configure.sh
-Source5: %{name}-docs-0.2.tar.bz2
-Patch1: gnome-im-switcher-01-l10n-online-help.diff
-Patch2: gnome-im-switcher-02-g11n-potfiles.diff
+Source1: mkinstalldirs
+Source2: %{name}-docs-0.2.tar.bz2
Patch3: gnome-im-switcher-03-svn-2115.diff
Patch4: gnome-im-switcher-04-change-menu-name.diff
Patch5: gnome-im-switcher-05-figures.diff
@@ -82,13 +77,9 @@
%prep
%setup -q
-bzcat %SOURCE1 | tar xf -
-cp %SOURCE2 .
+cp %SOURCE1 .
+bzcat %SOURCE2 | tar xf -
-bzcat %SOURCE3 | tar xf -
-bzcat %SOURCE5 | tar xf -
-%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -101,7 +92,6 @@
## Package Build Section ##
#####################################
-bash -x %SOURCE4
%build
%ifos linux
--- a/gnome-keyring.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-keyring.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,8 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Key Ring
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-keyring-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: gnome-keyring-01-pkcs.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -63,11 +61,8 @@
%prep
%setup -q
-#FIXME: bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
--- a/gnome-mag.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-mag.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME magnifier
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.12/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-mag-l10n-po-1.16.tar.bz2
-Source2: magnifier.1.gz
-Source3: l10n-configure.sh
+Source1: magnifier.1.gz
Patch1: gnome-mag-01-uninstalled.pc.diff
URL: http://developer.gnome.org/projects/gap/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -43,9 +41,6 @@
%prep
%setup -q
%patch1 -p1
-#FIXME:/usr/bin/bzcat -dc %SOURCE1|tar xf -
-
-bash -x %SOURCE3
%build
%ifos linux
@@ -72,7 +67,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#clean up unpackaged files
rm $RPM_BUILD_ROOT%{_libdir}/*.la
--- a/gnome-media.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-media.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,17 +14,13 @@
Vendor: Sun Microsystems, Inc.
License: GPL
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-Source1: gnome-media-l10n-po-1.16.tar.bz2
-Source2: gnome-media_docs-0.6.tar.bz2
+Source1: gst-std-options.5.gz
+Source2: vumeter.1.gz
Source3: cddb-slave2-properties.1.gz
Source4: gnome-sound-recorder.1.gz
-Source5: gnome-media-l10n-online-help-ci-linux-1.2.tar.bz2
+Source5: gstreamer-properties.1.gz
Source6: gnome-audio-profiles-properties.1.gz
Source7: gnome-volume-control.1.gz
-Source8: gstreamer-properties.1.gz
-Source9: vumeter.1.gz
-Source10: gst-std-options.5.gz
-Source11: l10n-configure.sh
Patch1: gnome-media-01-window-title.diff
Patch2: gnome-media-02-cddb-display.diff
Patch3: gnome-media-03-disable-gnome-cd.diff
@@ -62,12 +58,6 @@
%patch2 -p1
%patch3 -p1
-bzcat %SOURCE1 | tar xf -
-bzcat %SOURCE2 | tar xf -
-bzcat %SOURCE5 | tar xf -
-
-bash -x %SOURCE11
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -102,13 +92,13 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man5
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man5
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE10 $RPM_BUILD_ROOT%{_mandir}/man5
#Copy zh_HK from zh_TW
#Fixes bug 4930405
--- a/gnome-menus.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-menus.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Implementation of Desktop Menu Specification for GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
Patch1: gnome-menus-01-uninstalled_pc.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,7 +48,6 @@
%setup -q
%patch1 -p1
-bash -x %SOURCE1
%build
%ifos linux
@@ -77,7 +75,7 @@
rm $RPM_BUILD_ROOT%{_libdir}/*.la
# FIXME: Giga-hack part 1 of 2 follows...
# file /etc/xdg/menus/applications.menu conflicts with desktop-data-SLES
-# Only on linux !!
+# Only on SuSE Linux !!
%ifos linux
mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications.menu \
$RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications.menu.new
--- a/gnome-mime-data.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-mime-data.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,13 +15,11 @@
Vendor: Sun Microsystems, Inc.
Summary: MIME Type and Application Database for the GNOME Desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-mime-data-l10n-po-1.16.tar.bz2
+Source1: gnome-realplay.keys
Source2: gnome-vfs.mime.4.gz
Source3: gnome-vfs-mime-magic.4.gz
Source4: gnome-vfs.applications.4.gz
Source5: gnome-vfs.keys.4.gz
-Source6: l10n-configure.sh
-Source7: gnome-realplay.keys
Patch1: gnome-mime-data-01-make-realplayer-default-player.diff
Patch2: gnome-mime-data-02-set-mozilla-default.diff
Patch3: gnome-mime-data-03-text-plain-handler.diff
@@ -33,7 +31,6 @@
Patch9: gnome-mime-data-09-shellscript.diff
Patch10: gnome-mime-data-10-associate-glade-files.diff
Patch11: gnome-mime-data-11-associate-java-files.diff
-#FIXME GNOME210:
Patch14: gnome-mime-data-14-return-path-pattern.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -69,9 +66,6 @@
%patch11 -p1
%patch14 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-bash -x %SOURCE6
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -106,7 +100,7 @@
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo \
$RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_datadir}/mime-info
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/mime-info
%post
--- a/gnome-nettool.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-nettool.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Networking Tools
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -36,7 +35,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/gnome-panel.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-panel.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,17 +16,12 @@
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.10/gnome-panel-%{version}.tar.bz2
Source1: gnome-panel-menu-stripe.png
Source2: gnome-main-menu.png
-#FIXME: Source3: gnome-panel-l10n-po-1.16.tar.bz2
+Source3: gnome-time-settings.apps
Source4: gnome-desktop-item-edit.1.gz
Source5: gnome-panel-preferences.1.gz
Source6: gnome-panel.1.gz
Source7: libpanel-applet-2.3.gz
Source8: world_map-960.png
-#FIXME:Source9: gnome-panel-l10n-online-help-ci-linux-1.2.tar.bz2
-Source10: gnome-time-settings.apps
-#FIXME: Source11: gnome-panel_docs-0.6linux.tar.bz2
-#FIXME: Source12: gnome-panel_docs-0.6solaris.tar.bz2
-Source13: l10n-configure.sh
Patch1: gnome-panel-01-linux-default-setup.diff
Patch2: gnome-panel-02-solaris-default-setup.diff
Patch3: gnome-panel-03-time-settings.diff
@@ -38,7 +33,6 @@
Patch9: gnome-panel-09-run-dialog.diff
Patch10: gnome-panel-10-notificationarea-tooltip.diff
Patch11: gnome-panel-11-menu-stripe.diff
-#FIXME: Patch13: gnome-panel-12-l10n-online-help.diff
Patch14: gnome-panel-13-input-method-filter-keypress.diff
Patch15: gnome-panel-14-clock-timezone.diff
Patch16: gnome-panel-15-launch-button.diff
@@ -116,7 +110,6 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
-#FIXME: %patch12 -p1
#FIXME: %patch13 -p1
%ifos linux
%patch14 -p1
@@ -127,15 +120,6 @@
%patch16 -p1
cp %SOURCE2 icons/gnome-main-menu.png
-#FIXME: bzcat %SOURCE3 | tar xf -
-%ifos linux
-#FIXME: bzcat %SOURCE11 | tar xf -
-%else
-#FIXME: bzcat %SOURCE12 | tar xf -
-%endif
-#FIXME: bzcat %SOURCE9 | tar xf -
-
-bash -x %SOURCE13
%build
%ifos linux
@@ -170,7 +154,7 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
%ifos linux
install -d $RPM_BUILD_ROOT%{_sbindir}
-install -m 644 -D %SOURCE10 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-time-settings
+install -m 644 -D %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/gnome-time-settings
mv $RPM_BUILD_ROOT%{_bindir}/gnome-time-settings $RPM_BUILD_ROOT%{_sbindir}/
(cd $RPM_BUILD_ROOT%{_bindir}; ln -sf consolehelper gnome-time-settings)
%endif
--- a/gnome-pilot.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-pilot.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,19 +14,11 @@
Vendor: Sun Microsystems, Inc.
Summary: PalmOS link utilities
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-pilot-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-#FIXME: Source3: gnome-pilot-l10n-online-help-ci-linux-1.1.tar.bz2
-Source4: gpilot-install-file.1.gz
-Source5: gpilotd-control-applet.1.gz
-#FIXME: Source6: gnome-pilot-docs-0.2.tar.bz2
-#FIXME: Source7: gnome-pilot-docs-0.3linux.tar.bz2
+Source1: gpilot-install-file.1.gz
+Source2: gpilotd-control-applet.1.gz
Patch1: gnome-pilot-01-menu-entry.diff
Patch2: gnome-pilot-02-g11n-i18n-ui.diff
Patch3: gnome-pilot-03-automake-fix.diff
-#FIXME: Apply when the Sources are applied Patch4: gnome-pilot-04-C-docs.diff
-Patch5: gnome-pilot-05-help-links.diff
-#FIXME: Apply when the Sources are applied Patch6: gnome-pilot-06-l10n-online-help.diff
URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Docdir: %{_defaultdocdir}/gnome-pilot
@@ -64,18 +56,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-#FIXME: See above %patch4 -p1
-%patch5 -p1
-#FIXME: See above %patch6 -p1
-bzcat %SOURCE1 | tar xvf -
-%ifos solaris
-bzcat %SOURCE6 | tar xvf -
-%else
-bzcat %SOURCE7 | tar xvf -
-%endif
-bzcat %SOURCE3 | tar xvf -
-
-bash -x %SOURCE2
%build
%ifos linux
@@ -111,8 +91,8 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
rm -rf $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
--- a/gnome-session.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-session.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,7 @@
Summary: Session Manager for the GNOME Desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
Source1: gnome-splash.png
-#FIXME: Source2: gnome-session-l10n-po-1.16.tar.bz2
+Source2: gnome-session-remove.1.gz
Source3: gnome-session.1.gz
Source4: gnome-session-save.1.gz
Source5: gnome-session-properties.1.gz
@@ -25,8 +25,6 @@
Source9: flash.gif
Source10: sun-logo.png
Source11: adobe-sun.png
-Source12: gnome-session-remove.1.gz
-Source13: l10n-configure.sh
Patch1: gnome-session-01-busy-cursor.diff
Patch2: gnome-session-02-splash-logos.diff
Patch3: gnome-session-03-gnome-atom.diff
@@ -70,9 +68,6 @@
cp %SOURCE9 gnome-session
cp %SOURCE10 gnome-session
cp %SOURCE11 gnome-session
-#FIXME: bzcat %SOURCE2 | tar xvf -
-
-bash -x %SOURCE13
%build
%ifos linux
@@ -113,12 +108,12 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man5
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE12 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT%{_mandir}/man5
%clean
--- a/gnome-speech.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-speech.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME text-to-speech engine
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.3/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
Patch1: gnome-speech-01-configure.diff
URL: http://developer.gnome.org/projects/gap/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,7 +49,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%ifos solaris
%patch1 -p1
--- a/gnome-spell.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-spell.spec Tue Aug 09 21:56:40 2005 +0000
@@ -20,9 +20,7 @@
Autoreqprov: on
URL: http://www.sun.com/software/javadesktopsystem/
Source: %{name}-%{version}%{t_suffix}.tar.bz2
-Source1: gnome-spell-l10n-po-1.16.tar.bz2
-Source2: mkinstalldirs
-Source3: l10n-configure.sh
+Source1: mkinstalldirs
Summary: GNOME spell checking component
Group: Applications/Text
@@ -52,10 +50,8 @@
%prep
%setup -q -n %{name}-%{version}
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
-cp %SOURCE2 .
+cp %SOURCE1 .
-bash -x %SOURCE3
%build
%ifos linux
--- a/gnome-system-monitor.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-system-monitor.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,12 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Simple process monitor
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-system-monitor-l10n-po-1.16.tar.bz2
-Source2: gnome-system-monitor.1.gz
-#FIXME: Source3: gnome-system-monitor-docs-0.3.tar.bz2
-#FIXME: Source4: gnome-system-monitor-l10n-online-help-ci-linux-1.2.tar.bz2
-Source5: l10n-configure.sh
-#FIXME: Patch1: gnome-system-monitor-01-l10n-online-help.diff
+Source1: gnome-system-monitor.1.gz
Patch2: gnome-system-monitor-02-selinux-configure.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,13 +40,8 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xf -
-#FIXME: bzcat %SOURCE3 | tar xf -
-#FIXME: bzcat %SOURCE4 | tar xf -
-#FIXME: %patch1 -p1
%patch2 -p1
-bash -x %SOURCE5
%build
%ifos linux
@@ -81,7 +71,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
--- a/gnome-system-tools.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-system-tools.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME System Tools
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -62,7 +61,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/gnome-terminal.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-terminal.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,12 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Terminal
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-terminal-l10n-online-help-ci-linux-1.2.tar.bz2
-#FIXME: Source2: gnome-terminal-l10n-po-1.16.tar.bz2
-Source3: l10n-configure.sh
-Source4: gnome-terminal.1.gz
-#FIXME: Source5: gnome-terminal_docs-0.3.tar.bz2
-#FIXME: Source6: gnome-terminal_docs-0.4linux.tar.bz2
+Source1: gnome-terminal.1.gz
Patch1: gnome-terminal-01-encodings.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,15 +45,6 @@
%prep
%setup -q
%patch1 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-#FIXME: bzcat %SOURCE2 | tar xvf -
-%ifos solaris
-#FIXME: bzcat %SOURCE5 | tar xvf -
-%else
-#FIXME: bzcat %SOURCE6 | tar xvf -
-%endif
-
-bash -x %SOURCE3
%build
%ifos linux
@@ -87,7 +73,7 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
chmod 644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/gnome-terminal/*/*.xml
rm -rf $RPM_BUILD_ROOT/usr/var/scrollkeeper
--- a/gnome-themes.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-themes.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,12 +14,9 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME themes
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-themes-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: accessibility-icons.tar.gz
-Source4: staroffice8-accessibility-icons.tar.gz
+Source1: accessibility-icons.tar.gz
+Source2: staroffice8-accessibility-icons.tar.gz
Patch1: gnome-themes-01-accessibility-icons.diff
-#FIXME GNOME210:
Patch8: gnome-themes-08-add-so8-a11y-icons.diff
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -40,13 +37,10 @@
%prep
%setup -q
%patch1 -p1
-#FIXME GNOME210:
%patch8 -p1
-gzip -dc %SOURCE3 | tar xvf -
-#FIXME: bzcat %SOURCE1 | tar xvf -
-gzip -dc %SOURCE4 | tar xvf -
+gzip -dc %SOURCE1 | tar xvf -
+gzip -dc %SOURCE2 | tar xvf -
-bash -x %SOURCE2
%build
%ifos linux
--- a/gnome-user-docs.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-user-docs.spec Tue Aug 09 21:56:40 2005 +0000
@@ -24,7 +24,6 @@
Source7: gnome-user-docs-UG-0.21solaris.tar.bz2
Source8: gnome-user-docs-ORMS-0.6solaris.tar.bz2
Source9: gnome-user-docs-ORMS-0.12linux.tar.bz2
-Source10: l10n-configure.sh
Patch1: gnome-user-docs-01-l10n-online-help.diff
Patch2: gnome-user-docs-02-sun-desktop-section.diff
Patch3: gnome-user-docs-03-add-l10n-docs.diff
@@ -93,7 +92,6 @@
%patch8 -p1
%patch1 -p1
-bash -x %SOURCE10
%build
%ifos linux
--- a/gnome-utils.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-utils.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,15 +14,10 @@
Vendor: Sun Microsystems, Inc.
Summary: Basic Utilities for the GNOME 2.0 Desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-utils-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: gnome-search-tool.1.gz
-Source4: gfloppy.1.gz
-Source5: gnome-dictionary.1.gz
-#FIXME: Source6: gnome-screenshot.1.gz
-#FIXME: Source7: gnome-utils-l10n-online-help-ci-linux-1.2.tar.bz2
-#FIXME: Source8: gnome-utils_docs-0.4.tar.bz2
-#FIXME: Source9: gnome-utils_docs-0.9linux.tar.bz2
+Source1: gnome-search-tool.1.gz
+Source2: gfloppy.1.gz
+Source3: gnome-dictionary.1.gz
+#FIXME: Source4: gnome-screenshot.1.gz
Patch1: gnome-utils-01-disable-logview-dictionary.diff
Patch2: gnome-utils-02-gfloppy-permission.diff
URL: http://www.gnome.org
@@ -62,16 +57,6 @@
%patch1 -p1
%patch2 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-%ifos solaris
-#FIXME: bzcat %SOURCE8 | tar xvf -
-%else
-#FIXME: bzcat %SOURCE9 | tar xvf -
-%endif
-#FIXME: bzcat %SOURCE7 | tar xvf -
-
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -102,10 +87,10 @@
make -i install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
-#FIXME: install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
+#FIXME: install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
--- a/gnome-vfs.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnome-vfs.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,14 +14,12 @@
Vendor: Sun Microsystems, Inc.
Summary: Virtual File System Library for GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gnome-vfs-l10n-po-1.16.tar.bz2
-Source2: libgnomevfs-2.3.gz
+Source1: libgnomevfs-2.3.gz
+Source2: gnomevfs-mkdir.1.gz
Source3: gnomevfs-cat.1.gz
Source4: gnomevfs-copy.1.gz
Source5: gnomevfs-info.1.gz
Source6: gnomevfs-ls.1.gz
-Source7: gnomevfs-mkdir.1.gz
-Source8: l10n-configure.sh
Patch1: gnome-vfs-01-uri-canonizing.diff
Patch2: gnome-vfs-02-uninstalled-pc.diff
Patch3: gnome-vfs-03-gopher-proxy-schema.diff
@@ -110,9 +108,6 @@
%patch15 -p1
%patch16 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-
-bash -x %SOURCE8
%build
%ifos linux
@@ -144,12 +139,12 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
rm $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.a
rm $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
rm $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.a
--- a/gnomemeeting.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnomemeeting.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,8 @@
Distribution: Java Desktop System
Summary: A GNOME based H.323 video conferencing application
Source: %{name}-%{version}.tar.bz2
-Source1: gnomemeeting-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: gnomemeeting-l10n-online-help-ci-linux-1.2.tar.bz2
-Source4: gnomemeeting-docs-0.1linux.tar.bz2
Patch1: gnomemeeting-01-correct-desktop-filename.diff
Patch2: gnomemeeting-02-configure-solaris.diff
-Patch3: gnomemeeting-03-l10n-online-help.diff
URL: http://www.gnomemeeting.org
BuildRoot: %{_tmppath}/%{name}-root
Docdir: %{_docdir}/%{name}
@@ -79,14 +74,8 @@
%prep
%setup -q -n gnomemeeting-%{version}
-bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-bzcat -dc %SOURCE3|tar xf -
-bzcat -dc %SOURCE4|tar xf -
-
-bash -x %SOURCE2
%build
%ifos linux
--- a/gnopernicus.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gnopernicus.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,12 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Integrated screen reader and magnifier for GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.11/%{name}-%{version}.tar.bz2
-Source1: gnopernicus-l10n-po-1.16.tar.bz2
-Source2: srcore.1.gz
-Source3: l10n-configure.sh
-Source4: gnopernicus-l10n-online-help-ci-linux-1.3.tar.bz2
-Source5: gnopernicus-docs-0.2.tar.bz2
-Source6: gnopernicus-docs-0.3linux.tar.bz2
+Source1: srcore.1.gz
Patch1: gnopernicus-01-figures.diff
Patch2: gnopernicus-02-configure.diff
#FIXME GNOME210: patch numbers
@@ -59,17 +54,6 @@
%patch5 -p1
%patch9 -p1
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
-%ifos solaris
-/usr/bin/bzcat -dc %SOURCE5|tar xf -
-%else
-/usr/bin/bzcat -dc %SOURCE6|tar xf -
-%endif
-
-/usr/bin/bzcat -dc %SOURCE4|tar xf -
-
-bash -x %SOURCE3
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -96,7 +80,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
javahelp-convert-install $RPM_BUILD_ROOT brlmonitor brlmonitor.xml
--- a/gok.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gok.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,8 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME On-screen Keyboard
Source: http://ftp.gnome.org/pub/GNOME/sources/gok/1.0/%{name}-%{version}.tar.bz2
-Source1: gok-l10n-po-1.16.tar.bz2
-Source2: gok-l10n-online-help-ci-linux-1.3.tar.bz2
-Source3: create-branching-keyboard.1.gz
-Source4: gok.1.gz
-Source5: l10n-configure.sh
-Source6: gok-docs-0.3.tar.bz2
-Source7: gok-docs-0.4linux.tar.bz2
+Source1: create-branching-keyboard.1.gz
+Source2: gok.1.gz
%ifos solaris
Patch1: gok-01-solaris-apps.diff
%else
@@ -74,22 +69,9 @@
%patch3 -p0
%patch4 -p0
%patch5 -p0
-
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
-
-%ifos solaris
-/usr/bin/bzcat -dc %SOURCE6|tar xf -
-%else
-/usr/bin/bzcat -dc %SOURCE7|tar xf -
-%endif
-
%patch8 -p1
%patch9 -p0
-/usr/bin/bzcat -dc %SOURCE2|tar xf -
-
-bash -x %SOURCE5
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -121,8 +103,8 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
--- a/gpdf.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gpdf.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,14 +14,9 @@
Vendor: Sun Microsystems, Inc.
Summary: A GNOME PDF Viewer based on Xpdf
Source: http://ftp.gnome.org/pub/GNOME/sources/gpdf/2.10/gpdf-%{version}.tar.bz2
-#FIXME: Source1: gpdf-l10n-po-1.16.tar.bz2
-Source2: gpdf.1.gz
-#FIXME: Source3: gpdf_docs-0.2.tar.bz2
-#FIXME: Source4: gpdf-l10n-online-help-ci-linux-1.2.tar.bz2
-Source5: l10n-configure.sh
+Source1: gpdf.1.gz
Patch1: gpdf-01-gconf-install.diff
Patch2: gpdf-02-multi-launch-apps.diff
-#FIXME: Patch3: gpdf-03-l10n-online-help.diff
Patch4: gpdf-04-fit-full-screen.diff
Patch5: gpdf-05-pkgconfig.diff
URL: http://www.purl.org/NET/gpdf
@@ -63,16 +58,9 @@
%setup -q
%patch1 -p1
%patch2 -p1
-#FIXME: %patch3 -p1
%patch4 -p1
%patch5 -p1
-#FIXME: bzcat %SOURCE1 | tar xf -
-#FIXME: bzcat %SOURCE3 | tar xf -
-#FIXME: bzcat %SOURCE4 | tar xf -
-
-bash -x %SOURCE5
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -98,7 +86,7 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/gphoto2.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gphoto2.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,6 @@
Summary: Digital camera utility
#FIXME: full url?
Source: gphoto2-%{version}.tar.bz2
-#FIXME: Source1: gphoto2-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: gphoto2-01-forte-configure.diff
Patch2: gphoto2-02-forte-fixes.diff
URL: http://www.gphoto.org
@@ -45,13 +43,11 @@
%prep
%setup -q -n gphoto2-%{version}
-#FIXME: bzcat -dc %SOURCE1 | tar xf -
%ifos solaris
%patch1 -p1
%patch2 -p1
%endif
-#FIXME: bash -x %SOURCE2
%build
%ifos linux
@@ -68,7 +64,6 @@
%ifos solaris
glib-gettextize -f
%endif
-#%{?suse_update_config:%{suse_update_config -f}}
libtoolize --copy --force
aclocal $ACLOCAL_FLAGS -I ./m4
automake -a -f
--- a/gst-plugins.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gst-plugins.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,12 +16,10 @@
Summary: GStreamer Streaming-media framework plug-ins.
URL: http://gstreamer.net/
Source: http://gstreamer.net/releases/%{version}/src/gst-plugins-%{version}.tar.bz2
-#FIXME: Source1: gst-plugins-l10n-po-1.16.tar.bz2
-Source2: gst-launch-ext-0.8.1.gz
-Source3: gst-launch-ext.1.gz
-Source4: libogg.3.gz
-Source5: libvorbis.3.gz
-Source6: l10n-configure.sh
+Source1: gst-launch-ext-0.8.1.gz
+Source2: gst-launch-ext.1.gz
+Source3: libogg.3.gz
+Source4: libvorbis.3.gz
Patch1: gst-plugins-01-gettext.diff
BuildRoot: %{_tmppath}/gst-plugins-%{version}-root
Docdir: %{_defaultdocdir}/doc
@@ -170,10 +168,8 @@
%prep
%setup -n gst-plugins-%{version} -q
-#FIXME: bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
-bash -x %SOURCE6
%build
@@ -297,10 +293,10 @@
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man3
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man3
# Clean out files that should not be part of the rpm.
# This is the recommended way of dealing with it for RH8
--- a/gst.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gst.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GStreamer streaming media framework runtime.
Source: http://gstreamer.net/releases/%{version}/src/%{name}-%{version}.tar.bz2
-#FIXME: Source1: gst-l10n-po-1.16.tar.bz2
Source2: gst-complete-0.8.1.gz
Source3: gst-complete.1.gz
Source4: gst-compprep-0.8.1.gz
@@ -39,8 +38,6 @@
Source22: libgstreamer-0.8.3.gz
Source23: libgstdataprotocol.3.gz
Source24: libgstgetbits.3.gz
-Source25: l10n-configure.sh
-Patch1: gst-01-g11n-potfiles.diff
Patch2: gst-02-gettext.diff
URL: http://gstreamer.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -109,11 +106,8 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xf -
-%patch1 -p1
%patch2 -p1
-bash -x %SOURCE25
%build
%ifos linux
--- a/gthumb.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gthumb.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,9 @@
Vendor: Sun Microsystems, Inc.
Summary: An image viewer and browser for GNOME.
Source: http://ftp.gnome.org/pub/GNOME/sources/gthumb/2.6/%{name}-%{version}.tar.bz2
-#FIXME Source1: gthumb-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: gthumb-01-menu-entry.diff
Patch2: gthumb-02-fix-makefile.diff
Patch3: gthumb-03-search.diff
-#FIXME Patch4: gthumb-04-g11n-potfiles.diff
-#FIXME Patch5: gthumb-05-g11n-alllinguas.diff
URL: http://gthumb.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_docdir}/doc
@@ -60,14 +56,9 @@
%prep
%setup -q
-#FIXME /usr/bin/bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
-#FIXME %patch4 -p1
-#FIXME %patch5 -p1
-
-bash -x %SOURCE2
%build
%ifos linux
--- a/gtk2.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gtk2.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,14 +16,12 @@
Source: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-%{version}.tar.bz2
Source1: gtk.unset-hack.sh
Source2: gtk.unset-hack.csh
-#FIXME: Source3: gtk2-l10n-po-1.16.tar.bz2
-Source4: gtk-query-immodules-2.0.1.gz
-Source5: gdk-pixbuf-csource.1.gz
-Source6: libgdk-x11-2.0.3.gz
-Source7: libgdk_pixbuf-2.0.3.gz
-Source8: libgdk_pixbuf_xlib-2.0.3.gz
-Source9: libgtk-x11-2.0.3.gz
-Source10: l10n-configure.sh
+Source3: gtk-query-immodules-2.0.1.gz
+Source4: gdk-pixbuf-csource.1.gz
+Source5: libgdk-x11-2.0.3.gz
+Source6: libgdk_pixbuf-2.0.3.gz
+Source7: libgdk_pixbuf_xlib-2.0.3.gz
+Source8: libgtk-x11-2.0.3.gz
Patch1: gtk+-01-window-icons-for-message-dialog.diff
Patch2: gtk+-02-fileseldlg-navbuttons.diff
Patch3: gtk+-03-gdk-x11-uninstalled-pc.diff
@@ -105,8 +103,6 @@
%patch13 -p1
%patch14 -p1
-#FIXME: bzcat %SOURCE3 | tar xvf -
-
%ifos solaris
%ifarch amd64 sparcv9
cd ..
@@ -114,7 +110,6 @@
%endif
%endif
-bash -x %SOURCE10
%build
%ifos linux
@@ -202,12 +197,12 @@
cp %SOURCE2 $RPM_BUILD_ROOT/etc/profile.d
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man3
install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man3
install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man3
install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT%{_mandir}/man3
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/gtkam.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gtkam.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,19 +15,14 @@
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: A GTK Digital Camera Viewing Tool
+#FIXME full url
Source: gtkam-%{version}.tar.bz2
Source1: gexif-%{gexif_version}.tar.bz2
-Source2: gtkam-l10n-po-1.16.tar.bz2
-Source3: l10n-configure.sh
-Source4: gtkam-docs-0.1.tar.bz2
-Source5: gtkam-l10n-online-help-ci-linux-1.3.tar.bz2
Patch1: gtkam-01-menu-entry.diff
Patch2: gtkam-02-enable-deprecated.diff
Patch3: gtkam-03-g11n-i18n.diff
Patch4: gtkam-04-solaris.diff
Patch5: gtkam-05-short-cut-key.diff
-Patch6: gtkam-06-g11n-potfiles.diff
-Patch7: gtkam-07-l10n-online-help.diff
Patch8: gtkam-08-wall.diff
URL: http://www.gphoto.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -49,21 +44,15 @@
%prep
%setup -q
bzcat %SOURCE1 | tar xf -
-bzcat %SOURCE2 | tar xf -
-bzcat %SOURCE4 | tar xf -
-bzcat %SOURCE5 | tar xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%ifos solaris
%patch8 -p1
%endif
-bash -x %SOURCE3
%build
%ifos linux
--- a/gtkhtml.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gtkhtml.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Library for HTML support in Evolution
Source: http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.6/gtkhtml-%{version}.tar.bz2
-#FIXME: no l10n tarballs
-#FIXME: no l10n-configure.sh
Patch1: gtkhtml-01-htmlpainter.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--- a/gtksourceview.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gtksourceview.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,9 +15,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Syntax highlighting text widget
Source: http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/1.0/gtksourceview-%{version}.tar.bz2
-#FIXME: Source1: gtksourceview-l10n-po-1.16.tar.bz2
-Source2: libgtksourceview-1.0.3.gz
-Source3: l10n-configure.sh
+Source1: libgtksourceview-1.0.3.gz
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -56,9 +54,6 @@
%prep
%setup -q
-#FIXME: bzcat -dc %SOURCE1 | tar xf -
-
-bash -x %SOURCE3
%build
%ifos linux
@@ -85,7 +80,7 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
%clean
rm -rf $RPM_BUILD_ROOT
--- a/gucharmap.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/gucharmap.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,12 +16,8 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Unicode Character Map
Source: http://ftp.gnome.org/pub/GNOME/sources/gucharmap/1.4/gucharmap-%{version}.tar.bz2
-#FIXME: Source1: gucharmap-l10n-po-1.16.tar.bz2
-Source2: gnome-character-map.1.gz
-Source3: gucharmap.1.gz
-#FIXME: Source4: gucharmap-docs-0.3.tar.bz2
-#FIXME: Source5: gucharmap-l10n-online-help-ci-linux-1.2.tar.bz2
-Source6: l10n-configure.sh
+Source1: gnome-character-map.1.gz
+Source2: gucharmap.1.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -49,11 +45,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xvf -
-#FIXME: bzcat %SOURCE4 | tar xvf -
-#FIXME: bzcat %SOURCE5 | tar xvf -
-
-bash -x %SOURCE6
%build
%ifos linux
@@ -79,8 +70,8 @@
make -i install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/hicolor-icon-theme.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/hicolor-icon-theme.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Hi Color Icon Theme
Source: %{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://freedesktop.org/Software/icon-theme
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -27,7 +26,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
aclocal $ACLOCAL_FLAGS
--- a/ifrestart.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/ifrestart.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
Summary: The network interface restart
Source: %{name}-%{version}.tar.bz2
Source1: ifrestart.1.gz
-Source2: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -30,7 +29,6 @@
%prep
%setup -q
-bash -x %SOURCE2
%build
perl ./build.pl --sysconfdir=%{_sysconfdir} --sbindir=%{_sbindir}
--- a/j2re-integration.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/j2re-integration.spec Tue Aug 09 21:56:40 2005 +0000
@@ -26,7 +26,6 @@
Source9: runjim.desktop
Source10: jimregis.desktop
Source11: JavaIM.directory
-Source12: l10n-configure.sh
URL: http://www.sun.com
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -57,7 +56,6 @@
cp %SOURCE11 .
-bash -x %SOURCE12
%install
install --mode=755 -d ${RPM_BUILD_ROOT}%{j2re_dir}/lib
--- a/java-access-bridge.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/java-access-bridge.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,11 +14,10 @@
Vendor: Sun Microsystems, Inc.
Summary: The Java Access Bridge for GNOME for Java Swing apps.
Source: http://ftp.gnome.org/Public/gnome/sources/java-access-bridge/1.4/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
Patch1: java-access-bridge-01-window-activate.diff
-# Patch1: java-access-bridge-01-install-fix.diff
-# Patch2: java-access-bridge-02-jdk150-fix.diff
-# Patch4: java-access-bridge-04-get-deleted-chars.diff
+#FIXME Patch1: java-access-bridge-01-install-fix.diff
+#FIXME Patch2: java-access-bridge-02-jdk150-fix.diff
+#FIXME Patch4: java-access-bridge-04-get-deleted-chars.diff
URL: http://developer.gnome.org/projects/gap
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -57,7 +56,6 @@
# %patch2 -p1
# %patch4 -p1
-bash -x %SOURCE1
%build
%ifos linux
--- a/javaapps.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/javaapps.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: A set of Java utilities
Source: %{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
BuildArchitectures: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -37,7 +36,6 @@
mkdir usr
mv bin share usr
-bash -x %SOURCE1
%files
%defattr(-,root,root)
--- a/javahelp-convert.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/javahelp-convert.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Javahelp converter scripts
Source: %{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -37,7 +36,6 @@
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/jds-registration.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/jds-registration.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Customer registration application.
Source: %{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -40,7 +39,6 @@
%define jre_home /usr/j2se/jre
%endif
-bash -x %SOURCE1
%build
%ifos linux
--- a/jdshelp.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/jdshelp.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,11 +16,8 @@
Vendor: Sun Microsystems, Inc.
Summary: Javahelp based online help
Source: %{name}-%{version}.tar.bz2
-Source1: jdshelp-l10n-online-help-ci-1.3.tar.bz2
-Source2: jds-help.1.gz
-Source3: jdshelp.1.gz
-Source4: l10n-configure.sh
-Patch1: jdshelp-01-l10n-online-help.diff
+Source1: jds-help.1.gz
+Source2: jdshelp.1.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: off
Prereq: /sbin/ldconfig
@@ -53,9 +50,6 @@
%prep
%setup -q
-%patch1 -p1
-bzip2 -c -d %SOURCE1 | tar xf -
-
%ifos linux
%define java_home /usr/java/jdk1.5.0_03
%define jre_home /usr/java/j2redefault
@@ -66,7 +60,6 @@
%define javahelp_home /usr/jdk/packages/javax.help-2.0
%endif
-bash -x %SOURCE4
%build
%ifos linux
@@ -97,8 +90,8 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
--- a/jdstoc.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/jdstoc.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Javahelp converter scripts
Source: %{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -31,7 +30,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/libIDL.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libIDL.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Summary: IDL parsing library
Source: http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-%{version}.tar.bz2
Source1: libIDL-2.3.gz
-Source2: l10n-configure.sh
URL: http://www.gnome.org
Docdir: %{_defaultdocdir}/doc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -58,7 +57,6 @@
%endif
-bash -x %SOURCE2
%build
%ifos linux
--- a/libart_lgpl.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libart_lgpl.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
Summary: Libart is a library for high-performace 2D graphics
Source: http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-%{version}.tar.bz2
Source1: libart_lgpl_2.3.gz
-Source2: l10n-configure.sh
URL: http://www.levien.com/libart
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -42,7 +41,6 @@
%prep
%setup -q
-bash -x %SOURCE2
%build
%ifos linux
--- a/libbonobo.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libbonobo.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,11 +14,9 @@
Vendor: Sun Microsystems, Inc.
Summary: Bonobo Base Library
Source: http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-%{version}.tar.bz2
-#FIXME: Source1: libbonobo-l10n-po-1.16.tar.bz2
+Source1: bonobo-slay.1.gz
Source2: libbonobo-2.3.gz
-Source3: bonobo-slay.1.gz
-Source4: libbonobo-activation.3.gz
-Source5: l10n-configure.sh
+Source3: libbonobo-activation.3.gz
Patch1: libbonobo-01-forte.diff
Patch2: libbonobo-02-popt.diff
URL: http://www.gnome.org
@@ -73,8 +71,6 @@
%patch1 -p1
%patch2 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-
%ifos solaris
%ifarch amd64 sparcv9
cd ..
@@ -82,7 +78,6 @@
%endif
%endif
-bash -x %SOURCE5
%build
%ifos linux
@@ -155,9 +150,9 @@
make -i DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man3
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/libbonoboui.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libbonoboui.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Bonobo Base User Interface Library
Source: http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.8/libbonoboui-%{version}.tar.bz2
-#FIXME: Source1: libbonoboui-l10n-po-1.16.tar.bz2
-Source2: libbonoboui-2.3.gz
-Source3: l10n-configure.sh
+Source1: libbonoboui-2.3.gz
Patch1: libbonoboui-01-solaris-backcompat.diff
#FIXME GNOME210:
Patch5: libbonoboui-05-nautilus-crash.diff
@@ -61,10 +59,6 @@
%endif
%patch5 -p1
-#FIXME: bzcat %SOURCE1 | tar xvf -
-
-bash -x %SOURCE3
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -91,7 +85,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/man/man3
rm $RPM_BUILD_ROOT%{_libdir}/*.a
rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a
--- a/libcroco.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libcroco.spec Tue Aug 09 21:56:40 2005 +0000
@@ -19,7 +19,6 @@
Vendor: Sun Microsystems, Inc.
Summary: The GNOME Structured File Library
Source: ftp://ftp.gnome.org/pub/GNOME/sources/libcroco/0.6/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://ftp.gnome.org/pub/gnome/sources/libcroco/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -83,7 +82,6 @@
## Package Build Section ##
#####################################
-bash -x %SOURCE1
%build
%ifos linux
--- a/libexif-gtk.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libexif-gtk.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,11 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: GTK widgets for viewing EXIF information
Source: %{name}-%{version}.tar.bz2
-Source1: libexif-gtk-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: libexif-gtk-01-enable-deprecated.diff
-Patch2: libexif-gtk-02-fix-potfile.diff
-Patch3: libexif-gtk-03-g11n-potfiles.diff
Patch4: libexif-gtk-04-gettext.diff
Patch5: libexif-gtk-05-solaris.diff
Patch6: libexif-gtk-06-uninstalled-pc.diff
@@ -39,15 +35,11 @@
%prep
%setup -q
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/libgail-gnome.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgail-gnome.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Accessibility implementation for GTK+ and GNOME libraries
Source: http://ftp.gnome.org/pub/GNOME/sources/libgail-gnome/1.0/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://developer.gnome.org/projects/gap
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -48,7 +47,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/libghttp.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libghttp.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
Vendor: Sun Microsystems, Inc.
Summary: A GNOME library for HTTP access
Source: ftp://ftp.gnome.org/pub/stable/sources/libghttp/libghttp-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -55,7 +54,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/libglade.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libglade.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Summary: Library for loading GLADE interfaces at runtime
Source: http://ftp.gnome.org/pub/GNOME/sources/libglade/2.5/libglade-%{version}.tar.bz2
Source1: libglade-2.0.3.gz
-Source2: l10n-configure.sh
URL: http://www.daa.com.au/~james/gnome/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -57,7 +56,6 @@
%endif
-bash -x %SOURCE2
%build
%ifos linux
--- a/libgnome.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgnome.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,10 +14,8 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Base Library
Source: http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.10/libgnome-%{version}.tar.bz2
-#FIXME: Source2: libgnome-l10n-po-1.16.tar.bz2
-Source4: libgnome-2.3.gz
-Source5: gnome-open.1.gz
-Source6: l10n-configure.sh
+Source1: gnome-open.1.gz
+Source2: libgnome-2.3.gz
Patch1: libgnome-01-default-background.diff
Patch2: libgnome-02-default-theme.diff
Patch3: libgnome-03-lockdown-schemas.diff
@@ -72,14 +70,12 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE2 | tar xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-bash -x %SOURCE6
%build
%ifos linux
@@ -110,8 +106,8 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
#Copy zh_HK from zh_TW
#Fixes bug 4930405
--- a/libgnomecanvas.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgnomecanvas.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Canvas Library for GNOME
Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/2.10/libgnomecanvas-%{version}.tar.bz2
-#FIXME: Source1: libgnomecanvas-l10n-po-1.16.tar.bz2
-Source2: libgnomecanvas-2.3.gz
-Source3: l10n-configure.sh
+Source1: libgnomecanvas-2.3.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -64,10 +62,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xvf -
-
-bash -x %SOURCE3
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -97,7 +91,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/libgnomecups.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgnomecups.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,8 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME CUPS Library
Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomecups/0.2/libgnomecups-%{version}.tar.bz2
-#FIXME: Source1: libgnomecups-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: libgnomecups-01-i18n-nautilus-printers.diff
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -53,10 +51,8 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xvf -
%patch1 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/libgnomeprint.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgnomeprint.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Print Library for the GNOME Desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.10/libgnomeprint-%{version}.tar.bz2
-#FIXME: Source1: libgnomeprint-l10n-po-1.16.tar.bz2
-Source2: libgnomeprint-2.2.3.gz
-Source3: l10n-configure.sh
+Source1: libgnomeprint-2.2.3.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -65,9 +63,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xf -
-
-bash -x %SOURCE3
%build
%ifos linux
@@ -102,7 +97,7 @@
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
rm $RPM_BUILD_ROOT%{_libdir}/*.a
rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/libgnomeprint/*/modules/*.a
--- a/libgnomeprintui.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgnomeprintui.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,10 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Print User Interface Library for the GNOME Desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.10/libgnomeprintui-%{version}.tar.bz2
-#FIXME: Source1: libgnomeprintui-l10n-po-1.16.tar.bz2
-Source2: libgnomeprintui-2.2.3.gz
-Source3: l10n-configure.sh
-Patch1: libgnomeprintui-01-g11n-potfiles.diff
+Source1: libgnomeprintui-2.2.3.gz
Patch2: libgnomeprintui-02-read-subheadings.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,11 +56,8 @@
%prep
%setup -q
-#FIXME:bzcat %SOURCE1 | tar xf -
-%patch1 -p1
%patch2 -p1
-bash -x %SOURCE3
%build
%ifos linux
--- a/libgnomeui.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgnomeui.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME User Interface Library
Source: http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.10/libgnomeui-%{version}.tar.bz2
-#FIXME: Source1: libgnomeui-l10n-po-1.16.tar.bz2
-Source2: libgnomeui-2.3.gz
-Source3: l10n-configure.sh
+Source1: libgnomeui-2.3.gz
Patch1: libgnomeui-01-g11n-i18n-ui.diff
Patch2: libgnomeui-02-icon-a11y.diff
Patch3: libgnomeui-03-a11y-children.diff
@@ -73,10 +71,6 @@
%patch4 -p1
%patch5 -p1
-#FIXME: bzcat %SOURCE1 | tar xf -
-
-bash -x %SOURCE3
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -106,7 +100,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/libgphoto2.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgphoto2.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,10 +16,7 @@
Source: libgphoto2-%{version}.tar.bz2
Source1: usermap.gphoto
Source2: usbcam
-#FIXME: Source3: libgphoto2-l10n-po-1.16.tar.bz2
-Source4: l10n-configure.sh
Patch1: libgphoto2-01-gettext.diff
-Patch2: libgphoto2-02-g11n-potfiles.diff
Patch3: libgphoto2-03-uninstalled-pc.diff
URL: http://www.gphoto.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,14 +42,12 @@
%prep
%setup -q
-#FIXME: bzcat -dc %SOURCE3 | tar xf -
%ifos solaris
%patch1 -p1
%endif
%patch2 -p1
%patch3 -p1
-bash -x %SOURCE4
%build
%ifos linux
--- a/libgsf.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgsf.spec Tue Aug 09 21:56:40 2005 +0000
@@ -19,7 +19,6 @@
Vendor: Sun Microsystems, Inc.
Summary: The GNOME Structured File Library
Source: http://ftp.gnome.org/pub/gnome/sources/libgsf/1.12/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
Patch0: libgsf-01-uninstalled-pc.diff
URL: http://ftp.gnome.org/pub/gnome/sources/libgsf/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -93,7 +92,6 @@
## Package Build Section ##
#####################################
-bash -x %SOURCE1
%build
%ifos linux
--- a/libgtop.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libgtop.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,8 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: libgtop System Information Library
Source: http://ftp.gnome.org/pub/GNOME/sources/libgtop/2.10/libgtop-%{version}.tar.bz2
-#FIXME: Source1: libgtop-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/dir
@@ -52,9 +50,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xf -
-
-bash -x %SOURCE2
%build
%ifos linux
--- a/libical.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libical.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: A library for iCal (RFC2445) parsing
Source: libical-0.23.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -29,7 +28,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/libmusicbrainz.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libmusicbrainz.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: A software library for accessing MusicBrainz servers
Source: http://www.musicbrainz.org/download/%{name}-%{version}.tar.gz
-Source1: l10n-configure.sh
URL: http://www.musicbrainz.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -37,7 +36,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/librsvg.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/librsvg.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
Source: http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.9/librsvg-%{version}.tar.bz2
Source1: rsvg.1.gz
Source2: librsvg-2.3.gz
-Source3: l10n-configure.sh
Patch1: librsvg-01-rsvg-text-void-ret.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -63,7 +62,6 @@
%setup -q
%patch1 -p1
-bash -x %SOURCE3
%build
%ifos linux
--- a/libwnck.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libwnck.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,8 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Window Navigator Construction Kit Library
Source: http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.10/libwnck-%{version}.tar.bz2
-#FIXME Source1: libwnck-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -49,9 +47,6 @@
%prep
%setup -q
-#bzcat %SOURCE1 | tar xf -
-
-bash -x %SOURCE2
%build
%ifos linux
--- a/libxklavier.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libxklavier.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,8 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Utility library for XKB
Source: libxklavier-%{version}.tar.bz2
-Source1: l10n-configure.sh
-#FIXME: Source2: libxklavier-l10n-po-1.16.tar.bz2
Patch1: libxklavier-01-wall.diff
#FIXME: Patch3: libxklavier-X-g11n-i18n-ui.diff
URL: http://www.freedesktop.org/Software/LibXklavier
@@ -25,11 +23,8 @@
Prereq: /sbin/ldconfig
%define libxml2_version 2.6.7
-# Fixme - doxyten seems to be unnecessary
-#%define doxygen_version 1.2.0
BuildRequires: libxml2-devel >= %{libxml2_version}
-#BuildRequires: doxygen >= %{doxygen_version}
Requires: libxml2 >= %{libxml2_version}
%description
@@ -48,7 +43,6 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE2 | tar xvf -
%patch1 -p1
@@ -57,7 +51,6 @@
#bash -x ./xfree86.sh
#%endif
-bash -x %SOURCE1
%build
%ifos linux
--- a/libxslt.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/libxslt.spec Tue Aug 09 21:56:40 2005 +0000
@@ -21,7 +21,6 @@
Vendor: Sun Microsystems, Inc.
Summary: XSL Transformation Library
Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxslt/libxslt-%{version}.tar.bz2
-Source1: l10n-configure.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libxml2 >= 2.4.17
URL: http://xmlsoft.org/XSLT/
@@ -82,7 +81,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/magicdev.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/magicdev.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,13 +14,10 @@
Vendor: Sun Microsystems, Inc.
Summary: A GNOME daemon for automatically mounting/playing CDs.
Source: magicdev-%{version}.tar.bz2
-Source1: magicdev-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: magicdev-01-autorun-and-subfs.diff
Patch2: magicdev-02-disable-CDR-DVD.diff
Patch3: magicdev-03-window-icon.diff
Patch4: magicdev-04-settings-menu-reorder.diff
-Patch6: magicdev-06-g11n_alllinguas.diff
Patch8: magicdev-08-no-mount.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
@@ -41,15 +38,12 @@
%prep
%setup -q
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch6 -p1
%patch8 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/metacity.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/metacity.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,12 +14,10 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Window Manager
Source: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.10/metacity-%{version}.tar.bz2
-#FIXME Source1: metacity-l10n-po-1.16.tar.bz2
+Source1: metacity-window-demo.1.gz
Source2: metacity.1.gz
Source3: metacity-theme-viewer.1.gz
Source4: metacity-message.1.gz
-Source5: metacity-window-demo.1.gz
-Source6: l10n-configure.sh
Patch1: metacity-01-default-theme.diff
Patch2: metacity-02-ctrl-esc-mod4-r.diff
Patch3: metacity-03-ctrl-alt-del.diff
@@ -60,9 +58,6 @@
%patch7 -p1
%patch8 -p1
-#FIXME bzcat %SOURCE1 | tar xf -
-
-bash -x %SOURCE6
%build
%ifos linux
@@ -93,10 +88,10 @@
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/mozilla.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/mozilla.spec Tue Aug 09 21:56:40 2005 +0000
@@ -35,7 +35,6 @@
Source10: mozilla-startscripts.tar
Source11: mozilla-exclude-list
Source12: mozilla-chrome-lang.txt
-Source13: l10n-configure.sh
URL: http://www.sun.com/software/javadesktopsystem/
@@ -210,7 +209,6 @@
## Package Build Section ##
#####################################
-bash -x %SOURCE13
%build
--- a/nautilus-cd-burner.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/nautilus-cd-burner.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,9 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: nautilus-cd-burner is an extension to Nautilus that makes it easy to write files to a CD burner.
Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.6/nautilus-cd-burner-%{version}.tar.bz2
-#Source1: nautilus-cd-burner-l10n-po-1.16.tar.bz2
-Source2: nautilus-cd-burner.1.gz
-Source3: l10n-configure.sh
+Source1: nautilus-cd-burner.1.gz
Patch1: nautilus-cd-burner-01-remove-Wall.diff
Patch2: nautilus-cd-burner-02-mkdtemp-sun-fix.diff
Patch3: nautilus-cd-burner-03-menuitem.diff
@@ -50,13 +48,11 @@
%prep
%setup -q
-#FIXME: bzcat %SOURCE1 | tar xvf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-bash -x %SOURCE3
%build
%ifos linux
@@ -85,7 +81,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
#Clean up unpackaged files
rm $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
--- a/nautilus.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/nautilus.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,10 +16,8 @@
Summary: The GNOME Filemanager
URL: http://www.gnome.org
Source: http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-%{version}.tar.bz2
-#Source1: nautilus-l10n-po-1.16.tar.bz2
-Source2: nautilus.1.gz
-Source3: nautilus-file-management-properties.1.gz
-Source4: l10n-configure.sh
+Source1: nautilus.1.gz
+Source2: nautilus-file-management-properties.1.gz
Patch1: nautilus-01-gestures.diff
Patch2: nautilus-02-cd-readonly-emblem.diff
Patch3: nautilus-03-trash-only-home.diff
@@ -121,9 +119,6 @@
%patch14 -p1
#FIXME GNOME210 %patch15 -p1
-#bzcat %SOURCE1 | tar xf -
-
-bash -x %SOURCE4
%build
%ifos linux
@@ -160,8 +155,8 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/man/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/man/man1
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
--- a/netapplet.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/netapplet.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,19 +15,13 @@
Vendor: Sun Microsystems, Inc.
Summary: The NetApplet allows to monitor and to control network devices.
Source: netapplet-%{version}.tar.bz2
-Source1: l10n-configure.sh
-Source2: netapplet-docs-0.2linux.tar.bz2
-Source3: netapplet-l10n-online-help-ci-linux-1.2.tar.bz2
-Source4: netapplet-l10n-po-1.16.tar.bz2
-Patch1: netapplet-01-docs.diff
-Patch2: netapplet-02-l10n-online-help.diff
+# FIXME: patch numbers!
Patch3: netapplet-03-accessibility-support.diff
Patch4: netapplet-04-no-gray-in-menu.diff
Patch5: netapplet-05-g11n-configure.diff
Patch6: netapplet-06-help-button.diff
Patch7: netapplet-07-netstatus.diff
Patch8: netapplet-08-proc-net-wireless.diff
-# FIXME: patch numbers!
Patch9: netapplet-04-no-wless-auto.diff
URL: http://www.gnome.org/
@@ -50,10 +44,6 @@
%prep
%setup -q
-bzcat %SOURCE2 | tar -xf -
-%patch1 -p1
-bzcat %SOURCE3 | tar -xf -
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -61,9 +51,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-bzcat %SOURCE4 | tar xf -
-
-bash -x %SOURCE1
%build
if [ -x /usr/bin/getconf ]; then
--- a/now.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/now.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,16 +15,9 @@
Vendor: Sun Microsystems, Inc.
Summary: The Sun Java System Calendar Server client applet
Source: now-%{version}.tar.bz2
-Source1: now-docs-0.2.tar.bz2
-Source2: now-l10n-po-1.16.tar.bz2
-Source3: now-l10n-online-help-ci-linux-1.2.tar.bz2
-Source4: l10n-configure.sh
-Patch1: now-03-docs.diff
Patch2: now-06-gmtoff.diff
-Patch3: now-06-help-build.diff
Patch4: now-07-g11n-i18n-ui.diff
Patch5: now-07-g11n-i18n-date.diff
-Patch6: now-08-l10n-online-help.diff
Patch7: now-09-prefs-about-tittle.diff
Patch8: now-10-launch-using-keynav.diff
URL: http://www.gnome.org/
@@ -49,21 +42,12 @@
%prep
%setup -q
-%patch1 -p1
-bzcat %SOURCE1 | tar xvf -
-rm -f po/*.po
-rm -f po/*.gmo
-bzcat %SOURCE2 | tar xvf -
-bzcat %SOURCE3 | tar xvf -
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
-bash -x %SOURCE4
%build
%ifos linux
--- a/openh323.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/openh323.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,8 @@
Summary: Library for H323 spec.
URL: http://www.openh323.org/
Source0: %{name}-%{version}.tar.bz2
+# WTF??
Source1: Speex-0.8.1.tar.bz2
-Source2: l10n-configure.sh
Patch1: openh323-01-libname.diff
BuildRoot: %{_tmppath}/%{name}-root
Docdir: %{_defaultdocdir}/doc
@@ -48,7 +48,6 @@
ln -s Speex-0.8.1 speex
-bash -x %SOURCE2
%build
%ifos linux
--- a/pam-usermode.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/pam-usermode.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: A PAM module which gives extra permissions to users at the console
Source: pam-usermode-%{version}.tar.bz2
-Source1: l10n-configure.sh
Patch1: pam-usermode-01-fixup-console-perms.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -44,7 +43,6 @@
%setup -q
%patch1
-bash -x %SOURCE1
%build
%ifos linux
--- a/patches/apoc-adapter-gconf-01-g11n-alllinguas.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urN apoc-adapter-gconf-1.0.1.bak/configure.in apoc-adapter-gconf-1.0.1/configure.in
---- apoc-adapter-gconf-1.0.1.bak/configure.in 2004-09-16 12:04:16.621126000 +0000
-+++ apoc-adapter-gconf-1.0.1/configure.in 2004-09-16 13:23:01.225504000 +0000
-@@ -169,7 +169,7 @@
- AC_CHECK_HEADER(pthread.h, have_pthread=yes)
- AM_CONDITIONAL(PTHREADS, test x$have_pthread=xyes)
-
--ALL_LINGUAS="de es fr it ja ko pl pt pt_BR ru sv zh_CN zh_HK zh_TW"
-+ALL_LINGUAS="cs de es fr hu it ja ko pl pt pt_BR ru sv zh_CN zh_HK zh_TW"
-
- AM_GLIB_GNU_GETTEXT
-
--- a/patches/apoc-adapter-gconf-01-global-listener.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1832 +0,0 @@
-Only in apoc-adapter-gconf: CVS
-Only in apoc-adapter-gconf-0.0.9: INSTALL
-Only in apoc-adapter-gconf-0.0.9: Makefile.in
-Only in apoc-adapter-gconf-0.0.9: aclocal.m4
-Only in apoc-adapter-gconf: apoc-adapter-gconf.spec
-Only in apoc-adapter-gconf: autogen.sh
-Only in apoc-adapter-gconf-0.0.9: config.guess
-Only in apoc-adapter-gconf-0.0.9: config.sub
-Only in apoc-adapter-gconf-0.0.9: configure
-Only in apoc-adapter-gconf-0.0.9: depcomp
-Only in apoc-adapter-gconf-0.0.9: install-sh
-Only in apoc-adapter-gconf-0.0.9: ltmain.sh
-Only in apoc-adapter-gconf-0.0.9: missing
-Only in apoc-adapter-gconf-0.0.9: mkinstalldirs
-Only in apoc-adapter-gconf/po: CVS
-diff -ur apoc-adapter-gconf-0.0.9/po/apoc-adapter-gconf0.pot apoc-adapter-gconf/po/apoc-adapter-gconf0.pot
---- apoc-adapter-gconf-0.0.9/po/apoc-adapter-gconf0.pot 2004-02-13 15:42:59.000000000 +0000
-+++ apoc-adapter-gconf/po/apoc-adapter-gconf0.pot 2004-01-06 13:05:56.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: de.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/de.po apoc-adapter-gconf/po/de.po
---- apoc-adapter-gconf-0.0.9/po/de.po 2004-02-13 15:42:59.000000000 +0000
-+++ apoc-adapter-gconf/po/de.po 2004-01-06 13:09:29.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: es.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/es.po apoc-adapter-gconf/po/es.po
---- apoc-adapter-gconf-0.0.9/po/es.po 2004-02-13 15:42:59.000000000 +0000
-+++ apoc-adapter-gconf/po/es.po 2004-01-06 13:09:34.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: fr.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/fr.po apoc-adapter-gconf/po/fr.po
---- apoc-adapter-gconf-0.0.9/po/fr.po 2004-02-13 15:42:59.000000000 +0000
-+++ apoc-adapter-gconf/po/fr.po 2004-01-06 13:09:39.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: it.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/it.po apoc-adapter-gconf/po/it.po
---- apoc-adapter-gconf-0.0.9/po/it.po 2004-02-13 15:42:59.000000000 +0000
-+++ apoc-adapter-gconf/po/it.po 2004-01-06 13:09:42.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: ja.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/ja.po apoc-adapter-gconf/po/ja.po
---- apoc-adapter-gconf-0.0.9/po/ja.po 2004-02-13 15:42:59.000000000 +0000
-+++ apoc-adapter-gconf/po/ja.po 2004-01-06 13:09:51.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: ko.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/ko.po apoc-adapter-gconf/po/ko.po
---- apoc-adapter-gconf-0.0.9/po/ko.po 2004-02-13 15:42:59.000000000 +0000
-+++ apoc-adapter-gconf/po/ko.po 2004-01-06 13:10:24.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: pl.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/pl.po apoc-adapter-gconf/po/pl.po
---- apoc-adapter-gconf-0.0.9/po/pl.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/pl.po 2004-01-06 13:10:28.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: pt.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/pt.po apoc-adapter-gconf/po/pt.po
---- apoc-adapter-gconf-0.0.9/po/pt.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/pt.po 2004-01-06 13:10:31.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: pt_BR.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/pt_BR.po apoc-adapter-gconf/po/pt_BR.po
---- apoc-adapter-gconf-0.0.9/po/pt_BR.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/pt_BR.po 2004-01-06 13:10:37.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: ru.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/ru.po apoc-adapter-gconf/po/ru.po
---- apoc-adapter-gconf-0.0.9/po/ru.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/ru.po 2004-01-06 13:10:42.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: sv.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/sv.po apoc-adapter-gconf/po/sv.po
---- apoc-adapter-gconf-0.0.9/po/sv.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/sv.po 2004-01-06 13:09:47.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: zh_CN.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/zh_CN.po apoc-adapter-gconf/po/zh_CN.po
---- apoc-adapter-gconf-0.0.9/po/zh_CN.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/zh_CN.po 2004-01-06 13:09:59.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: zh_HK.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/zh_HK.po apoc-adapter-gconf/po/zh_HK.po
---- apoc-adapter-gconf-0.0.9/po/zh_HK.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/zh_HK.po 2004-01-06 13:10:15.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf-0.0.9/po: zh_TW.gmo
-diff -ur apoc-adapter-gconf-0.0.9/po/zh_TW.po apoc-adapter-gconf/po/zh_TW.po
---- apoc-adapter-gconf-0.0.9/po/zh_TW.po 2004-02-13 15:43:00.000000000 +0000
-+++ apoc-adapter-gconf/po/zh_TW.po 2004-01-06 13:10:09.000000000 +0000
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2004-02-13 15:42+0000\n"
-+"POT-Creation-Date: 2004-01-06 13:05+0000\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <[email protected]>\n"
-@@ -50,7 +50,7 @@
- msgid "%s Trying to list subnodes of property node %s."
- msgstr ""
-
--#: src/apoc-node.c:980
-+#: src/apoc-node.c:956
- #, c-format
- msgid "%s Node %s changed its type over time!"
- msgstr ""
-@@ -92,7 +92,7 @@
- msgid "%s Impossible to load PAPI module: %s"
- msgstr ""
-
--#: src/apoc-papi.c:121
-+#: src/apoc-papi.c:117
- #, c-format
- msgid "%s One or more symbols in PAPI cannot be loaded: %s"
- msgstr ""
-@@ -127,62 +127,62 @@
- msgid "%s Source %s is unavailable."
- msgstr ""
-
--#: src/apoc-source.c:329
-+#: src/apoc-source.c:320
- #, c-format
- msgid "%s Error mapping node to value: %s"
- msgstr ""
-
--#: src/apoc-source.c:525
-+#: src/apoc-source.c:513
- #, c-format
- msgid "%s Couldn't register listener: %s"
- msgstr ""
-
--#: src/apoc-source.c:532
-+#: src/apoc-source.c:520
- #, c-format
- msgid "%s Couldn't register listener."
- msgstr ""
-
--#: src/apoc-source.c:610
-+#: src/apoc-source.c:598
- #, c-format
- msgid "%s Couldn't convert key '%s' to node path: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:104
-+#: src/apoc-tree-access.c:87
- #, c-format
- msgid "%s Received notification for non-existent tree (%s)."
- msgstr ""
-
--#: src/apoc-tree-access.c:226
-+#: src/apoc-tree-access.c:188
- #, c-format
- msgid "%s Cannot initialise PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:361
-+#: src/apoc-tree-access.c:288
- #, c-format
- msgid "%s Cannot add listener for %s to PAPI: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:574
-+#: src/apoc-tree-access.c:463
- #, c-format
- msgid "%s Error registering listener for %s: %s"
- msgstr ""
-
--#: src/apoc-tree-access.c:653
-+#: src/apoc-tree-access.c:545
- #, c-format
- msgid "%s Trying to remove an inexistent listener."
- msgstr ""
-
--#: src/apoc-tree-access.c:660
-+#: src/apoc-tree-access.c:552
- #, c-format
- msgid "%s Notification has no associated tree."
- msgstr ""
-
--#: src/apoc-tree.c:362
-+#: src/apoc-tree.c:360
- #, c-format
- msgid "%s Error listing component names: %s"
- msgstr ""
-
--#: src/apoc-tree.c:509
-+#: src/apoc-tree.c:507
- #, c-format
- msgid "%s Error reading layers for %s: %s"
- msgstr ""
-Only in apoc-adapter-gconf/src: .apoc-source-with-threads.c
-Only in apoc-adapter-gconf/src: .apoc-tree-access.c.swp
-Only in apoc-adapter-gconf/src: CVS
-Only in apoc-adapter-gconf-0.0.9/src: Makefile.in
-diff -ur apoc-adapter-gconf-0.0.9/src/apoc-tree-access.c apoc-adapter-gconf/src/apoc-tree-access.c
---- apoc-adapter-gconf-0.0.9/src/apoc-tree-access.c 2004-02-13 15:38:30.000000000 +0000
-+++ apoc-adapter-gconf/src/apoc-tree-access.c 2004-02-19 17:38:46.000000000 +0000
-@@ -62,14 +62,16 @@
- */
- struct privApocTreeAccess
- {
-- GHashTable *mTrees ; /** Component to tree hashtable, cache. */
-- ApocPapi *mPapi ; /** PAPI functions.*/
-- PAPI *mPapiConnection ; /** PAPI connection. */
-- gint mRefCount ; /** Sharing reference count. */
-- GArray *mListeners ; /** Array of callback/context pairs. */
-- GArray *mSpecialListeners ; /** Array of integers pointing into the
-- main notification array for the
-- special notifications. */
-+ GHashTable *mTrees ; /** Component to tree cache. */
-+ ApocPapi *mPapi ; /** PAPI functions.*/
-+ PAPI *mPapiConnection ; /** PAPI connection. */
-+ PAPIListenerId mGlobalListener ; /** Global PAPI listener for all
-+ components. */
-+ gint mRefCount ; /** Sharing reference count. */
-+ GArray *mListeners ; /** Array of callback/context pairs. */
-+ GArray *mSpecialListeners ; /** Array of integers pointing into the
-+ main notification array for the
-+ special notifications. */
- } ;
-
- /**
-@@ -137,16 +139,22 @@
- */
- static void deleteApocTreeAccess(ApocTreeAccess *aTreeAccess)
- {
-- if (aTreeAccess->mTrees != NULL)
-- {
-- g_hash_table_foreach(aTreeAccess->mTrees, destroyCacheElement,
-- aTreeAccess) ;
-- g_hash_table_destroy(aTreeAccess->mTrees) ;
-- }
- if (aTreeAccess->mPapiConnection != NULL)
- {
- PAPIStatus status = PAPISuccess ;
-
-+ if (aTreeAccess->mTrees != NULL)
-+ {
-+ g_hash_table_foreach(aTreeAccess->mTrees, destroyCacheElement,
-+ aTreeAccess) ;
-+ g_hash_table_destroy(aTreeAccess->mTrees) ;
-+ }
-+ if (aTreeAccess->mGlobalListener != NULL)
-+ {
-+ aTreeAccess->mPapi->mRemoveListener(aTreeAccess->mPapiConnection,
-+ aTreeAccess->mGlobalListener,
-+ NULL) ;
-+ }
- aTreeAccess->mPapi->mDeinitialise(aTreeAccess->mPapiConnection,
- &status) ;
- }
-@@ -195,6 +203,29 @@
- }
-
- /**
-+ Registers a global listener for all possible trees.
-+ */
-+static void apocTreeAccessRegisterGlobalListener(ApocTreeAccess *aTreeAccess)
-+{
-+ PAPIStatus status = PAPISuccess ;
-+
-+ g_return_if_fail(aTreeAccess != NULL) ;
-+ if (aTreeAccess->mPapiConnection == NULL) { return ; }
-+ aTreeAccess->mGlobalListener =
-+ aTreeAccess->mPapi->mAddListener(aTreeAccess->mPapiConnection,
-+ apocNodePathGetCommonPrefix(),
-+ treeChangeListener,
-+ aTreeAccess,
-+ &status) ;
-+ if (status != PAPISuccess)
-+ {
-+ gconf_log(GCL_WARNING, _("%s Cannot add listener for %s to PAPI: %s"),
-+ MODULE, apocNodePathGetCommonPrefix(),
-+ apocPapiGetError(status)) ;
-+ }
-+}
-+
-+/**
- Constructor of a potentially shared Apoc tree access object.
- */
- static ApocTreeAccess *newApocTreeAccess(const gchar *aParameters,
-@@ -220,6 +251,7 @@
- retCode->mPapiConnection = retCode->mPapi->mInitialise(NULL,
- &status) ;
- }
-+ apocTreeAccessRegisterGlobalListener(retCode) ;
- if (retCode->mPapiConnection == NULL)
- {
- gconf_set_error(aError, GCONF_ERROR_FAILED,
-@@ -342,30 +374,6 @@
- }
-
- /**
-- Registers a tree for change detection with the PAPI.
-- */
--void apocTreeAccessRegisterTree(const ApocTreeAccess *aTreeAccess,
-- ApocTreeHolder *aHolder)
--{
-- PAPIStatus status = PAPISuccess ;
--
-- aHolder->mListenerId = aTreeAccess->mPapi->mAddListener(
-- aTreeAccess->mPapiConnection,
-- apocTreeGetName(aHolder->mTree),
-- treeChangeListener,
-- (gpointer) aTreeAccess,
-- &status) ;
-- if (status != PAPISuccess)
-- {
-- gconf_log(GCL_WARNING,
-- _("%s Cannot add listener for %s to PAPI: %s"),
-- MODULE, apocTreeGetName(aHolder->mTree),
-- apocPapiGetError(status)) ;
-- return ;
-- }
--}
--
--/**
- Checks if a newly created tree needs to be added a PAPI listener
- on behalf of a special listener which should contain it.
- */
-@@ -433,7 +441,6 @@
- g_hash_table_insert(aTreeAccess->mTrees,
- (gpointer) apocTreeGetName(tree),
- retCode) ;
-- apocTreeAccessRegisterTree(aTreeAccess, retCode) ;
- apocTreeAccessCheckSpecialListeners(aTreeAccess,
- retCode, aError) ;
- }
-diff -ur apoc-adapter-gconf-0.0.9/src/apoc-tree.c apoc-adapter-gconf/src/apoc-tree.c
---- apoc-adapter-gconf-0.0.9/src/apoc-tree.c 2004-02-13 12:49:26.000000000 +0000
-+++ apoc-adapter-gconf/src/apoc-tree.c 2004-02-17 11:07:12.000000000 +0000
-@@ -65,16 +65,21 @@
- }
-
- /** Prefix for all GConf mapped components. */
--static const gchar *kOrgGnomePrefix = "org.gnome" ;
-+#define ORG_GNOME_PREFIX "org.gnome"
-+
-+const gchar *apocNodePathGetCommonPrefix(void)
-+{
-+ return ORG_GNOME_PREFIX "." ;
-+}
-
- /** Identifies the Out Of Convention (OOC) keys in the component structure. */
--static const gchar *kOocPart = ".ooc" ;
-+#define OOC_PART ".ooc"
-
- /**
- Aggregation of the prefix and OOC indicator, which represents the
- "root" ApocNodePath (i.e what '/' gets mapped to).
- */
--static const gchar *kRootPath = "org.gnome.ooc" ;
-+static const gchar *kRootPath = ORG_GNOME_PREFIX OOC_PART ;
-
- /** List of special directories in the mapping algorithm. */
- static const gchar *kSpecialDirectories [] =
-@@ -105,7 +110,7 @@
- /* If we're here, the current subdirectory is not a special one,
- so we put the OOC indicator in the component but don't move
- the pointers. */
-- g_string_append(aComponent, kOocPart) ;
-+ g_string_append(aComponent, OOC_PART) ;
- }
-
- /**
-@@ -120,10 +125,10 @@
- const gchar *slash = NULL ;
- GString *component = NULL ;
-
-- component = g_string_new(kOrgGnomePrefix) ;
-+ component = g_string_new(ORG_GNOME_PREFIX) ;
- if (*aKey == 0)
- { /* Empty string, easy case. */
-- g_string_append(component, kOocPart) ;
-+ g_string_append(component, OOC_PART) ;
- *aComponent = g_string_free(component, FALSE) ;
- *aStartPath = aKey ;
- return ;
-@@ -268,7 +273,7 @@
- g_return_val_if_fail(aPath != NULL && aTree != NULL, FALSE) ;
- if (strcmp(aPath, kRootPath) == 0)
- {
-- filter = kOrgGnomePrefix ;
-+ filter = ORG_GNOME_PREFIX ;
- }
- else
- {
-@@ -599,12 +604,12 @@
- g_return_val_if_fail(aTree != NULL, NULL) ;
- name = aTree->mName ;
- /* The name begins with the common component part */
-- length = strlen(kOrgGnomePrefix) ;
-- if (strncmp(name, kOrgGnomePrefix, length) == 0)
-+ length = strlen(ORG_GNOME_PREFIX) ;
-+ if (strncmp(name, ORG_GNOME_PREFIX, length) == 0)
- {
- name += length ;
-- length = strlen(kOocPart) ;
-- if (strncmp(name, kOocPart, length) == 0)
-+ length = strlen(OOC_PART) ;
-+ if (strncmp(name, OOC_PART, length) == 0)
- { /* If we have an ooc, we skip it */
- name += length ;
- }
-diff -ur apoc-adapter-gconf-0.0.9/src/apoc-tree.h apoc-adapter-gconf/src/apoc-tree.h
---- apoc-adapter-gconf-0.0.9/src/apoc-tree.h 2003-12-11 16:05:00.000000000 +0000
-+++ apoc-adapter-gconf/src/apoc-tree.h 2004-02-17 10:48:41.000000000 +0000
-@@ -12,6 +12,10 @@
- */
- typedef struct privApocNodePath ApocNodePath ;
- /**
-+ Accessor to the common prefix of all node paths.
-+ */
-+const gchar *apocNodePathGetCommonPrefix(void) ;
-+/**
- Accessor to the component part of the node path.
- */
- const gchar *apocNodePathGetComponent(const ApocNodePath *aPath) ;
--- a/patches/eog-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -rNau eog-2.6.1/configure.in eog-2.6.1.new/configure.in
---- eog-2.6.1/configure.in 2004-04-22 03:02:40.000000000 +0900
-+++ eog-2.6.1.new/configure.in 2004-10-28 10:48:00.000000000 +0900
-@@ -208,6 +208,8 @@
- help/ko/Makefile
- help/zh_CN/Makefile
- help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
- shell/Makefile
- shell/recent-files/Makefile
- po/Makefile.in
-diff -rNau eog-2.6.1/help/Makefile.am eog-2.6.1.new/help/Makefile.am
---- eog-2.6.1/help/Makefile.am 2004-04-22 02:05:16.000000000 +0900
-+++ eog-2.6.1.new/help/Makefile.am 2004-10-28 11:19:55.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C de es eu fr it sv ja ko zh_CN zh_TW
-+SUBDIRS = C de es eu fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
--- a/patches/fsexam-g11n-desktopfix.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -urN fsexam-0.3.orig/data/fsexam.desktop.in fsexam-0.3/data/fsexam.desktop.in
---- fsexam-0.3.orig/data/fsexam.desktop.in 2004-10-14 14:37:34.121913136 +0100
-+++ fsexam-0.3/data/fsexam.desktop.in 2004-10-14 14:52:12.690350432 +0100
-@@ -1,13 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
--Name=File System Examiner
--Name[ja]=ファイルシステム検査器
--Name[ko]=파일 시스템 검사기
--Name[zh_CN]=文件系统检查器
--Name[zh_HK]=檔案系統檢查程式
--Name[zh_TW]=檔案系統檢查程式
--Comment=Help migrate from legacy encoding to UTF8
--Comment[zh_CN]=移植到UTF8编码
-+_Name=File System Examiner
-+_Comment=Help migrate from legacy encoding to UTF8
- Exec=fsexam %U
- Terminal=0
- Type=Application
-diff -urN fsexam-0.3.orig/po/POTFILES.in fsexam-0.3/po/POTFILES.in
---- fsexam-0.3.orig/po/POTFILES.in 2004-10-14 14:37:34.113914352 +0100
-+++ fsexam-0.3/po/POTFILES.in 2004-10-14 14:53:13.699075696 +0100
-@@ -6,3 +6,4 @@
- src/fsexam-preference.c
- src/fsexam-content.c
- data/fsexam.schemas.in
-+data/fsexam.desktop.in
--- a/patches/gaim-07-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
---- gaim-1.3.0/po/POTFILES.in 2005-05-01 14:55:45.000000000 +1200
-+++ gaim-1.3.0-hacked/po/POTFILES.in 2005-06-10 03:44:53.536690560 +1200
-@@ -1,12 +1,10 @@
-+gaim.desktop.in
- plugins/autorecon.c
--plugins/chkmail.c
--plugins/contact_priority.c
- plugins/docklet/docklet.c
- plugins/docklet/docklet-win32.c
- plugins/docklet/eggtrayicon.c
- plugins/extplacement.c
- plugins/filectl.c
--plugins/gaiminc.c
- plugins/gaim-remote/remote.c
- plugins/gestures/gestures.c
- plugins/gevolution/add_buddy_dialog.c
-@@ -15,12 +13,9 @@
- plugins/gevolution/gevolution.c
- plugins/gevolution/gevo-util.c
- plugins/gevolution/new_person_dialog.c
--plugins/gtk-signals-test.c
- plugins/history.c
- plugins/iconaway.c
- plugins/idle.c
--plugins/ipc-test-client.c
--plugins/ipc-test-server.c
- plugins/mailchk.c
- plugins/notify.c
- plugins/perl/perl.c
-@@ -69,7 +64,6 @@
- src/plugin.c
- src/prefs.c
- src/protocols/gg/gg.c
--src/protocols/icq/gaim_icq.c
- src/protocols/irc/cmds.c
- src/protocols/irc/dcc_send.c
- src/protocols/irc/irc.c
-@@ -119,6 +113,7 @@
- src/protocols/novell/nmuser.c
- src/protocols/novell/novell.c
- src/protocols/oscar/oscar.c
-+src/protocols/rendezvous/rendezvous.c
- src/protocols/silc/buddy.c
- src/protocols/silc/chat.c
- src/protocols/silc/ft.c
--- a/patches/gaim-09-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-diff -urN gaim-1.3.0/configure.ac gaim-1.3.0-hacked/configure.ac
---- gaim-1.3.0/configure.ac 2005-06-10 04:04:48.870972128 +1200
-+++ gaim-1.3.0-hacked/configure.ac 2005-06-10 04:04:03.359890864 +1200
-@@ -1168,6 +1168,19 @@
- Doxyfile
- gaim.apspec
- doc/Makefile
-+ help/Makefile
-+ help/C/Makefile
-+ help/de/Makefile
-+ help/es/Makefile
-+ help/fr/Makefile
-+ help/it/Makefile
-+ help/sv/Makefile
-+ help/pt_BR/Makefile
-+ help/ja/Makefile
-+ help/ko/Makefile
-+ help/zh_CN/Makefile
-+ help/zh_TW/Makefile
-+ help/zh_HK/Makefile
- doc/gaim.1
- doc/gaim-remote.1
- intl/Makefile
-diff -urN gaim-1.3.0/configure.ac.orig gaim-1.3.0-hacked/configure.ac.orig
---- gaim-1.3.0/configure.ac.orig 2005-06-10 04:04:31.059679856 +1200
-+++ gaim-1.3.0-hacked/configure.ac.orig 2005-06-10 04:03:51.907631872 +1200
-@@ -37,8 +37,11 @@
- esac
-
- ALL_LINGUAS="am az bg ca cs da de en_AU en_CA en_GB es et fi fr he hi hu it ja ka ko lt mk my_MM nb nl pl pt_BR pt ro ru sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
--AM_GNU_GETTEXT_VERSION(0.10.40)
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+USE_INCLUDED_LIBINTL=no
-+AC_SUBST(USE_INCLUDED_LIBINTL)
-+BUILD_INCLUDED_LIBINTL=no
-+AC_SUBST(BUILD_INCLUDED_LIBINTL)
-
- dnl we don't use autobreak on cygwin!!
- dnl AC_CYGWIN
-@@ -156,7 +159,7 @@
- fi
-
- if test "x$STATIC_PRPLS" = "xall" ; then
-- STATIC_PRPLS="gg irc jabber msn napster novell oscar silc yahoo zephyr"
-+ STATIC_PRPLS="irc jabber msn novell oscar silc yahoo"
- fi
- if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc//'`
-@@ -1165,6 +1168,8 @@
- Doxyfile
- gaim.apspec
- doc/Makefile
-+ help/Makefile
-+ help/C/Makefile
- doc/gaim.1
- doc/gaim-remote.1
- intl/Makefile
-diff -urN gaim-1.3.0/help/C/Makefile.am gaim-1.3.0-hacked/help/C/Makefile.am
---- gaim-1.3.0/help/C/Makefile.am 1970-01-01 12:00:00.000000000 +1200
-+++ gaim-1.3.0-hacked/help/C/Makefile.am 2005-06-10 04:03:51.919630048 +1200
-@@ -0,0 +1,7 @@
-+figdir = figures
-+docname = gaim
-+lang = C
-+omffile = gaim-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN gaim-1.3.0/help/Makefile.am gaim-1.3.0-hacked/help/Makefile.am
---- gaim-1.3.0/help/Makefile.am 1970-01-01 12:00:00.000000000 +1200
-+++ gaim-1.3.0-hacked/help/Makefile.am 2005-06-10 04:04:03.360890712 +1200
-@@ -0,0 +1,2 @@
-+SUBDIRS = C de es fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
-+
-diff -urN gaim-1.3.0/Makefile.am gaim-1.3.0-hacked/Makefile.am
---- gaim-1.3.0/Makefile.am 2005-06-10 04:04:31.013686848 +1200
-+++ gaim-1.3.0-hacked/Makefile.am 2005-06-10 04:03:51.887634912 +1200
-@@ -46,7 +46,7 @@
- apps_DATA = $(apps_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
-
--SUBDIRS = doc intl pixmaps plugins po sounds src
-+SUBDIRS = doc intl pixmaps plugins po sounds src help
-
- docs: Doxyfile
- @doxygen
-diff -urN gaim-1.3.0/Makefile.am.orig gaim-1.3.0-hacked/Makefile.am.orig
---- gaim-1.3.0/Makefile.am.orig 2004-12-03 09:15:51.000000000 +1300
-+++ gaim-1.3.0-hacked/Makefile.am.orig 2005-06-10 04:03:18.633690280 +1200
-@@ -5,6 +5,7 @@
- gaim.spec.in \
- gaim.apspec.in \
- gaim.desktop \
-+ gaim.desktop.in \
- gaim2blt.pl \
- gaim-installer.nsi \
- HACKING \
-@@ -23,7 +24,10 @@
- plugins/win32/winprefs/gtkappbar.h \
- plugins/win32/winprefs/Makefile.mingw \
- plugins/win32/winprefs/winprefs.c \
-- po/Makefile.mingw
-+ po/Makefile.mingw \
-+ intltool-extract.in \
-+ intltool-merge.in \
-+ intltool-update.in
-
- gaimincludedir=$(includedir)/gaim
- gaiminclude_HEADERS = config.h
-@@ -38,7 +42,9 @@
- # cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common
-
- appsdir = $(datadir)/applications
--apps_DATA = gaim.desktop
-+apps_in_files = gaim.desktop.in
-+apps_DATA = $(apps_in_files:.desktop.in=.desktop)
-+@INTLTOOL_DESKTOP_RULE@
-
- SUBDIRS = doc intl pixmaps plugins po sounds src
-
-diff -urN gaim-1.3.0/omf.make gaim-1.3.0-hacked/omf.make
---- gaim-1.3.0/omf.make 1970-01-01 12:00:00.000000000 +1200
-+++ gaim-1.3.0-hacked/omf.make 2005-06-10 04:03:51.920629896 +1200
-@@ -0,0 +1,53 @@
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# This file contains the build instructions for installing OMF files. It is
-+# generally called from the makefiles for particular formats of documentation.
-+#
-+# Note that you must configure your package with --localstatedir=/var/lib
-+# so that the scrollkeeper-update command below will update the database
-+# in the standard scrollkeeper directory.
-+#
-+# If it is impossible to configure with --localstatedir=/var/lib, then
-+# modify the definition of scrollkeeper_localstate_dir so that
-+# it points to the correct location. Note that you must still use
-+# $(localstatedir) in this or when people build RPMs it will update
-+# the real database on their system instead of the one under RPM_BUILD_ROOT.
-+#
-+# Note: This make file is not incorporated into xmldocs.make because, in
-+# general, there will be other documents install besides XML documents
-+# and the makefiles for these formats should also include this file.
-+#
-+# About this file:
-+# This file was taken from scrollkeeper_example2, a package illustrating
-+# how to install documentation and OMF files for use with ScrollKeeper
-+# 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.2 (last updated: March 20, 2002)
-+#
-+
-+omf_dest_dir=$(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+
-+omf: omf_timestamp
-+
-+omf_timestamp: $(omffile)
-+ -for file in $(omffile); do \
-+ scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-+ done
-+ touch omf_timestamp
-+
-+install-data-hook-omf:
-+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-+ for file in $(omffile); do \
-+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ done
-+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+ -for file in $(srcdir)/*.omf; do \
-+ basefile=`basename $$file`; \
-+ rm -f $(omf_dest_dir)/$$basefile; \
-+ done
-+ -rmdir $(omf_dest_dir)
-+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-diff -urN gaim-1.3.0/xmldocs.make gaim-1.3.0-hacked/xmldocs.make
---- gaim-1.3.0/xmldocs.make 1970-01-01 12:00:00.000000000 +1200
-+++ gaim-1.3.0-hacked/xmldocs.make 2005-06-10 04:03:51.921629744 +1200
-@@ -0,0 +1,95 @@
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# To use this template:
-+# 1) Define: figdir, docname, lang, omffile, and entities in
-+# your Makefile.am file for each document directory,
-+# although figdir, omffile, and entities may be empty
-+# 2) Make sure the Makefile in (1) also includes
-+# "include $(top_srcdir)/xmldocs.make" and
-+# "dist-hook: app-dist-hook".
-+# 3) Optionally define 'entities' to hold xml entities which
-+# you would also like installed
-+# 4) Figures must go under $(figdir)/ and be in PNG format
-+# 5) You should only have one document per directory
-+# 6) Note that the figure directory, $(figdir)/, should not have its
-+# own Makefile since this Makefile installs those figures.
-+#
-+# example Makefile.am:
-+# figdir = figures
-+# docname = scrollkeeper-manual
-+# lang = C
-+# omffile=scrollkeeper-manual-C.omf
-+# entities = fdl.xml
-+# include $(top_srcdir)/xmldocs.make
-+# dist-hook: app-dist-hook
-+#
-+# About this file:
-+# This file was taken from scrollkeeper_example2, a package illustrating
-+# how to install documentation and OMF files for use with ScrollKeeper
-+# 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.2 (last updated: March 20, 2002)
-+#
-+
-+
-+# ************* Begin of section some packagers may need to modify **************
-+# This variable (docdir) specifies where the documents should be installed.
-+# This default value should work for most packages.
-+# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
-+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+
-+# ************** You should not have to edit below this line *******************
-+xml_files = $(entities) $(docname).xml
-+
-+EXTRA_DIST = $(xml_files) $(omffile)
-+CLEANFILES = omf_timestamp
-+
-+include $(top_srcdir)/omf.make
-+
-+all: omf
-+
-+$(docname).xml: $(entities)
-+ -ourdir=`pwd`; \
-+ cd $(srcdir); \
-+ cp $(entities) $$ourdir
-+
-+app-dist-hook:
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(distdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-local: omf
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)
-+ for file in $(xml_files); do \
-+ cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
-+ done
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-hook: install-data-hook-omf
-+
-+uninstall-local: uninstall-local-doc uninstall-local-omf
-+
-+uninstall-local-doc:
-+ -if test "$(figdir)"; then \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ rm -f $(docdir)/$(figdir)/$$basefile; \
-+ done; \
-+ rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+ fi
-+ -for file in $(xml_files); do \
-+ rm -f $(DESTDIR)$(docdir)/$$file; \
-+ done
-+ -rmdir $(DESTDIR)$(docdir)
-+
--- a/patches/gaim-12-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-diff -ruNa gaim-0.82.1/configure.ac gaim-0.82.1.new/configure.ac
---- gaim-0.82.1/configure.ac 2004-11-12 03:24:27.104080000 +0900
-+++ gaim-0.82.1.new/configure.ac 2004-11-12 03:23:52.000000000 +0900
-@@ -1142,6 +1142,17 @@
- doc/Makefile
- help/Makefile
- help/C/Makefile
-+ help/de/Makefile
-+ help/es/Makefile
-+ help/fr/Makefile
-+ help/it/Makefile
-+ help/sv/Makefile
-+ help/pt_BR/Makefile
-+ help/ja/Makefile
-+ help/ko/Makefile
-+ help/zh_CN/Makefile
-+ help/zh_TW/Makefile
-+ help/zh_HK/Makefile
- doc/gaim.1
- doc/gaim-remote.1
- intl/Makefile
-diff -ruNa gaim-0.82.1/help/Makefile.am gaim-0.82.1.new/help/Makefile.am
---- gaim-0.82.1/help/Makefile.am 2004-11-12 03:24:27.055804000 +0900
-+++ gaim-0.82.1.new/help/Makefile.am 2004-11-12 03:24:09.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
-
--- a/patches/gaim-X-g11n-filename.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,355 +0,0 @@
-diff -urN gaim-0.82.1-orig/src/ft.c gaim-0.82.1/src/ft.c
---- gaim-0.82.1-orig/src/ft.c 2005-01-07 14:19:58.689031568 +0900
-+++ gaim-0.82.1/src/ft.c 2005-01-07 14:20:29.378366080 +0900
-@@ -890,13 +890,18 @@
- {
- GaimXferUiOps *ui_ops;
- gchar *msg;
-+ gchar *utf8_filename;
-
- g_return_if_fail(xfer != NULL);
-
- gaim_request_close_with_handle(xfer);
-
-+ utf8_filename = g_locale_to_utf8(gaim_xfer_get_local_filename(xfer),
-+ -1, NULL, NULL, NULL);
-+
- msg = g_strdup_printf(_("%s canceled the transfer of %s"),
-- xfer->who, gaim_xfer_get_filename(xfer));
-+ xfer->who, utf8_filename);
-+ g_free (utf8_filename);
- gaim_xfer_error(gaim_xfer_get_type(xfer), xfer->who, msg);
- g_free(msg);
-
-diff -urN gaim-0.82.1-orig/src/gtkconv.c gaim-0.82.1/src/gtkconv.c
---- gaim-0.82.1-orig/src/gtkconv.c 2005-01-07 14:19:59.820859504 +0900
-+++ gaim-0.82.1/src/gtkconv.c 2005-01-07 14:20:29.435357416 +0900
-@@ -807,16 +807,35 @@
- {
- GaimConversation *conv = (GaimConversation *)user_data;
- FILE *fp;
-+ GaimAccount *account;
-+ GaimBuddy *b;
- const char *name;
-+ char *alias;
-+ gchar* arg_list;
-+ gchar* arg1;
-
- if ((fp = fopen(filename, "w+")) == NULL) {
- gaim_notify_error(conv, NULL, _("Unable to open file."), NULL);
- return;
- }
-
-+ account = gaim_conversation_get_account(conv);
- name = gaim_conversation_get_name(conv);
-- fprintf(fp, _("<h1>Conversation with %s</h1>\n"), name);
-- fprintf(fp, "%s", conv->history->str);
-+ b = gaim_find_buddy(account, name);
-+ alias = gaim_escape_html(gaim_buddy_get_alias(b));
-+
-+ arg_list = g_locale_from_utf8(_("<h1>Conversation with %s</h1>\n"),
-+ -1, NULL, NULL, NULL);
-+ arg1 = g_locale_from_utf8(alias ? alias : name, -1, NULL, NULL, NULL);
-+
-+ fprintf(fp, arg_list, arg1);
-+ g_free(arg_list);
-+ g_free(arg1);
-+
-+ arg1 = g_locale_from_utf8(conv->history->str, -1, NULL, NULL, NULL);
-+ fprintf(fp, "%s", arg1);
-+ g_free(arg1);
-+
- fclose(fp);
- }
-
-diff -urN gaim-0.82.1-orig/src/gtkft.c gaim-0.82.1/src/gtkft.c
---- gaim-0.82.1-orig/src/gtkft.c 2005-01-07 14:19:59.857853880 +0900
-+++ gaim-0.82.1/src/gtkft.c 2005-01-07 14:20:29.440356656 +0900
-@@ -811,6 +811,7 @@
- GdkPixbuf *pixbuf;
- char *size_str, *remaining_str;
- char *lfilename;
-+ char *utf8_lfilename;
-
- g_return_if_fail(dialog != NULL);
- g_return_if_fail(xfer != NULL);
-@@ -838,6 +839,11 @@
-
- gtk_list_store_append(dialog->model, &data->iter);
- lfilename = g_path_get_basename(gaim_xfer_get_local_filename(xfer));
-+ utf8_lfilename = g_locale_to_utf8(lfilename, -1, NULL, NULL, NULL);
-+ if (g_utf8_validate(utf8_lfilename, -1, NULL)) {
-+ g_free (lfilename);
-+ lfilename = utf8_lfilename;
-+ }
- gtk_list_store_set(dialog->model, &data->iter,
- COLUMN_STATUS, pixbuf,
- COLUMN_PROGRESS, 0.0,
-diff -urN gaim-0.82.1-orig/src/protocols/msn/nexus.c gaim-0.82.1/src/protocols/msn/nexus.c
---- gaim-0.82.1-orig/src/protocols/msn/nexus.c 2005-01-07 14:20:01.690575264 +0900
-+++ gaim-0.82.1/src/protocols/msn/nexus.c 2005-01-07 14:20:29.481350424 +0900
-@@ -202,6 +202,7 @@
- c = error + strlen(error);
-
- temp = g_strndup(error, c - error);
-+ gaim_str_strip_cr(temp);
- error = gaim_url_decode(temp);
- g_free(temp);
- }
-@@ -216,7 +217,10 @@
- "MSN login server."));
- }
- else
-+ {
-+ error = gaim_http_failed_gettext(error);
- gaim_connection_error(gc, error);
-+ }
- }
- else if (strstr(buffer, "HTTP/1.1 200 OK"))
- {
-diff -urN gaim-0.82.1-orig/src/protocols/msn/sync.c gaim-0.82.1/src/protocols/msn/sync.c
---- gaim-0.82.1-orig/src/protocols/msn/sync.c 2005-01-07 14:20:01.970532704 +0900
-+++ gaim-0.82.1/src/protocols/msn/sync.c 2005-01-07 14:20:29.517344952 +0900
-@@ -92,10 +92,14 @@
- MsnGroup *group;
- GaimGroup *g;
- const char *name;
-+ const gchar *default_group_name = N_("Individuals");
- int group_id;
-
- group_id = atoi(cmd->params[0]);
- name = gaim_url_decode(cmd->params[1]);
-+ if (!strcmp(name, default_group_name)){
-+ name=_(default_group_name);
-+ }
-
- group = msn_group_new(session->userlist, group_id, name);
-
-diff -urN gaim-0.82.1-orig/src/protocols/yahoo/yahoo_filexfer.c gaim-0.82.1/src/protocols/yahoo/yahoo_filexfer.c
---- gaim-0.82.1-orig/src/protocols/yahoo/yahoo_filexfer.c 2005-01-07 14:20:04.890088864 +0900
-+++ gaim-0.82.1/src/protocols/yahoo/yahoo_filexfer.c 2005-01-07 14:20:29.552339632 +0900
-@@ -433,7 +433,28 @@
- start++;
- end = g_strrstr(xfer_data->path, "?");
- if (start && *start && end) {
-+ gchar *decoded;
-+ struct yahoo_data *yd = gc->proto_data;
- filename = g_strndup(start, end - start);
-+ decoded = g_strdup(gaim_url_decode_without_validate(filename));
-+ g_free(filename);
-+ filename = decoded;
-+ if (yd->jp && filename) {
-+ decoded = yahoo_string_decode(gc, filename, TRUE);
-+ if (decoded) {
-+ g_free(filename);
-+ filename = decoded;
-+ }
-+ }
-+ if (!g_utf8_validate(filename, -1, NULL)) {
-+ decoded = gaim_utf8_try_convert(filename);
-+ g_free (filename);
-+ filename = decoded;
-+ if (!filename || !g_utf8_validate(filename, -1, NULL)) {
-+ decoded = g_strndup(start, end - start);
-+ filename = decoded;
-+ }
-+ }
- gaim_xfer_set_filename(xfer, filename);
- g_free(filename);
- filename = NULL;
-diff -urN gaim-0.82.1-orig/src/util.c gaim-0.82.1/src/util.c
---- gaim-0.82.1-orig/src/util.c 2005-01-07 14:19:59.424919696 +0900
-+++ gaim-0.82.1/src/util.c 2005-01-07 14:23:16.824910336 +0900
-@@ -63,6 +63,14 @@
- static char custom_home_dir[MAXPATHLEN];
- static char home_dir[MAXPATHLEN];
-
-+static gchar *gaim_http_failed_string[] ={
-+ N_("Type your e-mail address and password correctly. If you haven't "
-+ "registered with .NET Passport, click the Get a .NET Passport "
-+ "link."),
-+ NULL
-+};
-+
-+
- /**************************************************************************
- * Base16 Functions
- **************************************************************************/
-@@ -478,8 +486,25 @@
- {
- char *date;
- time_t tme;
-+ struct tm *tm;
-+ gchar *utf8_date = N_("%a %b %e %T %Y");
-+ gchar *locale_date;
-+ gchar buf[BUF_LEN];
-
- time(&tme);
-+
-+ if (g_utf8_collate(utf8_date, _(utf8_date))) {
-+ tm = localtime(&tme);
-+ locale_date = g_locale_from_utf8(_(utf8_date), -1, NULL, NULL, NULL);
-+
-+ if(strftime(buf, sizeof(buf), locale_date, tm)) {
-+
-+ utf8_date = g_locale_to_utf8(buf, -1, NULL, NULL, NULL);
-+ g_free(locale_date);
-+ return utf8_date;
-+ }
-+ }
-+
- date = ctime(&tme);
- date[strlen(date) - 1] = '\0';
-
-@@ -2830,11 +2855,10 @@
- }
-
- const char *
--gaim_url_decode(const char *str)
-+gaim_url_decode_without_validate(const char *str)
- {
- static char buf[BUF_LEN];
- guint i, j = 0;
-- char *bum;
- char hex[3];
-
- g_return_val_if_fail(str != NULL, NULL);
-@@ -2867,6 +2891,17 @@
-
- buf[j] = '\0';
-
-+ return buf;
-+}
-+
-+const char *
-+gaim_url_decode(const char *str)
-+{
-+ char *bum;
-+ const char *buf;
-+
-+ buf = gaim_url_decode_without_validate(str);
-+
- if (!g_utf8_validate(buf, -1, (const char **)&bum))
- *bum = '\0';
-
-@@ -3110,6 +3145,39 @@
- return ret;
- }
-
-+char*
-+gaim_utf8_to_ascii(const char *utf8)
-+{
-+ char *temp, *retval;
-+ gchar *p;
-+ gunichar u;
-+
-+/* U+2019 right single quotation mark */
-+ gunichar rsq = g_utf8_get_char("\342\200\231");
-+
-+ if (!g_utf8_validate(utf8, -1, NULL))
-+ return NULL;
-+
-+ p = temp = malloc(strlen(utf8) + 1);
-+ strcpy (temp, utf8);
-+ while (u = g_utf8_get_char(p), u != '\0') {
-+ if (u == rsq) {
-+ *p ='\'';
-+ strcpy (p+1, p+3);
-+ p++;
-+ }
-+ else {
-+ p = g_utf8_next_char(p);
-+ }
-+ }
-+
-+ retval = malloc (strlen(temp) + 1);
-+ strcpy (retval, temp);
-+ g_free (temp);
-+
-+ return retval;
-+}
-+
- gboolean gaim_message_meify(char *message, size_t len)
- {
- char *c;
-@@ -3201,3 +3269,24 @@
- return out;
- }
-
-+const char*
-+gaim_http_failed_gettext(const char* str)
-+{
-+ int i = 0;
-+
-+ g_return_val_if_fail(str != NULL, NULL);
-+
-+ gchar *msgid = gaim_utf8_to_ascii(str);
-+
-+ g_return_val_if_fail(msgid != NULL, str);
-+
-+ while (gaim_http_failed_string[i] != NULL)
-+ {
-+ if (!g_utf8_collate(msgid, gaim_http_failed_string[i])) {
-+ return _(msgid);
-+ }
-+ i++;
-+ }
-+ g_free(msgid);
-+ return str;
-+}
-diff -urN gaim-0.82.1-orig/src/util.h gaim-0.82.1/src/util.h
---- gaim-0.82.1-orig/src/util.h 2005-01-07 14:19:58.187107872 +0900
-+++ gaim-0.82.1/src/util.h 2005-01-07 14:20:29.661323064 +0900
-@@ -622,6 +622,18 @@
- /**
- * Decodes a URL into a plain string.
- *
-+ * This is a minor version of gaim_url_decode() without g_utf8_validate()
-+ *
-+ * @param str The string to translate.
-+ *
-+ * @return The resulting string.
-+ */
-+
-+const char *gaim_url_decode_without_validate(const char *str);
-+
-+/**
-+ * Decodes a URL into a plain string.
-+ *
- * This will change hex codes and such to their ascii equivalents.
- *
- * @param str The string to translate.
-@@ -704,6 +716,16 @@
- int gaim_utf8_strcasecmp(const char *a, const char *b);
-
- /**
-+ * Convert the UTF-8 string to ascii. We want as many English msgids
-+ * as possible.
-+ *
-+ * @param utf8 The UTF-8 string.
-+ *
-+ * @return The new ASCII string. Need to free it.
-+ */
-+char* gaim_utf8_to_ascii(const char *utf8);
-+
-+/**
- * Checks for messages starting with "/me "
- *
- * @param message The message to check
-@@ -723,6 +745,16 @@
- */
- char *gaim_text_strip_mnemonic(const char *in);
-
-+/**
-+ * Returns the localized HTTP cbtxt when the cbtxt is corresponded to
-+ * the stored msn_http_faild_string[i].
-+ *
-+ * @param The decoded HTTP header string.
-+ *
-+ * @return The localized string or the original.
-+ */
-+const char* gaim_http_failed_gettext(const char* msgid);
-+
- /*@}*/
-
- /**
--- a/patches/gcalctool-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -ruNa gcalctool-4.3.51/configure.in gcalctool-4.3.51.new/configure.in
---- gcalctool-4.3.51/configure.in 2004-11-12 17:16:17.363266000 +0900
-+++ gcalctool-4.3.51.new/configure.in 2004-11-12 15:23:32.000000000 +0900
-@@ -112,4 +112,5 @@
- help/zh_CN/Makefile
- help/zh_HK/Makefile
- help/zh_TW/Makefile
-+help/pt_BR/Makefile
- ])
-diff -ruNa gcalctool-4.3.51/help/Makefile.am gcalctool-4.3.51.new/help/Makefile.am
---- gcalctool-4.3.51/help/Makefile.am 2004-03-15 21:40:49.000000000 +0900
-+++ gcalctool-4.3.51.new/help/Makefile.am 2004-11-12 15:23:31.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C de es fr it ja ko sv zh_CN zh_HK zh_TW
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_HK zh_TW pt_BR
--- a/patches/gconf-editor-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -rNau gconf-editor-2.6.2/configure.in gconf-editor-2.6.2.new/configure.in
---- gconf-editor-2.6.2/configure.in 2004-10-28 14:05:38.238083000 +0900
-+++ gconf-editor-2.6.2.new/configure.in 2004-10-28 10:44:45.000000000 +0900
-@@ -75,6 +75,17 @@
- data/icons/Makefile
- docs/Makefile
- docs/C/Makefile
-+docs/de/Makefile
-+docs/es/Makefile
-+docs/fr/Makefile
-+docs/it/Makefile
-+docs/sv/Makefile
-+docs/ja/Makefile
-+docs/ko/Makefile
-+docs/zh_CN/Makefile
-+docs/zh_TW/Makefile
-+docs/zh_HK/Makefile
-+docs/pt_BR/Makefile
- src/Makefile
- po/Makefile.in
- ])
-diff -rNau gconf-editor-2.6.2/docs/Makefile.am gconf-editor-2.6.2.new/docs/Makefile.am
---- gconf-editor-2.6.2/docs/Makefile.am 2004-01-16 00:50:22.000000000 +0900
-+++ gconf-editor-2.6.2.new/docs/Makefile.am 2004-10-28 11:16:56.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
--- a/patches/gdm-07-docs-figures.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gdm-2.6.0.2/docs/C/Makefile.am.orig 2004-06-18 16:14:14.794351000 +0100
-+++ gdm-2.6.0.2/docs/C/Makefile.am 2004-06-18 16:15:07.328480000 +0100
-@@ -1,4 +1,6 @@
--figdir =
-+figs = \
-+ figures/gdm_window.png
-+figdir = figures
- docname = gdm
- lang = C
- omffile = gdm-C.omf
--- a/patches/gdm-08-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
---- gdm-2.6.0.3/gui/gdmsetup.c~ Fri Jun 4 13:37:17 2004
-+++ gdm-2.6.0.3/gui/gdmsetup.c Mon Feb 7 17:38:51 2005
-@@ -2325,7 +2325,35 @@
- }
-
- if ( ! RUNNING_UNDER_GDM) {
-- gnome_help_display_uri ("ghelp:gdm", &error);
-+ GtkWidget *notebook = glade_helper_get
-+ (xml, "notebook1", GTK_TYPE_NOTEBOOK);
-+ gint note_pos;
-+
-+ note_pos = gtk_notebook_get_current_page (notebook);
-+
-+ if (note_pos == 0) {
-+ gnome_help_display_desktop (NULL, "gdm", "gdm.xml",
-+ "gdm-prefs-general", &error);
-+ } else if (note_pos == 1) {
-+ gnome_help_display_desktop (NULL, "gdm", "gdm.xml",
-+ "gdm-prefs-standard", &error);
-+ } else if (note_pos == 2) {
-+ gnome_help_display_desktop (NULL, "gdm", "gdm.xml",
-+ "gdm-prefs-graphical", &error);
-+ } else if (note_pos == 3) {
-+ gnome_help_display_desktop (NULL, "gdm", "gdm.xml",
-+ "gdm-prefs-security", &error);
-+ } else if (note_pos == 4) {
-+ gnome_help_display_desktop (NULL, "gdm", "gdm.xml",
-+ "gdm-prefs-accessibility", &error);
-+ } else if (note_pos == 5) {
-+ gnome_help_display_desktop (NULL, "gdm", "gdm.xml",
-+ "gdm-prefs-xdmcp", &error);
-+ } else {
-+ gnome_help_display_desktop (NULL, "gdm", "gdm.xml",
-+ "gdm-preferences", &error);
-+ }
-+
- /* FIXME: handle errors nicer */
- if (error == NULL)
- return;
--- a/patches/gdm-10-g11n-alllinguas.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gdm-2.6.0.9/configure.in-orig 2005-05-16 15:47:26.869780000 -0500
-+++ gdm-2.6.0.9/configure.in 2005-05-16 15:48:14.582125000 -0500
-@@ -209,7 +209,7 @@
- AC_SUBST(GETTEXT_PACKAGE)
-
- dnl ## internationalization support
--ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN zh_TW zu"
-+ALL_LINGUAS="af am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN zh_TW zh_HK zu"
- AM_GLIB_GNU_GETTEXT
-
- EXTRA_DAEMON_LIBS=""
--- a/patches/gdm-11-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-diff -ruNa gdm-2.6.0.3/configure.in gdm-2.6.0.3.new/configure.in
---- gdm-2.6.0.3/configure.in 2004-10-28 14:05:46.476937000 +0900
-+++ gdm-2.6.0.3.new/configure.in 2004-10-28 10:46:57.000000000 +0900
-@@ -803,6 +803,7 @@
- docs/zh_CN/Makefile
- docs/zh_HK/Makefile
- docs/zh_TW/Makefile
-+docs/pt_BR/Makefile
- config/gdm.conf
- config/Xsession
- config/Default
-diff -ruNa gdm-2.6.0.3/docs/Makefile.am gdm-2.6.0.3.new/docs/Makefile.am
---- gdm-2.6.0.3/docs/Makefile.am 2004-03-16 03:32:53.000000000 +0900
-+++ gdm-2.6.0.3.new/docs/Makefile.am 2004-10-28 11:19:15.000000000 +0900
-@@ -1,4 +1,4 @@
--SUBDIRS = . C de es fr it sv ja ko zh_CN zh_HK zh_TW
-+SUBDIRS = . C de es fr it sv ja ko zh_CN zh_HK zh_TW pt_BR
-
- man_MANS = gdm.1
-
-diff -ruNa gdm-2.6.0.3/docs/Makefile.in gdm-2.6.0.3.new/docs/Makefile.in
-
--- a/patches/gedit-02-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-diff -urN gedit-2.10.2/configure.in gedit-2.10.2-hacked/configure.in
---- gedit-2.10.2/configure.in 2005-04-04 21:20:02.000000000 +1200
-+++ gedit-2.10.2-hacked/configure.in 2005-05-19 13:15:13.977063736 +1200
-@@ -200,6 +200,7 @@
- help/zh_HK/Makefile
- help/zh_TW/Makefile
- help/ro/Makefile
-+help/pt_BR/Makefile
- ])
-
-
-diff -urN gedit-2.10.2/help/Makefile.am gedit-2.10.2-hacked/help/Makefile.am
---- gedit-2.10.2/help/Makefile.am 2004-04-23 03:41:44.000000000 +1200
-+++ gedit-2.10.2-hacked/help/Makefile.am 2005-05-19 13:14:57.772527200 +1200
-@@ -1,3 +1,3 @@
- ## Process this file with automake to produce Makefile.in.
-
--SUBDIRS = C ro de es eu fr it sv ja ko zh_CN zh_HK zh_TW
-+SUBDIRS = C ro de es eu fr it sv ja ko zh_CN zh_HK zh_TW pt_BR
--- a/patches/ggv-04-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -rNau ggv-2.6.1/configure.in ggv-2.6.1.new/configure.in
---- ggv-2.6.1/configure.in 2004-04-18 22:38:38.000000000 +0900
-+++ ggv-2.6.1.new/configure.in 2004-10-28 11:06:15.000000000 +0900
-@@ -130,6 +130,8 @@
- help/ko/Makefile
- help/zh_CN/Makefile
- help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
- src/Makefile
- src/stock/Makefile
- src/cursors/Makefile
-diff -rNau ggv-2.6.1/help/Makefile.am ggv-2.6.1.new/help/Makefile.am
---- ggv-2.6.1/help/Makefile.am 2003-04-15 12:14:50.000000000 +0900
-+++ ggv-2.6.1.new/help/Makefile.am 2004-10-28 11:30:17.000000000 +0900
-@@ -1,4 +1,4 @@
- ## Process this file with automake to produce Makefile.in.
-
--SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
-
--- a/patches/gimp-03-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,418 +0,0 @@
-diff -urN gimp-2.0.2.bak/po/POTFILES.in gimp-2.0.2/po/POTFILES.in
---- gimp-2.0.2.bak/po/POTFILES.in 2004-09-15 15:50:36.509409000 +0100
-+++ gimp-2.0.2/po/POTFILES.in 2004-09-15 15:55:05.282459000 +0100
-@@ -1,21 +1,19 @@
--# Files from the Gimp distribution which have already been
--# marked to allow runtime translation of messages
--
-+# List of source files containing translatable strings.
-+# Please keep this file sorted alphabetically,
-+# using the C collating order if possible:
-+# shell: $ export LC_COLLATE=C
-+# shell: $ sort POTFILES.in -o POTFILES.in
- app/app_procs.c
--app/main.c
--
- app/base/base-enums.c
- app/base/tile-swap.c
--
- app/config/gimpconfig-deserialize.c
- app/config/gimpconfig-path.c
- app/config/gimpconfig-utils.c
- app/config/gimpconfig.c
- app/config/gimpconfigwriter.c
--app/config/gimprc.c
- app/config/gimprc-blurbs.h
-+app/config/gimprc.c
- app/config/gimpscanner.c
--
- app/core/core-enums.c
- app/core/gimp-edit.c
- app/core/gimp-gradients.c
-@@ -25,8 +23,8 @@
- app/core/gimpbrush.c
- app/core/gimpbrushgenerated.c
- app/core/gimpbrushpipe.c
--app/core/gimpchannel.c
- app/core/gimpchannel-select.c
-+app/core/gimpchannel.c
- app/core/gimpcontext.c
- app/core/gimpdata.c
- app/core/gimpdatafactory.c
-@@ -65,25 +63,22 @@
- app/core/gimpselection.c
- app/core/gimptemplate.c
- app/core/gimpunit.c
--
- app/display/display-enums.c
- app/display/gimpdisplay.c
- app/display/gimpdisplayoptions.c
--app/display/gimpdisplayshell.c
- app/display/gimpdisplayshell-callbacks.c
- app/display/gimpdisplayshell-dnd.c
- app/display/gimpdisplayshell-filter-dialog.c
- app/display/gimpdisplayshell-layer-select.c
- app/display/gimpdisplayshell-scale.c
- app/display/gimpdisplayshell-title.c
-+app/display/gimpdisplayshell.c
- app/display/gimpnavigationview.c
- app/display/gimpprogress.c
- app/display/gimpstatusbar.c
--
- app/file/file-open.c
- app/file/file-save.c
- app/file/file-utils.c
--
- app/gui/about-dialog.c
- app/gui/brush-select.c
- app/gui/brushes-menu.c
-@@ -153,7 +148,7 @@
- app/gui/user-install-dialog.c
- app/gui/vectors-commands.c
- app/gui/vectors-menu.c
--
-+app/main.c
- app/paint/gimpairbrush.c
- app/paint/gimpclone.c
- app/paint/gimpconvolve.c
-@@ -164,7 +159,6 @@
- app/paint/gimppencil.c
- app/paint/gimpsmudge.c
- app/paint/paint-enums.c
--
- app/pdb/color_cmds.c
- app/pdb/drawable_cmds.c
- app/pdb/guides_cmds.c
-@@ -177,20 +171,16 @@
- app/pdb/selection_cmds.c
- app/pdb/selection_tools_cmds.c
- app/pdb/undo_cmds.c
--
--app/plug-in/plug-in.c
- app/plug-in/plug-in-rc.c
-+app/plug-in/plug-in.c
- app/plug-in/plug-ins.c
--
--app/text/text-enums.c
- app/text/gimpfont.c
- app/text/gimptext-compat.c
- app/text/gimptext-parasite.c
--app/text/gimptextlayer.c
- app/text/gimptextlayer-transform.c
- app/text/gimptextlayer-xcf.c
--
--app/tools/tools-enums.c
-+app/text/gimptextlayer.c
-+app/text/text-enums.c
- app/tools/gimp-tools.c
- app/tools/gimpairbrushtool.c
- app/tools/gimpblendoptions.c
-@@ -251,11 +241,10 @@
- app/tools/gimpvectoroptions.c
- app/tools/gimpvectortool.c
- app/tools/tool_manager.c
--
--app/vectors/gimpvectors.c
-+app/tools/tools-enums.c
- app/vectors/gimpvectors-export.c
- app/vectors/gimpvectors-import.c
--
-+app/vectors/gimpvectors.c
- app/widgets/gimpbrusheditor.c
- app/widgets/gimpbrushfactoryview.c
- app/widgets/gimpbufferview.c
-@@ -304,12 +293,291 @@
- app/widgets/gimpwidgets-constructors.c
- app/widgets/gimpwidgets-utils.c
- app/widgets/widgets-enums.c
--
- app/xcf/xcf-load.c
- app/xcf/xcf-read.c
- app/xcf/xcf-save.c
--app/xcf/xcf-write.c
- app/xcf/xcf-seek.c
-+app/xcf/xcf-write.c
- app/xcf/xcf.c
--
- data/misc/gimp.desktop.in.in
-+data/misc/gimp.keys.in
-+libgimp/gimpbrushmenu.c
-+libgimp/gimpexport.c
-+libgimp/gimpfontmenu.c
-+libgimp/gimpgradientmenu.c
-+libgimp/gimpmenu.c
-+libgimp/gimppatternmenu.c
-+libgimp/gimpunitcache.c
-+libgimpbase/gimputils.c
-+libgimpmodule/gimpmodule.c
-+libgimpthumb/gimpthumb-utils.c
-+libgimpwidgets/gimpcolorbutton.c
-+libgimpwidgets/gimpcolorscales.c
-+libgimpwidgets/gimpcolorselect.c
-+libgimpwidgets/gimpcolorselection.c
-+libgimpwidgets/gimpfileentry.c
-+libgimpwidgets/gimpmemsizeentry.c
-+libgimpwidgets/gimppatheditor.c
-+libgimpwidgets/gimppickbutton.c
-+libgimpwidgets/gimpstock.c
-+libgimpwidgets/gimpunitmenu.c
-+libgimpwidgets/gimpwidgets.c
-+modules/cdisplay_colorblind.c
-+modules/cdisplay_gamma.c
-+modules/cdisplay_highcontrast.c
-+modules/cdisplay_proof.c
-+modules/colorsel_cmyk.c
-+modules/colorsel_triangle.c
-+modules/colorsel_water.c
-+plug-ins/FractalExplorer/Dialogs.c
-+plug-ins/FractalExplorer/FractalExplorer.c
-+plug-ins/Lighting/lighting_apply.c
-+plug-ins/Lighting/lighting_main.c
-+plug-ins/Lighting/lighting_ui.c
-+plug-ins/MapObject/mapobject_apply.c
-+plug-ins/MapObject/mapobject_main.c
-+plug-ins/MapObject/mapobject_ui.c
-+plug-ins/bmp/bmpread.c
-+plug-ins/bmp/bmpwrite.c
-+plug-ins/common/AlienMap.c
-+plug-ins/common/AlienMap2.c
-+plug-ins/common/CEL.c
-+plug-ins/common/CML_explorer.c
-+plug-ins/common/aa.c
-+plug-ins/common/align_layers.c
-+plug-ins/common/animationplay.c
-+plug-ins/common/animoptimize.c
-+plug-ins/common/apply_lens.c
-+plug-ins/common/autocrop.c
-+plug-ins/common/autostretch_hsv.c
-+plug-ins/common/blinds.c
-+plug-ins/common/blur.c
-+plug-ins/common/borderaverage.c
-+plug-ins/common/bumpmap.c
-+plug-ins/common/bz2.c
-+plug-ins/common/c_astretch.c
-+plug-ins/common/ccanalyze.c
-+plug-ins/common/channel_mixer.c
-+plug-ins/common/checkerboard.c
-+plug-ins/common/color_enhance.c
-+plug-ins/common/colorify.c
-+plug-ins/common/colortoalpha.c
-+plug-ins/common/compose.c
-+plug-ins/common/convmatrix.c
-+plug-ins/common/csource.c
-+plug-ins/common/cubism.c
-+plug-ins/common/curve_bend.c
-+plug-ins/common/decompose.c
-+plug-ins/common/deinterlace.c
-+plug-ins/common/depthmerge.c
-+plug-ins/common/despeckle.c
-+plug-ins/common/destripe.c
-+plug-ins/common/dicom.c
-+plug-ins/common/diffraction.c
-+plug-ins/common/displace.c
-+plug-ins/common/edge.c
-+plug-ins/common/emboss.c
-+plug-ins/common/engrave.c
-+plug-ins/common/exchange.c
-+plug-ins/common/film.c
-+plug-ins/common/flarefx.c
-+plug-ins/common/fractaltrace.c
-+plug-ins/common/gauss_iir.c
-+plug-ins/common/gauss_rle.c
-+plug-ins/common/gbr.c
-+plug-ins/common/gee.c
-+plug-ins/common/gee_zoom.c
-+plug-ins/common/gicon.c
-+plug-ins/common/gif.c
-+plug-ins/common/gifload.c
-+plug-ins/common/gih.c
-+plug-ins/common/glasstile.c
-+plug-ins/common/gqbist.c
-+plug-ins/common/gradmap.c
-+plug-ins/common/grid.c
-+plug-ins/common/gtm.c
-+plug-ins/common/guillotine.c
-+plug-ins/common/gz.c
-+plug-ins/common/hot.c
-+plug-ins/common/hrz.c
-+plug-ins/common/illusion.c
-+plug-ins/common/iwarp.c
-+plug-ins/common/jigsaw.c
-+plug-ins/common/jpeg.c
-+plug-ins/common/laplace.c
-+plug-ins/common/lic.c
-+plug-ins/common/mail.c
-+plug-ins/common/mapcolor.c
-+plug-ins/common/max_rgb.c
-+plug-ins/common/mblur.c
-+plug-ins/common/mng.c
-+plug-ins/common/mosaic.c
-+plug-ins/common/newsprint.c
-+plug-ins/common/nlfilt.c
-+plug-ins/common/noisify.c
-+plug-ins/common/normalize.c
-+plug-ins/common/nova.c
-+plug-ins/common/oilify.c
-+plug-ins/common/papertile.c
-+plug-ins/common/pat.c
-+plug-ins/common/pcx.c
-+plug-ins/common/pix.c
-+plug-ins/common/pixelize.c
-+plug-ins/common/plasma.c
-+plug-ins/common/plugindetails.c
-+plug-ins/common/png.c
-+plug-ins/common/pnm.c
-+plug-ins/common/polar.c
-+plug-ins/common/postscript.c
-+plug-ins/common/psd.c
-+plug-ins/common/psd_save.c
-+plug-ins/common/psp.c
-+plug-ins/common/randomize.c
-+plug-ins/common/ripple.c
-+plug-ins/common/rotate.c
-+plug-ins/common/sample_colorize.c
-+plug-ins/common/scatter_hsv.c
-+plug-ins/common/screenshot.c
-+plug-ins/common/sel_gauss.c
-+plug-ins/common/semiflatten.c
-+plug-ins/common/sharpen.c
-+plug-ins/common/shift.c
-+plug-ins/common/sinus.c
-+plug-ins/common/smooth_palette.c
-+plug-ins/common/snoise.c
-+plug-ins/common/sobel.c
-+plug-ins/common/sparkle.c
-+plug-ins/common/spheredesigner.c
-+plug-ins/common/spread.c
-+plug-ins/common/struc.c
-+plug-ins/common/sunras.c
-+plug-ins/common/svg.c
-+plug-ins/common/tga.c
-+plug-ins/common/threshold_alpha.c
-+plug-ins/common/tiff.c
-+plug-ins/common/tile.c
-+plug-ins/common/tileit.c
-+plug-ins/common/tiler.c
-+plug-ins/common/uniteditor.c
-+plug-ins/common/unsharp.c
-+plug-ins/common/video.c
-+plug-ins/common/vinvert.c
-+plug-ins/common/vpropagate.c
-+plug-ins/common/warp.c
-+plug-ins/common/waves.c
-+plug-ins/common/webbrowser.c
-+plug-ins/common/whirlpinch.c
-+plug-ins/common/winclipboard.c
-+plug-ins/common/wind.c
-+plug-ins/common/winprint.c
-+plug-ins/common/wmf.c
-+plug-ins/common/xbm.c
-+plug-ins/common/xpm.c
-+plug-ins/common/xwd.c
-+plug-ins/common/zealouscrop.c
-+plug-ins/dbbrowser/dbbrowser.c
-+plug-ins/dbbrowser/dbbrowser_utils.c
-+plug-ins/faxg3/faxg3.c
-+plug-ins/fits/fits.c
-+plug-ins/flame/flame.c
-+plug-ins/fp/fp.c
-+plug-ins/fp/fp_gtk.c
-+plug-ins/gfig/gfig-bezier.c
-+plug-ins/gfig/gfig-dobject.c
-+plug-ins/gfig/gfig-poly.c
-+plug-ins/gfig/gfig-preview.c
-+plug-ins/gfig/gfig-spiral.c
-+plug-ins/gfig/gfig-star.c
-+plug-ins/gfig/gfig.c
-+plug-ins/gflare/gflare.c
-+plug-ins/gfli/gfli.c
-+plug-ins/gimpressionist/brush.c
-+plug-ins/gimpressionist/color.c
-+plug-ins/gimpressionist/general.c
-+plug-ins/gimpressionist/gimp.c
-+plug-ins/gimpressionist/gimpressionist.c
-+plug-ins/gimpressionist/orientation.c
-+plug-ins/gimpressionist/orientmap.c
-+plug-ins/gimpressionist/paper.c
-+plug-ins/gimpressionist/placement.c
-+plug-ins/gimpressionist/ppmtool.c
-+plug-ins/gimpressionist/presets.c
-+plug-ins/gimpressionist/preview.c
-+plug-ins/gimpressionist/repaint.c
-+plug-ins/gimpressionist/size.c
-+plug-ins/gimpressionist/sizemap.c
-+plug-ins/help/domain.c
-+plug-ins/helpbrowser/dialog.c
-+plug-ins/ifscompose/ifscompose.c
-+plug-ins/imagemap/imap_about.c
-+plug-ins/imagemap/imap_circle.c
-+plug-ins/imagemap/imap_cmd_clear.c
-+plug-ins/imagemap/imap_cmd_copy.c
-+plug-ins/imagemap/imap_cmd_copy_object.c
-+plug-ins/imagemap/imap_cmd_create.c
-+plug-ins/imagemap/imap_cmd_cut.c
-+plug-ins/imagemap/imap_cmd_cut_object.c
-+plug-ins/imagemap/imap_cmd_delete.c
-+plug-ins/imagemap/imap_cmd_delete_point.c
-+plug-ins/imagemap/imap_cmd_edit_object.c
-+plug-ins/imagemap/imap_cmd_gimp_guides.c
-+plug-ins/imagemap/imap_cmd_guides.c
-+plug-ins/imagemap/imap_cmd_insert_point.c
-+plug-ins/imagemap/imap_cmd_move.c
-+plug-ins/imagemap/imap_cmd_move_down.c
-+plug-ins/imagemap/imap_cmd_move_sash.c
-+plug-ins/imagemap/imap_cmd_move_selected.c
-+plug-ins/imagemap/imap_cmd_move_to_front.c
-+plug-ins/imagemap/imap_cmd_move_up.c
-+plug-ins/imagemap/imap_cmd_object_down.c
-+plug-ins/imagemap/imap_cmd_object_move.c
-+plug-ins/imagemap/imap_cmd_object_up.c
-+plug-ins/imagemap/imap_cmd_paste.c
-+plug-ins/imagemap/imap_cmd_select.c
-+plug-ins/imagemap/imap_cmd_select_all.c
-+plug-ins/imagemap/imap_cmd_select_next.c
-+plug-ins/imagemap/imap_cmd_select_prev.c
-+plug-ins/imagemap/imap_cmd_select_region.c
-+plug-ins/imagemap/imap_cmd_send_to_back.c
-+plug-ins/imagemap/imap_cmd_unselect.c
-+plug-ins/imagemap/imap_cmd_unselect_all.c
-+plug-ins/imagemap/imap_edit_area_info.c
-+plug-ins/imagemap/imap_file.c
-+plug-ins/imagemap/imap_grid.c
-+plug-ins/imagemap/imap_main.c
-+plug-ins/imagemap/imap_menu.c
-+plug-ins/imagemap/imap_object_popup.c
-+plug-ins/imagemap/imap_polygon.c
-+plug-ins/imagemap/imap_popup.c
-+plug-ins/imagemap/imap_preferences.c
-+plug-ins/imagemap/imap_rectangle.c
-+plug-ins/imagemap/imap_selection.c
-+plug-ins/imagemap/imap_settings.c
-+plug-ins/imagemap/imap_source.c
-+plug-ins/imagemap/imap_stock.c
-+plug-ins/imagemap/imap_toolbar.c
-+plug-ins/imagemap/imap_tools.c
-+plug-ins/libgimpoldpreview/gimpoldpreview.c
-+plug-ins/maze/algorithms.c
-+plug-ins/maze/maze.c
-+plug-ins/maze/maze_face.c
-+plug-ins/pagecurl/pagecurl.c
-+plug-ins/print/gimp_color_window.c
-+plug-ins/print/gimp_main_window.c
-+plug-ins/print/print-image-gimp.c
-+plug-ins/print/print.c
-+plug-ins/rcm/rcm.c
-+plug-ins/rcm/rcm_callback.c
-+plug-ins/rcm/rcm_dialog.c
-+plug-ins/script-fu/script-fu-console.c
-+plug-ins/script-fu/script-fu-scripts.c
-+plug-ins/script-fu/script-fu-server.c
-+plug-ins/script-fu/script-fu-text-console.c
-+plug-ins/script-fu/script-fu.c
-+plug-ins/sel2path/pxl-outline.c
-+plug-ins/sel2path/sel2path.c
-+plug-ins/sgi/sgi.c
-+plug-ins/twain/twain.c
-+plug-ins/winsnap/winsnap.c
-+plug-ins/xjt/xjt.c
-+tips/gimp-tips.xml.in
--- a/patches/glade-03-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- ../glade-2.10.0.old/po/POTFILES.in 2005-06-14 13:05:32.819132368 +0100
-+++ ./po/POTFILES.in 2005-06-14 13:06:48.474630984 +0100
-@@ -1,5 +1,8 @@
- # List of source files containing translatable strings.
- # Please keep this file sorted alphabetically.
-+examples/editor/editor.glade
-+examples/editor/src/interface.c
-+examples/editor/src/support.c
- glade-2.desktop.in
- glade/debug.c
- glade/editor.c
--- a/patches/glade-04-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
---- ../glade-2.10.0.old/configure.in 2005-06-14 13:05:32.970109416 +0100
-+++ ./configure.in 2005-06-14 15:18:55.757500808 +0100
-@@ -151,6 +151,39 @@
- doc/C/Makefile
- doc/C/glade-faq/Makefile
- doc/C/glade-user-guide/Makefile
-+doc/de/Makefile
-+doc/de/glade-user-guide/Makefile
-+doc/de/glade-faq/Makefile
-+doc/es/Makefile
-+doc/es/glade-user-guide/Makefile
-+doc/es/glade-faq/Makefile
-+doc/fr/Makefile
-+doc/fr/glade-user-guide/Makefile
-+doc/fr/glade-faq/Makefile
-+doc/it/Makefile
-+doc/it/glade-user-guide/Makefile
-+doc/it/glade-faq/Makefile
-+doc/sv/Makefile
-+doc/sv/glade-user-guide/Makefile
-+doc/sv/glade-faq/Makefile
-+doc/pt_BR/Makefile
-+doc/pt_BR/glade-user-guide/Makefile
-+doc/pt_BR/glade-faq/Makefile
-+doc/ja/Makefile
-+doc/ja/glade-user-guide/Makefile
-+doc/ja/glade-faq/Makefile
-+doc/ko/Makefile
-+doc/ko/glade-user-guide/Makefile
-+doc/ko/glade-faq/Makefile
-+doc/zh_CN/Makefile
-+doc/zh_CN/glade-user-guide/Makefile
-+doc/zh_CN/glade-faq/Makefile
-+doc/zh_TW/Makefile
-+doc/zh_TW/glade-user-guide/Makefile
-+doc/zh_TW/glade-faq/Makefile
-+doc/zh_HK/Makefile
-+doc/zh_HK/glade-user-guide/Makefile
-+doc/zh_HK/glade-faq/Makefile
- doc/ro/Makefile
- doc/ro/glade-faq/Makefile
- omf-install/Makefile
---- ../glade-2.10.0.old/doc/Makefile.am 2005-06-14 13:05:32.896120664 +0100
-+++ ./doc/Makefile.am 2005-06-14 15:19:21.483589848 +0100
-@@ -1,5 +1,5 @@
-
--SUBDIRS = C ro
-+SUBDIRS = C ro de es fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
- #SUBDIRS = C it
-
- EXTRA_DIST = \
---- ../glade-2.10.0.old/doc/xmldocs.make 2005-06-14 13:05:32.897120512 +0100
-+++ ./doc/xmldocs.make 2005-06-14 15:20:38.825832040 +0100
-@@ -36,6 +36,7 @@
- # so it works for all 3 of our docs.
- appid = glade-2
- docdir = $(datadir)/gnome/help/$(appid)/$(lang)
-+omfurl = $(datadir)/gnome/help/sample_apps_info/$(lang)
-
- xml_files = $(entities) $(docname).xml
-
-@@ -51,7 +52,7 @@
-
- omf_timestamp: $(omffile)
- -for file in $(omffile); do \
-- scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } /identifier/ {print $$0}' $${file} | awk 'BEGIN {FS="\""} /url/ {print $$2}'` $${file} $(omf_dir)/$${file}; \
-+ scrollkeeper-preinstall $(omfurl)/`awk 'BEGIN {RS = ">" } /identifier/ {print $$0}' $${file} | awk 'BEGIN {FS="\""} /url/ {print $$2}'` $${file} $(omf_dir)/$${file}; \
- done
- touch omf_timestamp
-
--- a/patches/gnome-cups-manager-05-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
---- gnome-cups-manager-0.30/po/POTFILES.in 2005-06-16 10:40:30.074735000 +0530
-+++ gnome-cups-manager-0.30-new/po/POTFILES.in 2005-06-16 10:40:04.244734000 +0530
-@@ -1,5 +1,7 @@
- # List of source files containing translatable strings.
- # Please keep this file sorted alphabetically.
-+icons/emblem-default.icon.desktop.in
-+icons/emblem-paused.icon.desktop.in
- gnome-cups-add/add-printer.c
- gnome-cups-add/gnome-cups-add.glade
- gnome-cups-manager/eggtrayicon.c
-@@ -7,8 +9,10 @@ gnome-cups-manager/gnome-cups-icon.c
- gnome-cups-manager/gnome-cups-manager.c
- gnome-cups-manager/gnome-cups-manager.glade
- gnome-cups-manager/Gnome_CupsManager.server.in
-+gnome-cups-manager/eggiconlist.c
- gnome-cups-manager/gnome-printer-list.c
- gnome-cups-manager/printer-properties.c
-+gnome-cups-manager/ppd_i18n.xml
- gnome-cups-manager/tray.c
- gnome-cups-manager/view-queue.c
- libgnomecups/gnome-cups-permission.c
--- a/patches/gnome-im-switcher-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-diff -rNau gnome-im-switcher-1.1.2/configure.in gnome-im-switcher-1.1.2.new/configure.in
---- gnome-im-switcher-1.1.2/configure.in 2004-10-15 02:21:04.000000000 +0900
-+++ gnome-im-switcher-1.1.2.new/configure.in 2004-10-28 10:47:44.000000000 +0900
-@@ -94,6 +94,17 @@
- po/Makefile.in
- help/Makefile
- help/C/Makefile
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
- ])
-
- echo "
-diff -rNau gnome-im-switcher-1.1.2/help/Makefile.am gnome-im-switcher-1.1.2.new/help/Makefile.am
---- gnome-im-switcher-1.1.2/help/Makefile.am 2004-10-12 05:20:00.000000000 +0900
-+++ gnome-im-switcher-1.1.2.new/help/Makefile.am 2004-10-28 11:19:45.000000000 +0900
-@@ -1,4 +1,4 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
-
- EXTRA_DIST = xmldocs.make \
- omf.make
--- a/patches/gnome-im-switcher-02-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urN gnome-im-switcher-1.1.2.bak/po/POTFILES.in gnome-im-switcher-1.1.2/po/POTFILES.in
---- gnome-im-switcher-1.1.2.bak/po/POTFILES.in 2004-11-04 13:57:45.260763328 +0000
-+++ gnome-im-switcher-1.1.2/po/POTFILES.in 2004-11-04 14:00:09.019908616 +0000
-@@ -1,6 +1,7 @@
- capplet/gnome-im-properties.desktop.in
- capplet/gnome-im-properties.glade2
- capplet/gnome-im-properties.schemas.in
-+capplet/gnome-im-properties.schemas.in.in
- capplet/main.c
- src/GNOME_IMSwitcherApplet.server.in.in
- src/GNOME_InputMethodSwitcherApplet.xml
--- a/patches/gnome-panel-12-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-diff -urN gnome-panel-2.10.1/configure.in gnome-panel-2.10.1-hacked/configure.in
---- gnome-panel-2.10.1/configure.in 2005-04-04 06:24:28.000000000 +1200
-+++ gnome-panel-2.10.1-hacked/configure.in 2005-05-24 01:20:07.301911504 +1200
-@@ -257,6 +257,12 @@
- help/it/clock/Makefile
- help/it/window-list/Makefile
- help/it/workspace-switcher/Makefile
-+help/pt_BR/Makefile
-+help/pt_BR/fish/Makefile
-+help/pt_BR/clock/Makefile
-+help/pt_BR/window-list/Makefile
-+help/pt_BR/workspace-switcher/Makefile
-+help/sv/Makefile
- help/sv/Makefile
- help/sv/fish/Makefile
- help/sv/clock/Makefile
-@@ -277,6 +283,11 @@
- help/zh_CN/clock/Makefile
- help/zh_CN/window-list/Makefile
- help/zh_CN/workspace-switcher/Makefile
-+help/zh_HK/Makefile
-+help/zh_HK/fish/Makefile
-+help/zh_HK/clock/Makefile
-+help/zh_HK/window-list/Makefile
-+help/zh_HK/workspace-switcher/Makefile
- help/zh_TW/Makefile
- help/zh_TW/fish/Makefile
- help/zh_TW/clock/Makefile
--- a/patches/gnome-pilot-04-C-docs.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
---- gnome-pilot-2.0.10/help/C/Makefile.am.orig Fri May 2 16:49:13 2003
-+++ gnome-pilot-2.0.10/help/C/Makefile.am Fri Jul 9 14:29:49 2004
-@@ -1,7 +1,13 @@
-+figs = \
-+ figures/gnome_pilot_running_icon.png \
-+ figures/gnome_pilot_notrunning_icon.png \
-+ figures/gnome_pilot_paused_icon.png \
-+ figures/gnome_pilot_hotsync_icon.png
-+figdir = figures
- docname = gnome-pilot
- lang = C
- omffile = gnome-pilot-C.omf
--entities = gnome-pilot.xml
-+entities = gnome-pilot.xml legal.xml
-
- include $(top_srcdir)/help/xmldocs.make
- dist-hook: app-dist-hook
--- a/patches/gnome-pilot-05-help-links.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-diff -urN gnome-pilot-2.0.13/capplet/gnome-pilot-druid.c gnome-pilot-2.0.13-hacked/capplet/gnome-pilot-druid.c
---- gnome-pilot-2.0.13/capplet/gnome-pilot-druid.c 2005-03-29 05:33:04.000000000 +1200
-+++ gnome-pilot-2.0.13-hacked/capplet/gnome-pilot-druid.c 2005-05-17 19:23:49.935888832 +1200
-@@ -468,7 +468,21 @@
- static void
- gpd_help (GnomeDruid *druid, gpointer user_data)
- {
-- gnome_help_display_desktop (NULL, "gnome-pilot", "gnome-pilot.xml", "assistant", NULL);
-+ GError *error = NULL;
-+
-+ gnome_help_display_desktop (NULL, "user-guide", "goscustdesk.xml", "goscustdesk-104", &error);
-+
-+ if (error) {
-+ GtkWidget *message_dialog;
-+ message_dialog = gtk_message_dialog_new (NULL, 0,
-+ GTK_MESSAGE_ERROR,
-+ GTK_BUTTONS_OK,
-+ _("There was an error displaying help: %s"),
-+ error->message);
-+ g_error_free (error);
-+ gtk_dialog_run (GTK_DIALOG (message_dialog));
-+ gtk_widget_destroy (message_dialog);
-+ }
- }
-
- static void
-diff -urN gnome-pilot-2.0.13/capplet/gpilotd-control-applet.c gnome-pilot-2.0.13-hacked/capplet/gpilotd-control-applet.c
---- gnome-pilot-2.0.13/capplet/gpilotd-control-applet.c 2003-05-03 04:03:09.000000000 +1200
-+++ gnome-pilot-2.0.13-hacked/capplet/gpilotd-control-applet.c 2005-05-17 19:22:52.559611352 +1200
-@@ -89,19 +89,23 @@
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
- if (argc > 1 && strcmp (argv[1], "--druid") == 0) {
-- gnome_init_with_popt_table ("gpilot-control-applet",
-- VERSION, argc, argv,
-- options,0,NULL);
-+ gnome_program_init ("gnome-pilot", VERSION,
-+ LIBGNOMEUI_MODULE,
-+ argc, argv,
-+ GNOME_PARAM_POPT_TABLE, options,
-+ NULL);
-
- druid_on = TRUE;
- druid_prog = TRUE;
- } else {
- /* we're a capplet (we get CORBA for free from capplet_init) */
-- switch (gnome_init_with_popt_table ("gpilotd-control-applet", VERSION, argc, argv,
-- options,0,NULL)) {
-- case 1: return 0; break;
-- case -1: g_error (_("Error initializing gpilotd capplet")); break;
-- default: break;
-+ if(!gnome_program_init ("gnome-pilot", VERSION,
-+ LIBGNOMEUI_MODULE,
-+ argc, argv,
-+ GNOME_PARAM_POPT_TABLE, options,
-+ NULL)) {
-+ g_error (_("Error initializing gpilotd capplet"));
-+ return 0;
- }
- }
- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-palm.png");
--- a/patches/gnome-pilot-06-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-diff -rNau gnome-pilot-2.0.10/configure.in gnome-pilot-2.0.10.new/configure.in
---- gnome-pilot-2.0.10/configure.in 2004-10-28 14:06:35.991109000 +0900
-+++ gnome-pilot-2.0.10.new/configure.in 2004-10-28 11:05:19.000000000 +0900
-@@ -313,6 +313,17 @@
- po/Makefile.in
- help/Makefile
- help/C/Makefile
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
- gnome-pilot-2.0.pc
- ])
-
-diff -rNau gnome-pilot-2.0.10/help/Makefile.am gnome-pilot-2.0.10.new/help/Makefile.am
---- gnome-pilot-2.0.10/help/Makefile.am 2003-05-03 00:32:46.000000000 +0900
-+++ gnome-pilot-2.0.10.new/help/Makefile.am 2004-10-28 11:29:42.000000000 +0900
-@@ -1,3 +1,3 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
-
- EXTRA_DIST = xmldocs.make omf.make
--- a/patches/gnome-system-monitor-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -urN gnome-system-monitor-2.10.1/configure.in gnome-system-monitor-2.10.1-hacked/configure.in
---- gnome-system-monitor-2.10.1/configure.in 2005-04-02 10:03:46.000000000 +1200
-+++ gnome-system-monitor-2.10.1-hacked/configure.in 2005-05-19 14:40:38.499017984 +1200
-@@ -102,6 +102,17 @@
- po/Makefile.in
- help/Makefile
- help/C/Makefile
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/pt_BR/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
- gnome-system-monitor.desktop.in
- ])
-
-diff -urN gnome-system-monitor-2.10.1/help/Makefile.am gnome-system-monitor-2.10.1-hacked/help/Makefile.am
---- gnome-system-monitor-2.10.1/help/Makefile.am 2002-02-06 16:38:39.000000000 +1300
-+++ gnome-system-monitor-2.10.1-hacked/help/Makefile.am 2005-05-19 14:40:50.334218760 +1200
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
--- a/patches/gnome-user-docs-01-add-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- ../gnome2-user-docs-2.5.0.old/configure.in 2004-02-19 17:20:08.000000000 +0000
-+++ ./configure.in 2004-02-19 17:20:54.000000000 +0000
-@@ -39,6 +39,15 @@
- gnome-user-docs.spec
- gnome2-user-guide/Makefile
- gnome2-user-guide/C/Makefile
-+gnome2-user-guide/de/Makefile
-+gnome2-user-guide/es/Makefile
-+gnome2-user-guide/fr/Makefile
-+gnome2-user-guide/it/Makefile
-+gnome2-user-guide/ja/Makefile
-+gnome2-user-guide/ko/Makefile
-+gnome2-user-guide/sv/Makefile
-+gnome2-user-guide/zh_CN/Makefile
-+gnome2-user-guide/zh_TW/Makefile
- gnome2-accessibility-guide/Makefile
- gnome2-accessibility-guide/C/Makefile
- gnome2-system-admin-guide/Makefile
---- ../gnome2-user-docs-2.5.0.old/gnome2-user-guide/Makefile.am 2004-02-19 17:20:08.000000000 +0000
-+++ ./gnome2-user-guide/Makefile.am 2004-02-19 17:21:36.000000000 +0000
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW
--- a/patches/gnomemeeting-03-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-diff -urN gnomemeeting-1.2.1/configure.in gnomemeeting-1.2.1-hacked/configure.in
---- gnomemeeting-1.2.1/configure.in 2005-03-04 02:33:32.000000000 +1300
-+++ gnomemeeting-1.2.1-hacked/configure.in 2005-05-13 12:30:09.583740896 +1200
-@@ -528,7 +528,18 @@
- xdap_data/Makefile
- help/Makefile
- help/C/Makefile
--help/fr/Makefile)
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
-+)
-
- dnl ###########################################################################
- dnl Summary
-diff -urN gnomemeeting-1.2.1/help/Makefile.am gnomemeeting-1.2.1-hacked/help/Makefile.am
---- gnomemeeting-1.2.1/help/Makefile.am 2004-11-21 05:42:36.000000000 +1300
-+++ gnomemeeting-1.2.1-hacked/help/Makefile.am 2005-05-13 12:30:25.121378816 +1200
-@@ -1,3 +1,3 @@
- ## Process this file with automake to produce Makefile.in.
-
--SUBDIRS = C fr
-+SUBDIRS = C de es fr it ja ko pt_BR sv zh_CN zh_HK zh_TW
--- a/patches/gpdf-03-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -rNau gpdf-0.132/configure.in gpdf-0.132.new/configure.in
---- gpdf-0.132/configure.in 2004-06-08 03:51:17.000000000 +0900
-+++ gpdf-0.132.new/configure.in 2004-10-28 11:04:31.000000000 +0900
-@@ -484,6 +484,15 @@
- help/C/Makefile
- help/de/Makefile
- help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
- ])
-
- dnl ##### Warn user if X is missing.
-diff -rNau gpdf-0.132/help/Makefile.am gpdf-0.132.new/help/Makefile.am
---- gpdf-0.132/help/Makefile.am 2004-03-19 03:47:15.000000000 +0900
-+++ gpdf-0.132.new/help/Makefile.am 2004-10-28 11:29:15.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C de es
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
--- a/patches/gst-01-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-diff -urN gstreamer-0.8.4-orig/po/POTFILES.in gstreamer-0.8.4/po/POTFILES.in
---- gstreamer-0.8.4-orig/po/POTFILES.in 2004-09-29 23:55:27.226254840 +0900
-+++ gstreamer-0.8.4/po/POTFILES.in 2004-09-29 23:56:16.621745584 +0900
-@@ -1,6 +1,7 @@
- # Files from the GStreamer distribution which have already been
- # marked to allow runtime translations of messages
- gst/gst.c
-+gst/gstatomic_impl.h
- gst/gstelement.c
- gst/gsterror.c
- gst/gsttag.c
-@@ -13,6 +14,7 @@
- gst/elements/gstpipefilter.c
- gst/elements/gsttypefindelement.c
- gst/parse/grammar.y
-+gst/schedulers/entryscheduler.c
- tools/gst-inspect.c
- tools/gst-launch.c
- tools/gst-register.c
--- a/patches/gthumb-04-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -urN gthumb-2.3.1.bak/po/POTFILES.in gthumb-2.3.1/po/POTFILES.in
---- gthumb-2.3.1.bak/po/POTFILES.in 2004-09-15 16:17:07.633380000 +0100
-+++ gthumb-2.3.1/po/POTFILES.in 2004-09-15 16:19:57.652469000 +0100
-@@ -1,5 +1,8 @@
- # List of source files containing translatable strings.
--# Please keep this file sorted alphabetically.
-+# Please keep this file sorted alphabetically,
-+# using the C collating order if possible:
-+# shell: $ export LC_COLLATE=C
-+# shell: $ sort POTFILES.in -o POTFILES.in
- components/catalog-view/GNOME_GThumb_CatalogView.server.in.in
- components/catalog-view/GNOME_GThumb_CatalogView.xml.in
- components/catalog-view/catalog-control.c
-@@ -12,6 +15,7 @@
- components/image-viewer/GNOME_GThumb_Viewer.xml.in
- components/image-viewer/iids.h
- components/image-viewer/main.c
-+components/image-viewer/test-component.c
- components/image-viewer/ui.c
- components/image-viewer/ui.h
- components/image-viewer/viewer-control.c
--- a/patches/gthumb-05-g11n-alllinguas.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gthumb-2.3.1/configure.in 2004-02-17 00:22:47.000000000 +0800
-+++ gthumb-2.3.1.new/configure.in 2004-10-13 18:55:40.000000000 +0800
-@@ -230,7 +230,7 @@ dnl ####################################
- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
- AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-
--ALL_LINGUAS="am az be ca cs da de en_GB es fr ga hr hu it ja ko lv mk ml ms nl no pl pt pt_BR ru sr sr@Latn sv uk zh_CN zh_TW"
-+ALL_LINGUAS="am az be ca cs da de en_GB es fr ga hr hu it ja ko lv mk ml ms nl no pl pt pt_BR ru sr sr@Latn sv uk zh_CN zh_TW zh_HK"
- GETTEXT_PACKAGE=gthumb
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
--- a/patches/gtkam-06-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -urN gtkam-0.1.11.bak/po/POTFILES.in gtkam-0.1.11/po/POTFILES.in
---- gtkam-0.1.11.bak/po/POTFILES.in 2004-09-15 16:39:31.216630000 +0100
-+++ gtkam-0.1.11/po/POTFILES.in 2004-09-15 16:41:12.442926000 +0100
-@@ -1,3 +1,10 @@
-+# List of source files containing translatable strings.
-+# Please keep this file sorted alphabetically,
-+# shell: $ export LC_COLLATE=C
-+# shell: $ sort POTFILES.in -o POTFILES.in
-+# using the C collating order if possible:
-+gexif-0.5/gexif/gexif-main.c
-+gexif-0.5/gexif/gexif-thumbnail.c
- gtkam.desktop.in
- src/gtkam-cancel.c
- src/gtkam-chooser.c
--- a/patches/gtkam-07-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-diff -rNua gtkam-0.1.11/configure.in gtkam.new/configure.in
---- gtkam-0.1.11/configure.in 2005-02-25 21:30:13.376495936 +0900
-+++ gtkam.new/configure.in 2005-02-25 21:29:13.000000000 +0900
-@@ -193,6 +193,17 @@
- omf-install/gtkam-C.omf
- help/Makefile
- help/C/Makefile
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/pt_BR/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
- ])
-
- echo "
-diff -rNua gtkam-0.1.11/help/Makefile.am gtkam.new/help/Makefile.am
---- gtkam-0.1.11/help/Makefile.am 2004-01-10 15:30:49.000000000 +0900
-+++ gtkam.new/help/Makefile.am 2005-02-25 21:29:51.000000000 +0900
-@@ -1,3 +1,3 @@
- ## Process this file with automake to produce Makefile.in.
-
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
--- a/patches/jdshelp-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -aNru jdshelp-1.1.7/java/Makefile.am jdshelp-1.1.7.new/java/Makefile.am
---- jdshelp-1.1.7/java/Makefile.am 2004-04-13 21:08:51.000000000 +0900
-+++ jdshelp-1.1.7.new/java/Makefile.am 2004-09-02 20:54:20.000000000 +0900
-@@ -26,4 +26,14 @@
- EXTRA_DIST= \
- manifest.mf \
- jdshelpmsg.properties \
-+ jdshelpmsg_de.properties \
-+ jdshelpmsg_es.properties \
-+ jdshelpmsg_fr.properties \
-+ jdshelpmsg_it.properties \
-+ jdshelpmsg_sv.properties \
-+ jdshelpmsg_ja.properties \
-+ jdshelpmsg_ko.properties \
-+ jdshelpmsg_zh_CN.properties \
-+ jdshelpmsg_zh_TW.properties \
-+ jdshelpmsg_zh_HK.properties \
- $(JDSHELP_SOURCES)
--- a/patches/libexif-gtk-02-fix-potfile.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- ../libexif-gtk-0.3.3.old/po/missing 1969-12-31 16:00:00.000000000 -0800
-+++ ./po/missing 2004-02-04 17:08:19.000000000 -0800
-@@ -0,0 +1,9 @@
-+libexif-gtk/gtk-exif-content-list.c
-+libexif-gtk/gtk-exif-entry-copyright.c
-+libexif-gtk/gtk-exif-entry-date.c
-+libexif-gtk/gtk-exif-entry-exposure.c
-+libexif-gtk/gtk-exif-entry-number.c
-+libexif-gtk/gtk-exif-entry-option.c
-+libexif-gtk/gtk-exif-entry-rational.c
-+libexif-gtk/gtk-exif-entry-resolution.c
-+libexif-gtk/gtk-exif-entry-version.c
---- ../libexif-gtk-0.3.3.old/po/POTFILES.in 2004-02-04 17:07:17.000000000 -0800
-+++ ./po/POTFILES.in 2004-02-04 17:08:56.000000000 -0800
-@@ -1,2 +1,11 @@
- libexif-gtk/gtk-exif-browser.c
-+libexif-gtk/gtk-exif-content-list.c
-+libexif-gtk/gtk-exif-entry-copyright.c
-+libexif-gtk/gtk-exif-entry-date.c
-+libexif-gtk/gtk-exif-entry-exposure.c
-+libexif-gtk/gtk-exif-entry-number.c
-+libexif-gtk/gtk-exif-entry-option.c
-+libexif-gtk/gtk-exif-entry-rational.c
-+libexif-gtk/gtk-exif-entry-resolution.c
-+libexif-gtk/gtk-exif-entry-version.c
- gtk-extensions/gtk-menu-option.c
--- a/patches/libexif-gtk-03-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-diff -urN libexif-gtk-0.3.3.bak/po/POTFILES.in libexif-gtk-0.3.3/po/POTFILES.in
---- libexif-gtk-0.3.3.bak/po/POTFILES.in 2004-03-11 16:12:03.000000000 +0000
-+++ libexif-gtk-0.3.3/po/POTFILES.in 2004-03-11 16:14:09.000000000 +0000
-@@ -1,3 +1,6 @@
-+# List of source files containing translatable strings.
-+# Please keep this file sorted alphabetically.
-+gtk-extensions/gtk-menu-option.c
- libexif-gtk/gtk-exif-browser.c
- libexif-gtk/gtk-exif-content-list.c
- libexif-gtk/gtk-exif-entry-copyright.c
-@@ -7,5 +10,5 @@
- libexif-gtk/gtk-exif-entry-option.c
- libexif-gtk/gtk-exif-entry-rational.c
- libexif-gtk/gtk-exif-entry-resolution.c
-+libexif-gtk/gtk-exif-entry-user-comment.c
- libexif-gtk/gtk-exif-entry-version.c
--gtk-extensions/gtk-menu-option.c
--- a/patches/libgnomeprintui-01-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- ../libgnomeprintui-2.5.2.old/po/POTFILES.in 2004-02-19 11:32:00.000000000 +0000
-+++ ./po/POTFILES.in 2004-02-19 11:32:47.000000000 +0000
-@@ -1,5 +1,7 @@
- # List of source files containing translatable strings.
- # Please keep this file sorted alphabetically.
-+examples/example_10.glade
-+examples/example_12.c
- libgnomeprintui/gnome-canvas-hacktext.c
- libgnomeprintui/gnome-font-dialog.c
- libgnomeprintui/gnome-print-config-dialog.c
--- a/patches/libgphoto2-02-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-diff -urN libgphoto2-2.1.4.bak/po/POTFILES.in libgphoto2-2.1.4/po/POTFILES.in
---- libgphoto2-2.1.4.bak/po/POTFILES.in 2004-09-15 17:50:39.514327000 +0100
-+++ libgphoto2-2.1.4/po/POTFILES.in 2004-09-15 17:49:24.914226000 +0100
-@@ -1,3 +1,16 @@
-+# List of source files containing translatable strings.
-+# Please keep this file sorted alphabetically,
-+# using the C collating order if possible:
-+# shell: $ export LC_COLLATE=C
-+# shell: $ sort POTFILES.in -o POTFILES.in
-+camlibs/aox/library.c
-+camlibs/sq905/library.c
-+camlibs/toshiba/pdrm11/library.c
-+libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c
-+libgphoto2_port/libgphoto2_port/gphoto2-port-result.c
-+libgphoto2_port/libgphoto2_port/gphoto2-port.c
-+libgphoto2_port/serial/unix.c
-+libgphoto2_port/usb/libusb.c
- camlibs/agfa-cl20/agfa_cl20.c
- camlibs/barbie/barbie.c
- camlibs/canon/canon.c
--- a/patches/magicdev-06-g11n_alllinguas.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- ../magicdev-1.1.7.old/configure.in 2005-06-15 15:09:24.458554960 +0100
-+++ ./configure.in 2005-06-15 15:10:23.521576016 +0100
-@@ -40,7 +40,7 @@
- AM_GCONF_SOURCE_2
-
- dnl Initialize gettext
--ALL_LINGUAS="am az be bn ca cs da de el en_CA en_GB es fi fr gl he hr hu id is it ja lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi wa zh_CN zh_TW"
-+ALL_LINGUAS="am az be bn ca cs da de el en_CA en_GB es fi fr gl he hr hu id is it ja ko lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi wa zh_CN zh_TW"
- AM_GLIB_GNU_GETTEXT
-
- AC_CHECK_FUNCS(getline flockfile)
--- a/patches/mozilla-01-signal_h.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- mozilla/config/mkdepend/main.c.orig Wed Mar 3 01:01:41 2004
-+++ mozilla/config/mkdepend/main.c Wed Mar 3 01:02:24 2004
-@@ -31,6 +31,9 @@
- #define sigvec sigvector
- #endif /* hpux */
-
-+#ifdef sun
-+#include <signal.h>
-+#else
- #ifdef X_POSIX_C_SOURCE
- #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
- #include <signal.h>
-@@ -44,6 +47,7 @@
- #undef _POSIX_SOURCE
- #endif
- #endif
-+#endif /* sun */
-
- #include <stdarg.h>
-
--- a/patches/mozilla-02-release_notes.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- mozilla.orig/xpfe/global/resources/locale/en-US/Makefile.in Wed Mar 3 05:48:59 2004
-+++ mozilla/xpfe/global/resources/locale/en-US/Makefile.in Wed Mar 3 05:48:40 2004
-@@ -30,6 +30,6 @@
-
- libs::
- ifneq (,$(filter SunOS,$(OS_ARCH)))
-- @cp $(srcdir)/mozilla_release_notes.solaris.html $(srcdir)/mozilla_release_notes.html
-+ @cp $(topsrcdir)/mozilla_release_notes.solaris.html $(srcdir)/mozilla_release_notes.html
- endif
-
--- a/patches/nautilus-media-01-solaris.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
---- nautilus-media-0.8.1/audio-view/README 2002-11-02 07:49:01.000000000 +0530
-+++ nautilus-media-0.8.1-new/audio-view/README 2005-05-20 07:40:48.495924000 +0530
-@@ -68,4 +68,4 @@ bin setup :
- - in READY: pipeline = filesrc ! autobin
- autobin = cache ! typefind
- - in PAUSED: pipeline = filesrc ! autobin
-- autobin = decoder ! sink
-+ autobin = decoder ! audioconvert ! audioscale ! sink
---- nautilus-media-0.8.1/audio-view/audio-play.c 2004-03-08 06:16:57.000000000 +0530
-+++ nautilus-media-0.8.1-new/audio-view/audio-play.c 2005-05-20 07:40:48.592993000 +0530
-@@ -35,6 +35,8 @@ struct AudioPlayPriv {
- GstElement *src;
- GstElement *typefind;
- GstElement *decoder;
-+ GstElement *audioscale;
-+ GstElement *audioconvert;
- GstElement *sink;
-
- GstCaps *caps; /* FIXME: why ? */
-@@ -216,12 +218,28 @@ handle_have_type (AudioPlay *play)
- #endif
- priv->decoder = decoder;
-
-+ if (priv->audioconvert == NULL)
-+ {
-+ priv->audioconvert = gst_element_factory_make ("audioconvert", "audioconvert");
-+ g_object_ref (priv->audioconvert);
-+ }
-+
-+ if (priv->audioscale == NULL)
-+ {
-+ priv->audioscale = gst_element_factory_make ("audioscale", "audioscale");
-+ g_object_ref (priv->audioscale);
-+ }
-+
- /* set it to null */
- gst_element_set_state (priv->pipeline, GST_STATE_NULL);
-
- /* now put playback pipe in place of where typefind was */
- NM_DEBUG("putting in decoder\n");
- gst_bin_add (GST_BIN (priv->pipeline), priv->decoder);
-+
-+ gst_bin_add (GST_BIN (priv->pipeline), priv->audioconvert);
-+ gst_bin_add (GST_BIN (priv->pipeline), priv->audioscale);
-+
- NM_DEBUG("putting in sink\n");
- gst_bin_add (GST_BIN (priv->pipeline), priv->sink);
- /* FIXME: this shouldn't go here */
-@@ -229,11 +247,15 @@ handle_have_type (AudioPlay *play)
- G_CALLBACK (callback_sink_eos), play);
- if (!gst_element_connect (priv->src, priv->decoder))
- g_error ("warning: could not connect src and decoder !\n");
-- if (!gst_element_connect (priv->decoder, priv->sink))
-- g_print ("warning: could not connect decoder and sink !\n");
-+ if (!gst_element_connect (priv->decoder, priv->audioconvert))
-+ g_print ("warning: could not connect decoder and audioconvert !\n");
-+ if (!gst_element_connect (priv->audioconvert, priv->audioscale))
-+ g_print ("warning: could not connect audioconvert and audioscale !\n");
-+ if (!gst_element_connect (priv->audioscale, priv->sink))
-+ g_print ("warning: could not connect audioscale and sink !\n");
- if (gst_element_set_state (priv->pipeline, GST_STATE_PAUSED)
- == GST_STATE_FAILURE)
-- g_print ("pipelien could not be paused !\n");
-+ g_print ("pipeline could not be paused !\n");
- NM_DEBUG("handle_have_type: DONE\n");
- }
-
-@@ -328,8 +350,8 @@ callback_sink_eos (GstElement *element,
- /* FIXME: would you please sanitify naming of callbacks and so on ? */
- /* callback used for errors coming from GStreamer */
- static void
--error_callback (GObject *object, GstObject *origin, gchar *error,
-- gpointer data)
-+error_callback (GObject *object, GstObject *origin, GError *err,
-+ gchar *error, gpointer data)
- {
- AudioPlay *play = data;
- gchar *message;
-@@ -473,6 +495,8 @@ audio_play_init (AudioPlay *play)
- priv->src = NULL;
- priv->typefind = NULL;
- priv->decoder = NULL;
-+ priv->audioscale = NULL;
-+ priv->audioconvert = NULL;
- priv->sink = NULL;
-
- priv->caps = NULL;
-@@ -614,6 +638,20 @@ audio_play_dispose (GObject *obj)
- priv->src = NULL;
- }
-
-+ NM_DEBUG("dispose: unreffing audioscale\n");
-+ if (priv->audioscale)
-+ {
-+ g_object_unref (priv->audioscale);
-+ priv->audioscale = NULL;
-+ }
-+
-+ NM_DEBUG("dispose: unreffing audioconvert\n");
-+ if (priv->audioconvert)
-+ {
-+ g_object_unref (priv->audioconvert);
-+ priv->audioconvert = NULL;
-+ }
-+
- NM_DEBUG("dispose: unreffing sink\n");
- if (priv->sink)
- {
-@@ -954,6 +992,8 @@ audio_play_playing_to_ready (AudioPlay *
- gst_element_disconnect (priv->src, priv->decoder);
- gst_element_disconnect (priv->decoder, priv->sink);
- /* remove sink and decoder from the bin */
-+ gst_bin_remove (GST_BIN (priv->pipeline), priv->audioconvert);
-+ gst_bin_remove (GST_BIN (priv->pipeline), priv->audioscale);
- gst_bin_remove (GST_BIN (priv->pipeline), priv->decoder);
- g_object_ref (priv->sink);
- gst_bin_remove (GST_BIN (priv->pipeline), priv->sink);
---- nautilus-media-0.8.1/audio-view/audio-view.c 2004-06-01 14:11:45.000000000 +0530
-+++ nautilus-media-0.8.1-new/audio-view/audio-view.c 2005-05-20 07:40:48.686702000 +0530
-@@ -428,6 +428,10 @@ audio_view_play_next (AudioView *view)
- gtk_tree_model_get (model, &iter,
- AUDIO_INFO_COLUMN, &info,
- -1);
-+
-+ if (info == NULL)
-+ return FALSE;
-+
- NM_DEBUG("play_next: track to play is %s\n", info->path);
-
- if (!audio_view_is_playable (info->path))
--- a/patches/netapplet-01-docs.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-diff -urN netapplet-0.98.0.d4.orig/configure.in netapplet-0.98.0.d4/configure.in
---- netapplet-0.98.0.d4.orig/configure.in Wed Dec 8 17:29:42 2004
-+++ netapplet-0.98.0.d4/configure.in Mon Nov 8 11:47:36 2004
-@@ -105,6 +105,8 @@
-
- AC_OUTPUT([
- Makefile
-+help/Makefile
-+help/C/Makefile
- icons/Makefile
- icons/48x48/Makefile
- src/Makefile
-diff -urN netapplet-0.98.0.d4.orig/Makefile.am netapplet-0.98.0.d4/Makefile.am
---- netapplet-0.98.0.d4.orig/Makefile.am Wed Dec 8 16:48:31 2004
-+++ netapplet-0.98.0.d4/Makefile.am Wed Dec 8 17:08:19 2004
-@@ -1,4 +1,4 @@
--SUBDIRS = src icons po
-+SUBDIRS = src icons po help
-
- icondir = $(datadir)/pixmaps
- icon_DATA = netapplet.png
-@@ -18,6 +18,8 @@
- config.log \
- config.status \
- configure \
-+ help/Makefile \
-+ help/C/Makefile \
- Makefile \
- Makefile.in \
- intltool-extract \
-diff -urN netapplet-0.98.0.d4.orig/help/C/Makefile.am netapplet-0.98.0.d4/help/C/Makefile.am
---- netapplet-0.98.0.d4.orig/help/C/Makefile.am Thu Jan 1 01:00:00 1970
-+++ netapplet-0.98.0.d4/help/C/Makefile.am Wed Dec 8 17:04:04 2004
-@@ -0,0 +1,7 @@
-+figdir = figures
-+docname = netapplet
-+lang = C
-+omffile = netapplet-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN netapplet-0.98.0.d4.orig/help/Makefile.am netapplet-0.98.0.d4/help/Makefile.am
---- netapplet-0.98.0.d4.orig/help/Makefile.am Thu Jan 1 01:00:00 1970
-+++ netapplet-0.98.0.d4/help/Makefile.am Wed Dec 8 17:04:52 2004
-@@ -0,0 +1 @@
-+SUBDIRS = C
-diff -urN netapplet-0.98.0.d4.orig/omf.make netapplet-0.98.0.d4/omf.make
---- netapplet-0.98.0.d4.orig/omf.make Thu Jan 1 01:00:00 1970
-+++ netapplet-0.98.0.d4/omf.make Tue Dec 7 18:06:14 2004
-@@ -0,0 +1,61 @@
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# This file contains the build instructions for installing OMF files. It is
-+# generally called from the makefiles for particular formats of documentation.
-+#
-+# Note that you must configure your package with --localstatedir=/var
-+# so that the scrollkeeper-update command below will update the database
-+# in the standard scrollkeeper directory.
-+#
-+# If it is impossible to configure with --localstatedir=/var, then
-+# modify the definition of scrollkeeper_localstate_dir so that
-+# it points to the correct location. Note that you must still use
-+# $(localstatedir) in this or when people build RPMs it will update
-+# the real database on their system instead of the one under RPM_BUILD_ROOT.
-+#
-+# Note: This make file is not incorporated into xmldocs.make because, in
-+# general, there will be other documents install besides XML documents
-+# and the makefiles for these formats should also include this file.
-+#
-+# About this file:
-+# This file was derived from scrollkeeper_example2, a package
-+# illustrating how to install documentation and OMF files for use with
-+# ScrollKeeper 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.3 (last updated: March 20, 2002)
-+#
-+
-+omf_dest_dir=$(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+
-+# At some point, it may be wise to change to something like this:
-+# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
-+
-+omf: omf_timestamp
-+
-+omf_timestamp: $(omffile)
-+ -for file in $(omffile); do \
-+ scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-+ done; \
-+ touch omf_timestamp
-+
-+install-data-hook-omf:
-+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-+ for file in $(omffile); do \
-+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ done
-+ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+ -for file in $(srcdir)/*.omf; do \
-+ basefile=`basename $$file`; \
-+ rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
-+ done
-+ -rmdir $(DESTDIR)$(omf_dest_dir)
-+ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir)
-+
-+clean-local-omf:
-+ -for file in $(omffile); do \
-+ rm -f $$file.out; \
-+ done
-diff -urN netapplet-0.98.0.d4.orig/xmldocs.make netapplet-0.98.0.d4/xmldocs.make
---- netapplet-0.98.0.d4.orig/xmldocs.make Thu Jan 1 01:00:00 1970
-+++ netapplet-0.98.0.d4/xmldocs.make Tue Dec 7 18:06:14 2004
-@@ -0,0 +1,95 @@
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# To use this template:
-+# 1) Define: figdir, docname, lang, omffile, and entities in
-+# your Makefile.am file for each document directory,
-+# although figdir, omffile, and entities may be empty
-+# 2) Make sure the Makefile in (1) also includes
-+# "include $(top_srcdir)/xmldocs.make" and
-+# "dist-hook: app-dist-hook".
-+# 3) Optionally define 'entities' to hold xml entities which
-+# you would also like installed
-+# 4) Figures must go under $(figdir)/ and be in PNG format
-+# 5) You should only have one document per directory
-+# 6) Note that the figure directory, $(figdir)/, should not have its
-+# own Makefile since this Makefile installs those figures.
-+#
-+# example Makefile.am:
-+# figdir = figures
-+# docname = scrollkeeper-manual
-+# lang = C
-+# omffile=scrollkeeper-manual-C.omf
-+# entities = fdl.xml
-+# include $(top_srcdir)/xmldocs.make
-+# dist-hook: app-dist-hook
-+#
-+# About this file:
-+# This file was taken from scrollkeeper_example2, a package illustrating
-+# how to install documentation and OMF files for use with ScrollKeeper
-+# 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.2 (last updated: March 20, 2002)
-+#
-+
-+
-+# ********** Begin of section some packagers may need to modify **********
-+# This variable (docdir) specifies where the documents should be installed.
-+# This default value should work for most packages.
-+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+
-+# ********** You should not have to edit below this line **********
-+xml_files = $(entities) $(docname).xml
-+
-+EXTRA_DIST = $(xml_files) $(omffile)
-+CLEANFILES = omf_timestamp
-+
-+include $(top_srcdir)/omf.make
-+
-+all: omf
-+
-+$(docname).xml: $(entities)
-+ -ourdir=`pwd`; \
-+ cd $(srcdir); \
-+ cp $(entities) $$ourdir
-+
-+app-dist-hook:
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(distdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-local: omf
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)
-+ for file in $(xml_files); do \
-+ cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
-+ done
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-hook: install-data-hook-omf
-+
-+uninstall-local: uninstall-local-doc uninstall-local-omf
-+
-+uninstall-local-doc:
-+ -if test "$(figdir)"; then \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-+ done; \
-+ rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+ fi
-+ -for file in $(xml_files); do \
-+ rm -f $(DESTDIR)$(docdir)/$$file; \
-+ done
-+ -rmdir $(DESTDIR)$(docdir)
-+
-+clean-local: clean-local-omf
--- a/patches/netapplet-02-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -ruNa netapplet-0.98.0.d4/configure.in netapplet-0.98.0.d4.new/configure.in
---- netapplet-0.98.0.d4/configure.in 2004-12-16 15:29:18.088986256 +0900
-+++ netapplet-0.98.0.d4.new/configure.in 2004-12-16 15:28:17.000000000 +0900
-@@ -107,6 +107,17 @@
- Makefile
- help/Makefile
- help/C/Makefile
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/pt_BR/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
- icons/Makefile
- icons/48x48/Makefile
- src/Makefile
-diff -ruNa netapplet-0.98.0.d4/help/Makefile.am netapplet-0.98.0.d4.new/help/Makefile.am
---- netapplet-0.98.0.d4/help/Makefile.am 2004-12-16 15:29:18.078987776 +0900
-+++ netapplet-0.98.0.d4.new/help/Makefile.am 2004-12-16 15:28:47.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
--- a/patches/now-01-g11n-i18n-ui.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2351 +0,0 @@
-diff -urN now-1.0.d4/acconfig.h now-1.0.d4-hacked/acconfig.h
---- now-1.0.d4/acconfig.h 1970-01-01 12:00:00.000000000 +1200
-+++ now-1.0.d4-hacked/acconfig.h 2004-06-02 09:22:19.000000000 +1200
-@@ -0,0 +1,6 @@
-+#undef ENABLE_NLS
-+#undef HAVE_CATGETS
-+#undef HAVE_GETTEXT
-+#undef HAVE_LC_MESSAGES
-+#undef HAVE_STPCPY
-+#undef GETTEXT_PACKAGE
-diff -urN now-1.0.d4/intltool-extract.in now-1.0.d4-hacked/intltool-extract.in
---- now-1.0.d4/intltool-extract.in 1970-01-01 12:00:00.000000000 +1200
-+++ now-1.0.d4-hacked/intltool-extract.in 2004-06-02 09:22:19.000000000 +1200
-@@ -0,0 +1,389 @@
-+#!@INTLTOOL_PERL@ -w
-+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+
-+#
-+# The Intltool Message Extractor
-+#
-+# Copyright (C) 2000-2001 Free Software Foundation.
-+#
-+# Intltool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of the
-+# License, or (at your option) any later version.
-+#
-+# Intltool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+#
-+# Authors: Kenneth Christiansen <[email protected]>
-+# Darin Adler <[email protected]>
-+#
-+
-+## Release information
-+my $PROGRAM = "intltool-extract";
-+my $PACKAGE = "intltool";
-+my $VERSION = "0.25";
-+
-+## Loaded modules
-+use strict;
-+use File::Basename;
-+use Getopt::Long;
-+
-+## Scalars used by the option stuff
-+my $TYPE_ARG = "0";
-+my $LOCAL_ARG = "0";
-+my $HELP_ARG = "0";
-+my $VERSION_ARG = "0";
-+my $UPDATE_ARG = "0";
-+my $QUIET_ARG = "0";
-+
-+my $FILE;
-+my $OUTFILE;
-+
-+my $gettext_type = "";
-+my $input;
-+my %messages = ();
-+
-+## Use this instead of \w for XML files to handle more possible characters.
-+my $w = "[-A-Za-z0-9._:]";
-+
-+## Always print first
-+$| = 1;
-+
-+## Handle options
-+GetOptions (
-+ "type=s" => \$TYPE_ARG,
-+ "local|l" => \$LOCAL_ARG,
-+ "help|h" => \$HELP_ARG,
-+ "version|v" => \$VERSION_ARG,
-+ "update" => \$UPDATE_ARG,
-+ "quiet|q" => \$QUIET_ARG,
-+ ) or &error;
-+
-+&split_on_argument;
-+
-+
-+## Check for options.
-+## This section will check for the different options.
-+
-+sub split_on_argument {
-+
-+ if ($VERSION_ARG) {
-+ &version;
-+
-+ } elsif ($HELP_ARG) {
-+ &help;
-+
-+ } elsif ($LOCAL_ARG) {
-+ &place_local;
-+ &extract;
-+
-+ } elsif ($UPDATE_ARG) {
-+ &place_normal;
-+ &extract;
-+
-+ } elsif (@ARGV > 0) {
-+ &place_normal;
-+ &message;
-+ &extract;
-+
-+ } else {
-+ &help;
-+
-+ }
-+}
-+
-+sub place_normal {
-+ $FILE = $ARGV[0];
-+ $OUTFILE = "$FILE.h";
-+}
-+
-+sub place_local {
-+ $OUTFILE = fileparse($FILE, ());
-+ if (!-e "tmp/") {
-+ system("mkdir tmp/");
-+ }
-+ $OUTFILE = "./tmp/$OUTFILE.h"
-+}
-+
-+sub determine_type {
-+ if ($TYPE_ARG =~ /^gettext\/(.*)/) {
-+ $gettext_type=$1
-+ }
-+}
-+
-+## Sub for printing release information
-+sub version{
-+ print "${PROGRAM} (${PACKAGE}) $VERSION\n";
-+ print "Copyright (C) 2000 Free Software Foundation, Inc.\n";
-+ print "Written by Kenneth Christiansen, 2000.\n\n";
-+ print "This is free software; see the source for copying conditions. There is NO\n";
-+ print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-+ exit;
-+}
-+
-+## Sub for printing usage information
-+sub help{
-+ print "Usage: ${PROGRAM} [FILENAME] [OPTIONS] ...\n";
-+ print "Generates a header file from an xml source file.\n\nGrabs all strings ";
-+ print "between <_translatable_node> and it's end tag,\nwhere tag are all allowed ";
-+ print "xml tags. Read the docs for more info.\n\n";
-+ print " -v, --version shows the version\n";
-+ print " -h, --help shows this help page\n";
-+ print " -q, --quiet quiet mode\n";
-+ print "\nReport bugs to <kenneth\@gnu.org>.\n";
-+ exit;
-+}
-+
-+## Sub for printing error messages
-+sub error{
-+ print "Try `${PROGRAM} --help' for more information.\n";
-+ exit;
-+}
-+
-+sub message {
-+ print "Generating C format header file for translation.\n";
-+}
-+
-+sub extract {
-+ &determine_type;
-+
-+ &convert ($FILE);
-+
-+ open OUT, ">$OUTFILE";
-+ &msg_write;
-+ close OUT;
-+
-+ print "Wrote $OUTFILE\n" unless $QUIET_ARG;
-+}
-+
-+sub convert($) {
-+
-+ ## Reading the file
-+ {
-+ local (*IN);
-+ local $/; #slurp mode
-+ open (IN, "<$FILE") || die "can't open $FILE: $!";
-+ $input = <IN>;
-+ }
-+
-+ &type_ini if $gettext_type eq "ini";
-+ &type_keys if $gettext_type eq "keys";
-+ &type_xml if $gettext_type eq "xml";
-+ &type_glade if $gettext_type eq "glade";
-+ &type_scheme if $gettext_type eq "scheme";
-+ &type_schemas if $gettext_type eq "schemas";
-+ &type_rfc822deb if $gettext_type eq "rfc822deb";
-+}
-+
-+sub entity_decode_minimal
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/&/&/g;
-+
-+ return $_;
-+}
-+
-+sub entity_decode
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/&/&/g;
-+ s/</</g;
-+ s/>/>/g;
-+
-+ return $_;
-+}
-+
-+sub escape_char
-+{
-+ return '\"' if $_ eq '"';
-+ return '\n' if $_ eq "\n";
-+ return '\\' if $_ eq '\\';
-+
-+ return $_;
-+}
-+
-+sub escape
-+{
-+ my ($string) = @_;
-+ return join "", map &escape_char, split //, $string;
-+}
-+
-+sub type_ini {
-+ ### For generic translatable desktop files ###
-+ while ($input =~ /^_.*=(.*)$/mg) {
-+ $messages{$1} = [];
-+ }
-+}
-+
-+sub type_keys {
-+ ### For generic translatable mime/keys files ###
-+ while ($input =~ /^\s*_\w+=(.*)$/mg) {
-+ $messages{$1} = [];
-+ }
-+}
-+
-+sub type_xml {
-+ ### For generic translatable XML files ###
-+
-+ while ($input =~ /\s_$w+=\"([^"]+)\"/sg) { # "
-+ $messages{entity_decode_minimal($1)} = [];
-+ }
-+
-+ while ($input =~ /<_($w+)(?: xml:space="($w+)")?>(.+?)<\/_\1>/sg) {
-+ $_ = $3;
-+ if (!defined($2) || $2 ne "preserve") {
-+ s/\s+/ /g;
-+ s/^ //;
-+ s/ $//;
-+ }
-+ $messages{entity_decode_minimal($_)} = [];
-+ }
-+}
-+
-+sub type_schemas {
-+ ### For schemas XML files ###
-+
-+ # FIXME: We should handle escaped < (less than)
-+ while ($input =~ /
-+ <locale\ name="C">\s*
-+ (<default>\s*(.*?)\s*<\/default>\s*)?
-+ (<short>\s*(.*?)\s*<\/short>\s*)?
-+ (<long>\s*(.*?)\s*<\/long>\s*)?
-+ <\/locale>
-+ /sgx) {
-+ my @totranslate = ($2,$4,$6);
-+ foreach (@totranslate) {
-+ next if !$_;
-+ s/\s+/ /g;
-+ $messages{entity_decode_minimal($_)} = [];
-+ }
-+ }
-+}
-+
-+sub type_rfc822deb {
-+ ### For rfc822-style Debian configuration files ###
-+
-+ while ($input =~ /(?:^|\n)_[^:]+:\s*(.*?)(?=\n\S|$)/sg) {
-+ my @str_list = rfc822deb_split($1);
-+ for my $str (@str_list) {
-+ # As rfc822deb is for configuration files, duplicates
-+ # should never happen. Developers must use the
-+ # [] construct to make msgid unique, see also intltool-merge
-+ print STDERR "Warning: msgid multiply defined:\n $str\n"
-+ if defined($messages{$str});
-+ $messages{$str} = [];
-+ }
-+ }
-+}
-+
-+sub rfc822deb_split {
-+ # Debian defines a special way to deal with rfc822-style files:
-+ # when a value contain newlines, it consists of
-+ # 1. a short form (first line)
-+ # 2. a long description, all lines begin with a space,
-+ # and paragraphs are separated by a single dot on a line
-+ # This routine returns an array of all paragraphs, and reformat
-+ # them.
-+ my $text = shift;
-+ $text =~ s/^ //mg;
-+ return ($text) if $text !~ /\n/;
-+
-+ $text =~ s/([^\n]*)\n//;
-+ my @list = ($1);
-+ my $str = '';
-+ for my $line (split (/\n/, $text)) {
-+ chomp $line;
-+ $line =~ /\s+$/;
-+ if ($line =~ /^\.$/) {
-+ # New paragraph
-+ $str =~ s/\s*$//;
-+ push(@list, $str);
-+ $str = '';
-+ } elsif ($line =~ /^\s/) {
-+ # Line which must not be reformatted
-+ $str .= "\n" if length ($str) && $str !~ /\n$/;
-+ $str .= $line."\n";
-+ } else {
-+ # Continuation line, remove newline
-+ $str .= " " if length ($str) && $str !~ /[\n ]$/;
-+ $str .= $line;
-+ }
-+ }
-+ $str =~ s/\s*$//;
-+ push(@list, $str) if length ($str);
-+ return @list;
-+}
-+
-+sub type_glade {
-+ ### For translatable Glade XML files ###
-+
-+ my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message";
-+
-+ while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) {
-+ # Glade sometimes uses tags that normally mark translatable things for
-+ # little bits of non-translatable content. We work around this by not
-+ # translating strings that only includes something like label4 or window1.
-+ $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
-+ }
-+
-+ while ($input =~ /<items>(..[^<]*)<\/items>/sg) {
-+ for my $item (split (/\n/, $1)) {
-+ $messages{entity_decode($item)} = [];
-+ }
-+ }
-+
-+ ## handle new glade files
-+ while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"[^>]*>([^<]+)<\/\1>/sg) {
-+ $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
-+ }
-+ while ($input =~ /<atkaction\s+action_name="([^>]*)"\s+description="([^>]+)"\/>/sg) {
-+ $messages{entity_decode_minimal($2)} = [];
-+ }
-+}
-+
-+sub type_scheme {
-+ while ($input =~ /_\(?"((?:[^"\\]+|\\.)*)"\)?/sg) {
-+ $messages{$1} = [];
-+ }
-+}
-+
-+sub msg_write {
-+ for my $message (sort keys %messages) {
-+ print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/;
-+
-+ my @lines = split (/\n/, $message, -1);
-+ for (my $n = 0; $n < @lines; $n++) {
-+ if ($n == 0) {
-+ print OUT "char *s = N_(\"";
-+ } else {
-+ print OUT " \"";
-+ }
-+
-+ print OUT escape($lines[$n]);
-+
-+ if ($n < @lines - 1) {
-+ print OUT "\\n\"\n";
-+ } else {
-+ print OUT "\");\n";
-+ }
-+ }
-+ }
-+}
-+
-diff -urN now-1.0.d4/intltool-merge.in now-1.0.d4-hacked/intltool-merge.in
---- now-1.0.d4/intltool-merge.in 1970-01-01 12:00:00.000000000 +1200
-+++ now-1.0.d4-hacked/intltool-merge.in 2004-06-02 09:22:19.000000000 +1200
-@@ -0,0 +1,908 @@
-+#!@INTLTOOL_PERL@ -w
-+
-+#
-+# The Intltool Message Merger
-+#
-+# Copyright (C) 2000, 2002 Free Software Foundation.
-+# Copyright (C) 2000, 2001 Eazel, Inc
-+#
-+# Intltool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# version 2 published by the Free Software Foundation.
-+#
-+# Intltool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+#
-+# Authors: Maciej Stachowiak <[email protected]>
-+# Kenneth Christiansen <[email protected]>
-+# Darin Adler <[email protected]>
-+#
-+# Proper XML UTF-8'ification written by Cyrille Chepelov <[email protected]>
-+#
-+
-+## Release information
-+my $PROGRAM = "intltool-merge";
-+my $PACKAGE = "intltool";
-+my $VERSION = "0.25";
-+
-+## Loaded modules
-+use strict;
-+use Getopt::Long;
-+use Text::Wrap;
-+
-+## Scalars used by the option stuff
-+my $HELP_ARG = 0;
-+my $VERSION_ARG = 0;
-+my $BA_STYLE_ARG = 0;
-+my $XML_STYLE_ARG = 0;
-+my $KEYS_STYLE_ARG = 0;
-+my $DESKTOP_STYLE_ARG = 0;
-+my $SCHEMAS_STYLE_ARG = 0;
-+my $RFC822DEB_STYLE_ARG = 0;
-+my $QUIET_ARG = 0;
-+my $PASS_THROUGH_ARG = 0;
-+my $UTF8_ARG = 0;
-+my $cache_file;
-+
-+## Handle options
-+GetOptions
-+(
-+ "help" => \$HELP_ARG,
-+ "version" => \$VERSION_ARG,
-+ "quiet|q" => \$QUIET_ARG,
-+ "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility
-+ "ba-style|b" => \$BA_STYLE_ARG,
-+ "xml-style|x" => \$XML_STYLE_ARG,
-+ "keys-style|k" => \$KEYS_STYLE_ARG,
-+ "desktop-style|d" => \$DESKTOP_STYLE_ARG,
-+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
-+ "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
-+ "pass-through|p" => \$PASS_THROUGH_ARG,
-+ "utf8|u" => \$UTF8_ARG,
-+ "cache|c=s" => \$cache_file
-+ ) or &error;
-+
-+my $PO_DIR;
-+my $FILE;
-+my $OUTFILE;
-+
-+my %po_files_by_lang = ();
-+my %translations = ();
-+
-+# Use this instead of \w for XML files to handle more possible characters.
-+my $w = "[-A-Za-z0-9._:]";
-+
-+# XML quoted string contents
-+my $q = "[^\\\"]*";
-+
-+## Check for options.
-+
-+if ($VERSION_ARG)
-+{
-+ &print_version;
-+}
-+elsif ($HELP_ARG)
-+{
-+ &print_help;
-+}
-+elsif ($BA_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &ba_merge_translations;
-+ &finalize;
-+}
-+elsif ($XML_STYLE_ARG && @ARGV > 2)
-+{
-+ &utf8_sanity_check;
-+ &preparation;
-+ &print_message;
-+ &xml_merge_translations;
-+ &finalize;
-+}
-+elsif ($KEYS_STYLE_ARG && @ARGV > 2)
-+{
-+ &utf8_sanity_check;
-+ &preparation;
-+ &print_message;
-+ &keys_merge_translations;
-+ &finalize;
-+}
-+elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &desktop_merge_translations;
-+ &finalize;
-+}
-+elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &schemas_merge_translations;
-+ &finalize;
-+}
-+elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &rfc822deb_merge_translations;
-+ &finalize;
-+}
-+else
-+{
-+ &print_help;
-+}
-+
-+exit;
-+
-+## Sub for printing release information
-+sub print_version
-+{
-+ print "${PROGRAM} (${PACKAGE}) ${VERSION}\n";
-+ print "Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.\n\n";
-+ print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n";
-+ print "Copyright (C) 2000-2001 Eazel, Inc.\n";
-+ print "This is free software; see the source for copying conditions. There is NO\n";
-+ print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-+ exit;
-+}
-+
-+## Sub for printing usage information
-+sub print_help
-+{
-+ print "Usage: ${PROGRAM} [OPTIONS] PO_DIRECTORY FILENAME OUTPUT_FILE\n";
-+ print "Generates an output file that includes translated versions of some attributes,\n";
-+ print "from an untranslated source and a po directory that includes translations.\n\n";
-+ print " -b, --ba-style includes translations in the bonobo-activation style\n";
-+ print " -d, --desktop-style includes translations in the desktop style\n";
-+ print " -k, --keys-style includes translations in the keys style\n";
-+ print " -s, --schemas-style includes translations in the schemas style\n";
-+ print " -r, --rfc822deb-style includes translations in the RFC822 style\n";
-+ print " -x, --xml-style includes translations in the standard xml style\n";
-+ print " -u, --utf8 convert all strings to UTF-8 before merging\n";
-+ print " -p, --pass-through use strings as found in .po files, without\n";
-+ print " conversion (STRONGLY unrecommended with -x)\n";
-+ print " -q, --quiet suppress most messages\n";
-+ print " --help display this help and exit\n";
-+ print " --version output version information and exit\n";
-+ print "\nReport bugs to bugzilla.gnome.org, module intltool, or contact us through \n";
-+ print "<xml-i18n-tools-list\@gnome.org>.\n";
-+ exit;
-+}
-+
-+
-+## Sub for printing error messages
-+sub print_error
-+{
-+ print "Try `${PROGRAM} --help' for more information.\n";
-+ exit;
-+}
-+
-+
-+sub print_message
-+{
-+ print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG;
-+}
-+
-+
-+sub preparation
-+{
-+ $PO_DIR = $ARGV[0];
-+ $FILE = $ARGV[1];
-+ $OUTFILE = $ARGV[2];
-+
-+ &gather_po_files;
-+ &get_translation_database;
-+}
-+
-+# General-purpose code for looking up translations in .po files
-+
-+sub po_file2lang
-+{
-+ my ($tmp) = @_;
-+ $tmp =~ s/^.*\/(.*)\.po$/$1/;
-+ return $tmp;
-+}
-+
-+sub gather_po_files
-+{
-+ for my $po_file (glob "$PO_DIR/*.po") {
-+ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
-+ }
-+}
-+
-+sub get_local_charset
-+{
-+ my ($encoding) = @_;
-+ my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
-+
-+ # seek character encoding aliases in charset.alias (glib)
-+
-+ if (open CHARSET_ALIAS, $alias_file)
-+ {
-+ while (<CHARSET_ALIAS>)
-+ {
-+ next if /^\#/;
-+ return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i)
-+ }
-+
-+ close CHARSET_ALIAS;
-+ }
-+
-+ # if not found, return input string
-+
-+ return $encoding;
-+}
-+
-+sub get_po_encoding
-+{
-+ my ($in_po_file) = @_;
-+ my $encoding = "";
-+
-+ open IN_PO_FILE, $in_po_file or die;
-+ while (<IN_PO_FILE>)
-+ {
-+ ## example: "Content-Type: text/plain; charset=ISO-8859-1\n"
-+ if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/)
-+ {
-+ $encoding = $1;
-+ last;
-+ }
-+ }
-+ close IN_PO_FILE;
-+
-+ if (!$encoding)
-+ {
-+ print "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n";
-+ $encoding = "ISO-8859-1";
-+ }
-+
-+ $encoding = get_local_charset($encoding);
-+
-+ return $encoding
-+}
-+
-+sub utf8_sanity_check
-+{
-+ if (!$UTF8_ARG)
-+ {
-+ if (!$PASS_THROUGH_ARG)
-+ {
-+ $PASS_THROUGH_ARG="1";
-+ }
-+ }
-+}
-+
-+sub get_translation_database
-+{
-+ if ($cache_file) {
-+ &get_cached_translation_database;
-+ } else {
-+ &create_translation_database;
-+ }
-+}
-+
-+sub get_newest_po_age
-+{
-+ my $newest_age;
-+
-+ foreach my $file (values %po_files_by_lang)
-+ {
-+ my $file_age = -M $file;
-+ $newest_age = $file_age if !$newest_age || $file_age < $newest_age;
-+ }
-+
-+ return $newest_age;
-+}
-+
-+sub create_cache
-+{
-+ print "Generating and caching the translation database\n" unless $QUIET_ARG;
-+
-+ &create_translation_database;
-+
-+ open CACHE, ">$cache_file" || die;
-+ print CACHE join "\x01", %translations;
-+ close CACHE;
-+}
-+
-+sub load_cache
-+{
-+ print "Found cached translation database\n" unless $QUIET_ARG;
-+
-+ my $contents;
-+ open CACHE, "<$cache_file" || die;
-+ {
-+ local $/;
-+ $contents = <CACHE>;
-+ }
-+ close CACHE;
-+ %translations = split "\x01", $contents;
-+}
-+
-+sub get_cached_translation_database
-+{
-+ my $cache_file_age = -M $cache_file;
-+ if (defined $cache_file_age)
-+ {
-+ if ($cache_file_age <= &get_newest_po_age)
-+ {
-+ &load_cache;
-+ return;
-+ }
-+ print "Found too-old cached translation database\n" unless $QUIET_ARG;
-+ }
-+
-+ &create_cache;
-+}
-+
-+sub create_translation_database
-+{
-+ for my $lang (keys %po_files_by_lang)
-+ {
-+ my $po_file = $po_files_by_lang{$lang};
-+
-+ if ($UTF8_ARG)
-+ {
-+ my $encoding = get_po_encoding ($po_file);
-+
-+ if (lc $encoding eq "utf-8")
-+ {
-+ open PO_FILE, "<$po_file";
-+ }
-+ else
-+ {
-+ my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv";
-+ open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
-+ }
-+ }
-+ else
-+ {
-+ open PO_FILE, "<$po_file";
-+ }
-+
-+ my $nextfuzzy = 0;
-+ my $inmsgid = 0;
-+ my $inmsgstr = 0;
-+ my $msgid = "";
-+ my $msgstr = "";
-+
-+ while (<PO_FILE>)
-+ {
-+ $nextfuzzy = 1 if /^#, fuzzy/;
-+
-+ if (/^msgid "((\\.|[^\\])*)"/ )
-+ {
-+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
-+ $msgid = "";
-+ $msgstr = "";
-+
-+ if ($nextfuzzy) {
-+ $inmsgid = 0;
-+ } else {
-+ $msgid = unescape_po_string($1);
-+ $inmsgid = 1;
-+ }
-+ $inmsgstr = 0;
-+ $nextfuzzy = 0;
-+ }
-+
-+ if (/^msgstr "((\\.|[^\\])*)"/)
-+ {
-+ $msgstr = unescape_po_string($1);
-+ $inmsgstr = 1;
-+ $inmsgid = 0;
-+ }
-+
-+ if (/^"((\\.|[^\\])*)"/)
-+ {
-+ $msgid .= unescape_po_string($1) if $inmsgid;
-+ $msgstr .= unescape_po_string($1) if $inmsgstr;
-+ }
-+ }
-+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
-+ }
-+}
-+
-+sub finalize
-+{
-+}
-+
-+sub unescape_one_sequence
-+{
-+ my ($sequence) = @_;
-+
-+ return "\\" if $sequence eq "\\\\";
-+ return "\"" if $sequence eq "\\\"";
-+ return "\n" if $sequence eq "\\n";
-+
-+ # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal),
-+ # \xXX (hex) and has a comment saying they want to handle \u and \U.
-+
-+ return $sequence;
-+}
-+
-+sub unescape_po_string
-+{
-+ my ($string) = @_;
-+
-+ $string =~ s/(\\.)/unescape_one_sequence($1)/eg;
-+
-+ return $string;
-+}
-+
-+## NOTE: deal with < - < but not > - > because it seems its ok to have
-+## > in the entity. For further info please look at #84738.
-+sub entity_decode
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/&/&/g;
-+ s/</</g;
-+
-+ return $_;
-+}
-+
-+sub entity_encode
-+{
-+ my ($pre_encoded) = @_;
-+
-+ my @list_of_chars = unpack ('C*', $pre_encoded);
-+
-+ if ($PASS_THROUGH_ARG)
-+ {
-+ return join ('', map (&entity_encode_int_even_high_bit, @list_of_chars));
-+ }
-+ else
-+ {
-+ return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
-+ }
-+}
-+
-+sub entity_encode_int_minimalist
-+{
-+ return """ if $_ == 34;
-+ return "&" if $_ == 38;
-+ return "'" if $_ == 39;
-+ return "<" if $_ == 60;
-+ return chr $_;
-+}
-+
-+sub entity_encode_int_even_high_bit
-+{
-+ if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60)
-+ {
-+ # the ($_ > 127) should probably be removed
-+ return "&#" . $_ . ";";
-+ }
-+ else
-+ {
-+ return chr $_;
-+ }
-+}
-+
-+sub entity_encoded_translation
-+{
-+ my ($lang, $string) = @_;
-+
-+ my $translation = $translations{$lang, $string};
-+ return $string if !$translation;
-+ return entity_encode ($translation);
-+}
-+
-+## XML (bonobo-activation specific) merge code
-+
-+sub ba_merge_translations
-+{
-+ my $source;
-+
-+ {
-+ local $/; # slurp mode
-+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
-+ $source = <INPUT>;
-+ close INPUT;
-+ }
-+
-+ open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!";
-+
-+ while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s)
-+ {
-+ print OUTPUT $1;
-+
-+ my $node = $2 . "\n";
-+
-+ my @strings = ();
-+ $_ = $node;
-+ while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) {
-+ push @strings, entity_decode($3);
-+ }
-+ print OUTPUT;
-+
-+ my %langs;
-+ for my $string (@strings)
-+ {
-+ for my $lang (keys %po_files_by_lang)
-+ {
-+ $langs{$lang} = 1 if $translations{$lang, $string};
-+ }
-+ }
-+
-+ for my $lang (sort keys %langs)
-+ {
-+ $_ = $node;
-+ s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s;
-+ s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg;
-+ print OUTPUT;
-+ }
-+ }
-+
-+ print OUTPUT $source;
-+
-+ close OUTPUT;
-+}
-+
-+
-+## XML (non-bonobo-activation) merge code
-+
-+sub xml_merge_translations
-+{
-+ my $source;
-+
-+ {
-+ local $/; # slurp mode
-+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
-+ $source = <INPUT>;
-+ close INPUT;
-+ }
-+
-+ open OUTPUT, ">$OUTFILE" or die;
-+
-+ # FIXME: support attribute translations
-+
-+ # Empty nodes never need translation, so unmark all of them.
-+ # For example, <_foo/> is just replaced by <foo/>.
-+ $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-+
-+ # Support for <_foo>blah</_foo> style translations.
-+ while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s)
-+ {
-+ print OUTPUT $1;
-+
-+ my $spaces = $2;
-+ my $tag = $3;
-+ my $string = $4;
-+
-+ print OUTPUT "$spaces<$tag>$string</$tag>\n";
-+
-+ $string =~ s/\s+/ /g;
-+ $string =~ s/^ //;
-+ $string =~ s/ $//;
-+ $string = entity_decode($string);
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $translation = $translations{$lang, $string};
-+ next if !$translation;
-+ $translation = entity_encode($translation);
-+ print OUTPUT "$spaces<$tag xml:lang=\"$lang\">$translation</$tag>\n";
-+ }
-+ }
-+
-+ print OUTPUT $source;
-+
-+ close OUTPUT;
-+}
-+
-+sub keys_merge_translations
-+{
-+ open INPUT, "<${FILE}" or die;
-+ open OUTPUT, ">${OUTFILE}" or die;
-+
-+ while (<INPUT>)
-+ {
-+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
-+ {
-+ my $string = $3;
-+
-+ print OUTPUT;
-+
-+ my $non_translated_line = $_;
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $translation = $translations{$lang, $string};
-+ next if !$translation;
-+
-+ $_ = $non_translated_line;
-+ s/(\w+)=.*/[$lang]$1=$translation/;
-+ print OUTPUT;
-+ }
-+ }
-+ else
-+ {
-+ print OUTPUT;
-+ }
-+ }
-+
-+ close OUTPUT;
-+ close INPUT;
-+}
-+
-+sub desktop_merge_translations
-+{
-+ open INPUT, "<${FILE}" or die;
-+ open OUTPUT, ">${OUTFILE}" or die;
-+
-+ while (<INPUT>)
-+ {
-+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
-+ {
-+ my $string = $3;
-+
-+ print OUTPUT;
-+
-+ my $non_translated_line = $_;
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $translation = $translations{$lang, $string};
-+ next if !$translation;
-+
-+ $_ = $non_translated_line;
-+ s/(\w+)=.*/${1}[$lang]=$translation/;
-+ print OUTPUT;
-+ }
-+ }
-+ else
-+ {
-+ print OUTPUT;
-+ }
-+ }
-+
-+ close OUTPUT;
-+ close INPUT;
-+}
-+
-+sub schemas_merge_translations
-+{
-+ my $source;
-+
-+ {
-+ local $/; # slurp mode
-+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
-+ $source = <INPUT>;
-+ close INPUT;
-+ }
-+
-+ open OUTPUT, ">$OUTFILE" or die;
-+
-+ # FIXME: support attribute translations
-+
-+ # Empty nodes never need translation, so unmark all of them.
-+ # For example, <_foo/> is just replaced by <foo/>.
-+ $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-+
-+ while ($source =~ s/
-+ (.*?)
-+ (\s+)(<locale\ name="C">(\s*)
-+ (<default>\s*(.*?)\s*<\/default>)?(\s*)
-+ (<short>\s*(.*?)\s*<\/short>)?(\s*)
-+ (<long>\s*(.*?)\s*<\/long>)?(\s*)
-+ <\/locale>)
-+ //sx)
-+ {
-+ print OUTPUT $1;
-+
-+ my $locale_start_spaces = $2 ? $2 : '';
-+ my $default_spaces = $4 ? $4 : '';
-+ my $short_spaces = $7 ? $7 : '';
-+ my $long_spaces = $10 ? $10 : '';
-+ my $locale_end_spaces = $13 ? $13 : '';
-+ my $c_default_block = $3 ? $3 : '';
-+ my $default_string = $6 ? $6 : '';
-+ my $short_string = $9 ? $9 : '';
-+ my $long_string = $12 ? $12 : '';
-+
-+ $c_default_block =~ s/default>\[.*?\]/default>/s;
-+
-+ print OUTPUT "$locale_start_spaces$c_default_block";
-+
-+ $default_string =~ s/\s+/ /g;
-+ $default_string = entity_decode($default_string);
-+ $short_string =~ s/\s+/ /g;
-+ $short_string = entity_decode($short_string);
-+ $long_string =~ s/\s+/ /g;
-+ $long_string = entity_decode($long_string);
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $default_translation = $translations{$lang, $default_string};
-+ my $short_translation = $translations{$lang, $short_string};
-+ my $long_translation = $translations{$lang, $long_string};
-+
-+ next if (!$default_translation && !$short_translation &&
-+ !$long_translation);
-+
-+ print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
-+
-+ print OUTPUT "$default_spaces";
-+
-+ if ($default_translation)
-+ {
-+ $default_translation = entity_encode($default_translation);
-+ print OUTPUT "<default>$default_translation</default>";
-+ }
-+
-+ print OUTPUT "$short_spaces";
-+
-+ if ($short_translation)
-+ {
-+ $short_translation = entity_encode($short_translation);
-+ print OUTPUT "<short>$short_translation</short>";
-+ }
-+
-+ print OUTPUT "$long_spaces";
-+
-+ if ($long_translation)
-+ {
-+ $long_translation = entity_encode($long_translation);
-+ print OUTPUT "<long>$long_translation</long>";
-+ }
-+
-+ print OUTPUT "$locale_end_spaces</locale>";
-+ }
-+ }
-+
-+ print OUTPUT $source;
-+
-+ close OUTPUT;
-+}
-+
-+sub rfc822deb_merge_translations
-+{
-+ my $source;
-+
-+ $Text::Wrap::huge = 'overflow';
-+
-+ {
-+ local $/; # slurp mode
-+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
-+ $source = <INPUT>;
-+ close INPUT;
-+ }
-+
-+ open OUTPUT, ">${OUTFILE}" or die;
-+
-+ while ($source =~ /(^|\n+)(_)?([^:_\n]+)(:\s*)(.*?)(?=\n[\S\n]|$)/sg)
-+ {
-+ my $sep = $1;
-+ my $non_translated_line = $3.$4;
-+ my $string = $5;
-+ my $is_translatable = defined($2);
-+ # Remove [] dummy strings
-+ $string =~ s/\[\s[^\[\]]*\]$//;
-+ $non_translated_line .= $string;
-+
-+ print OUTPUT $sep.$non_translated_line;
-+
-+ if ($is_translatable)
-+ {
-+ my @str_list = rfc822deb_split($string);
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $is_translated = 1;
-+ my $str_translated = '';
-+ my $first = 1;
-+
-+ for my $str (@str_list)
-+ {
-+ my $translation = $translations{$lang, $str};
-+
-+ if (!$translation)
-+ {
-+ $is_translated = 0;
-+ last;
-+ }
-+
-+ # $translation may also contain [] dummy
-+ # strings, mostly to indicate an empty string
-+ $translation =~ s/\[\s[^\[\]]*\]$//;
-+
-+ if ($first)
-+ {
-+ $str_translated .=
-+ Text::Tabs::expand($translation) .
-+ "\n";
-+ }
-+ else
-+ {
-+ $str_translated .= Text::Tabs::expand(
-+ Text::Wrap::wrap(' ', ' ', $translation)) .
-+ "\n .\n";
-+ }
-+ $first = 0;
-+
-+ # To fix some problems with Text::Wrap::wrap
-+ $str_translated =~ s/(\n )+\n/\n .\n/g;
-+ }
-+ next unless $is_translated;
-+
-+ $str_translated =~ s/\n \.\n$//;
-+ $str_translated =~ s/\s+$//;
-+
-+ $_ = $non_translated_line;
-+ s/^(\w+):\s*.*/$sep${1}-$lang: $str_translated/s;
-+ print OUTPUT;
-+ }
-+ }
-+ }
-+ print OUTPUT "\n";
-+
-+ close OUTPUT;
-+ close INPUT;
-+}
-+
-+sub rfc822deb_split
-+{
-+ # Debian defines a special way to deal with rfc822-style files:
-+ # when a value contain newlines, it consists of
-+ # 1. a short form (first line)
-+ # 2. a long description, all lines begin with a space,
-+ # and paragraphs are separated by a single dot on a line
-+ # This routine returns an array of all paragraphs, and reformat
-+ # them.
-+ my $text = shift;
-+ $text =~ s/^ //mg;
-+ return ($text) if $text !~ /\n/;
-+
-+ $text =~ s/([^\n]*)\n//;
-+ my @list = ($1);
-+ my $str = '';
-+
-+ for my $line (split (/\n/, $text))
-+ {
-+ chomp $line;
-+ $line =~ /\s+$/;
-+
-+ if ($line =~ /^\.$/)
-+ {
-+ # New paragraph
-+ $str =~ s/\s*$//;
-+ push(@list, $str);
-+ $str = '';
-+ }
-+ elsif ($line =~ /^\s/)
-+ {
-+ # Line which must not be reformatted
-+ $str .= "\n" if length ($str) && $str !~ /\n$/;
-+ $str .= $line."\n";
-+ }
-+ else
-+ {
-+ # Continuation line, remove newline
-+ $str .= " " if length ($str) && $str !~ /[\n ]$/;
-+ $str .= $line;
-+ }
-+ }
-+
-+ $str =~ s/\s*$//;
-+ push(@list, $str) if length ($str);
-+
-+ return @list;
-+}
-+
-diff -urN now-1.0.d4/intltool-update.in now-1.0.d4-hacked/intltool-update.in
---- now-1.0.d4/intltool-update.in 1970-01-01 12:00:00.000000000 +1200
-+++ now-1.0.d4-hacked/intltool-update.in 2004-06-02 09:22:19.000000000 +1200
-@@ -0,0 +1,642 @@
-+#!@INTLTOOL_PERL@ -w
-+
-+#
-+# The Intltool Message Updater
-+#
-+# Copyright (C) 2000-2002 Free Software Foundation.
-+#
-+# Intltool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# version 2 published by the Free Software Foundation.
-+#
-+# Intltool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+#
-+# Authors: Kenneth Christiansen <[email protected]>
-+# Maciej Stachowiak
-+# Darin Adler <[email protected]>
-+
-+## Release information
-+my $PROGRAM = "intltool-update";
-+my $VERSION = "0.25";
-+my $PACKAGE = "intltool";
-+
-+## Loaded modules
-+use strict;
-+use Getopt::Long;
-+use Cwd;
-+use File::Copy;
-+use File::Find;
-+
-+## Scalars used by the option stuff
-+my $HELP_ARG = 0;
-+my $VERSION_ARG = 0;
-+my $DIST_ARG = 0;
-+my $POT_ARG = 0;
-+my $HEADERS_ARG = 0;
-+my $MAINTAIN_ARG = 0;
-+my $REPORT_ARG = 0;
-+my $VERBOSE = 0;
-+my $GETTEXT_PACKAGE = "";
-+
-+my @languages;
-+my %po_files_by_lang = ();
-+
-+# Regular expressions to categorize file types.
-+# FIXME: Please check if the following is correct
-+
-+my $xml_extension =
-+"xml(\.in)*|". # .in is not required
-+"ui|".
-+"glade2?(\.in)*|". # .in is not required
-+"scm(\.in)*|". # .in is not required
-+"oaf(\.in)+|".
-+"etspec|".
-+"sheet(\.in)+|".
-+"schemas(\.in)+|".
-+"pong(\.in)+";
-+
-+my $ini_extension =
-+"desktop(\.in)+|".
-+"caves(\.in)+|".
-+"directory(\.in)+|".
-+"soundlist(\.in)+|".
-+"keys(\.in)+|".
-+"theme(\.in)+|".
-+"server(\.in)+";
-+
-+## Always print as the first thing
-+$| = 1;
-+
-+## Handle options
-+GetOptions
-+(
-+ "help" => \$HELP_ARG,
-+ "version" => \$VERSION_ARG,
-+ "dist|d" => \$DIST_ARG,
-+ "pot|p" => \$POT_ARG,
-+ "headers|s" => \$HEADERS_ARG,
-+ "maintain|m" => \$MAINTAIN_ARG,
-+ "report|r" => \$REPORT_ARG,
-+ "verbose|x" => \$VERBOSE,
-+ "gettext-package|g=s" => \$GETTEXT_PACKAGE,
-+ ) or &print_error_invalid_option;
-+
-+&print_help if $HELP_ARG;
-+&print_version if $VERSION_ARG;
-+
-+my $arg_count = ($DIST_ARG > 0)
-+ + ($POT_ARG > 0)
-+ + ($HEADERS_ARG > 0)
-+ + ($MAINTAIN_ARG > 0)
-+ + ($REPORT_ARG > 0);
-+&print_help if $arg_count > 1;
-+
-+# --version and --help don't require a module name
-+my $MODULE = $GETTEXT_PACKAGE || &find_package_name;
-+
-+if ($DIST_ARG) {
-+ if ($ARGV[0] =~ /^[a-z]/){
-+ &update_po_file ($ARGV[0]);
-+ &print_status ($ARGV[0]);
-+ } else {
-+ &print_help;
-+ }
-+} elsif ($POT_ARG) {
-+ &generate_headers;
-+ &generate_po_template;
-+} elsif ($HEADERS_ARG) {
-+ &generate_headers;
-+} elsif ($MAINTAIN_ARG) {
-+ &find_leftout_files;
-+} elsif ($REPORT_ARG) {
-+ &print_report;
-+} else {
-+ if ($ARGV[0] =~ /^[a-z]/) {
-+ &main ($ARGV[0]);
-+ } else {
-+ &print_help;
-+ }
-+}
-+
-+exit;
-+
-+#########
-+
-+sub print_version
-+{
-+ ## Print version information
-+ print "${PROGRAM} (${PACKAGE}) $VERSION\n";
-+ print "Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.\n\n";
-+ print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n";
-+ print "This is free software; see the source for copying conditions. There is NO\n";
-+ print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-+ exit;
-+}
-+
-+sub print_help
-+{
-+ ## Print usage information
-+ print "Usage: ${PROGRAM} [OPTIONS] ...LANGCODE\n";
-+ print "Updates PO template files and merge them with the translations.\n\n";
-+ print " -p, --pot generate the PO template only\n";
-+ print " -s, --headers generate the header files in POTFILES.in\n";
-+ print " -m, --maintain search for left out files from POTFILES.in\n";
-+ print " -r, --report display a status report for the module.\n";
-+ print " -x, --verbose display lots of feedback\n";
-+ print " --help display this help and exit\n";
-+ print " --version output version information and exit\n";
-+ print "\nExamples of use:\n";
-+ print "${PROGRAM} --pot just creates a new PO template from the source\n";
-+ print "${PROGRAM} da created new PO template and updated the da.po file\n\n";
-+ print "Report bugs to bugzilla.gnome.org, module 'intltool'.\n";
-+ exit;
-+}
-+
-+sub main
-+{
-+ my ($lang) = @_;
-+
-+ ## Report error if the language file supplied
-+ ## to the command line is non-existent
-+ &print_error_not_existing("$lang.po") if ! -s "$lang.po";
-+
-+ print "Working, please wait..." unless $VERBOSE;
-+ &generate_headers;
-+ &generate_po_template;
-+ &update_po_file ($lang);
-+ &print_status ($lang);
-+}
-+
-+sub determine_type ($)
-+{
-+ my $type = $_;
-+ my $gettext_type;
-+
-+ # FIXME: Use $xml_extentions, and maybe do all this even nicer
-+ my $xml_regex =
-+ "(?:xml(\.in)*|ui|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|".
-+ "pong(?:\.in)+|etspec|schemas(?:\.in)+)";
-+ my $ini_regex =
-+ "(?:desktop(?:\.in)+|theme(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|".
-+ "soundlist(?:\.in)+)";
-+
-+ if ($type =~ /\[type: gettext\/([^\]].*)]/) {
-+ $gettext_type=$1;
-+ }
-+ elsif ($type =~ /schemas(\.in)+$/) {
-+ $gettext_type="schemas";
-+ }
-+ elsif ($type =~ /$xml_regex$/) {
-+ $gettext_type="xml";
-+ }
-+ elsif ($type =~ /glade2?(\.in)*$/) {
-+ $gettext_type="glade";
-+ }
-+ elsif ($type =~ /$ini_regex$/) {
-+ $gettext_type="ini";
-+ }
-+ elsif ($type =~ /scm(\.in)*$/) {
-+ $gettext_type="scheme";
-+ }
-+ elsif ($type =~ /keys(\.in)+$/) {
-+ $gettext_type="keys";
-+ }
-+ else { $gettext_type=""; }
-+
-+ return "gettext\/$gettext_type";
-+}
-+
-+sub find_leftout_files
-+{
-+ my (@buf_i18n_plain,
-+ @buf_i18n_xml,
-+ @buf_i18n_xml_unmarked,
-+ @buf_i18n_ini,
-+ @buf_potfiles,
-+ @buf_potfiles_ignore,
-+ @buf_allfiles,
-+ @buf_allfiles_sorted,
-+ @buf_potfiles_sorted
-+ );
-+
-+ ## Search and find all translatable files
-+ find sub {
-+ push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/
-+ }, "..";
-+ find sub {
-+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/
-+ }, "..";
-+ find sub {
-+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/
-+ }, "..";
-+ find sub {
-+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/
-+ }, "..";
-+
-+
-+ open POTFILES, "POTFILES.in" or die "$PROGRAM: there's no POTFILES.in!\n";
-+
-+ @buf_potfiles = grep /^[^#]/, <POTFILES>;
-+ foreach (@buf_potfiles) {
-+ s/^\[.*]\s*//;
-+ }
-+
-+ print "Searching for missing translatable files...\n" if $VERBOSE;
-+
-+ ## Check if we should ignore some found files, when
-+ ## comparing with POTFILES.in
-+ foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") {
-+ if (-s $ignore) {
-+ open FILE, $ignore;
-+ while (<FILE>) {
-+ if (/^[^#]/){
-+ push @buf_potfiles_ignore, $_;
-+ }
-+ }
-+ print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-+ @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
-+ }
-+ }
-+
-+ foreach my $file (@buf_i18n_plain)
-+ {
-+ my $in_comment = 0;
-+ my $in_macro = 0;
-+
-+ open FILE, "<$file";
-+ while (<FILE>)
-+ {
-+ # Handle continued multi-line comment.
-+ if ($in_comment)
-+ {
-+ next unless s-.*\*/--;
-+ $in_comment = 0;
-+ }
-+
-+ # Handle continued macro.
-+ if ($in_macro)
-+ {
-+ $in_macro = 0 unless /\\$/;
-+ next;
-+ }
-+
-+ # Handle start of macro (or any preprocessor directive).
-+ if (/^\s*\#/)
-+ {
-+ $in_macro = 1 if /^([^\\]|\\.)*\\$/;
-+ next;
-+ }
-+
-+ # Handle comments and quoted text.
-+ while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
-+ {
-+ my $match = $1;
-+ if ($match eq "/*")
-+ {
-+ if (!s-/\*.*?\*/--)
-+ {
-+ s-/\*.*--;
-+ $in_comment = 1;
-+ }
-+ }
-+ elsif ($match eq "//")
-+ {
-+ s-//.*--;
-+ }
-+ else # ' or "
-+ {
-+ if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
-+ {
-+ warn "mismatched quotes at line $. in $file\n";
-+ s-$match.*--;
-+ }
-+ }
-+ }
-+
-+
-+ if (/_\(QUOTEDTEXT/)
-+ {
-+ ## Remove the first 3 chars and add newline
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ last;
-+ }
-+ }
-+ close FILE;
-+ }
-+
-+ foreach my $file (@buf_i18n_xml) {
-+ open FILE, "<$file";
-+ while (<FILE>) {
-+ if (/\s_(.*)=\"/ || /translatable=\"yes\"/){
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ last;
-+ }
-+ }
-+ }
-+
-+ foreach my $file (@buf_i18n_ini){
-+ open FILE, "<$file";
-+ while (<FILE>) {
-+ if (/_(.*)=/){
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ last;
-+ }
-+ }
-+ }
-+
-+ foreach my $file (@buf_i18n_xml_unmarked){
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ }
-+
-+
-+ @buf_allfiles_sorted = sort (@buf_allfiles);
-+ @buf_potfiles_sorted = sort (@buf_potfiles);
-+
-+ my %in2;
-+ foreach (@buf_potfiles_sorted) {
-+ $in2{$_} = 1;
-+ }
-+
-+ my @result;
-+
-+ foreach (@buf_allfiles_sorted){
-+ if (!exists($in2{$_})){
-+ push @result, $_
-+ }
-+ }
-+
-+ ## Save file with information about the files missing
-+ ## if any, and give information about this procedure.
-+ if (@result) {
-+ print "\n" if $VERBOSE;
-+ open OUT, ">missing";
-+ print OUT @result;
-+ print "The following files contain translations and are currently not in use. Please\n";
-+ print "consider adding these to the POTFILES.in file, located in the po/ directory.\n\n";
-+ print @result, "\n";
-+ print "If some of these files are left out on purpose then please add them to\n";
-+ print "POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list\n";
-+ print "of left out files has been written in the current directory.\n";
-+ }
-+
-+ ## If there is nothing to complain about, notify the user
-+ else {
-+ print "\nAll files containing translations are present in POTFILES.in.\n";
-+ }
-+}
-+
-+sub print_error_invalid_option
-+{
-+ ## Handle invalid arguments
-+ print "Try `${PROGRAM} --help' for more information.\n";
-+ exit 1;
-+}
-+
-+sub generate_headers
-+{
-+ my $EXTRACT = `which intltool-extract 2>/dev/null`;
-+ chomp $EXTRACT;
-+
-+ $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
-+
-+ ## Generate the .h header files, so we can allow glade and
-+ ## xml translation support
-+ if (! -s $EXTRACT)
-+ {
-+ print "\n *** The intltool-extract script wasn't found!"
-+ ."\n *** Without it, intltool-update can not generate files.\n";
-+ exit;
-+ }
-+ else
-+ {
-+ open FILE, "<POTFILES.in";
-+ while (<FILE>) {
-+ chomp;
-+
-+ ## Find xml files in POTFILES.in and generate the
-+ ## files with help from the extract script
-+
-+ my $gettext_type= &determine_type ($1);
-+
-+ if (/\.($xml_extension|$ini_extension)$/ || /^\[/){
-+ $_ =~ s/^\[[^\[].*]\s*//;
-+ my $filename = "../$_";
-+
-+ if ($VERBOSE){
-+ system($EXTRACT, "--update", "--type=$gettext_type", $filename);
-+ } else {
-+ system($EXTRACT, "--update", "--type=$gettext_type", "--quiet", $filename);
-+ }
-+ }
-+ }
-+ close FILE;
-+ }
-+}
-+
-+sub generate_po_template
-+{
-+ ## Generate the potfiles from the POTFILES.in file
-+
-+ print "Building the $MODULE.pot...\n" if $VERBOSE;
-+
-+ move ("POTFILES.in", "POTFILES.in.old");
-+
-+ open INFILE, "<POTFILES.in.old";
-+ open OUTFILE, ">POTFILES.in";
-+ while (<INFILE>) {
-+ chomp;
-+ if (/\.($xml_extension|$ini_extension)$/ || /^\[/) {
-+ s/^\[.*]\s*//;
-+ print OUTFILE "$_.h\n";
-+ } else {
-+ print OUTFILE "$_\n";
-+ }
-+ }
-+ close OUTFILE;
-+ close INFILE;
-+
-+ system ("xgettext", "--default-domain\=$MODULE",
-+ "--directory\=\.\.",
-+ "--add-comments",
-+ "--keyword\=\_",
-+ "--keyword\=N\_",
-+ "--keyword\=U\_",
-+ "--files-from\=\.\/POTFILES\.in");
-+
-+ move ("POTFILES.in.old", "POTFILES.in");
-+
-+ print "Removing generated header (.h) files..." if $VERBOSE;
-+
-+ open FILE, "<POTFILES.in";
-+
-+ while (<FILE>)
-+ {
-+ chomp;
-+ unlink "../$_.h" if /\.($xml_extension|$ini_extension)$/;
-+ }
-+
-+ close FILE;
-+ print "done\n" if $VERBOSE;
-+
-+ if (!-e "$MODULE.po") {
-+ print "WARNING: It seems that none of the files in POTFILES.in ".
-+ "contain marked strings\n";
-+ exit (1);
-+ }
-+
-+ system ("rm", "-f", "$MODULE.pot");
-+ move ("$MODULE.po", "$MODULE.pot") or die "$PROGRAM: couldn't move $MODULE.po to $MODULE.pot.\n";
-+
-+ print "Wrote $MODULE.pot\n" if $VERBOSE;
-+}
-+
-+sub update_po_file
-+{
-+ my ($lang) = @_;
-+
-+ print "Merging $lang.po with $MODULE.pot..." if $VERBOSE;
-+
-+ copy ("$lang.po", "$lang.po.old") || die "copy failed: $!";
-+
-+ # Perform merge, remove backup file and the "messages" trash file
-+ # generated by gettext
-+ system ("msgmerge", "$lang.po.old", "$MODULE.pot", "-o", "$lang.po");
-+ unlink "$lang.po.old";
-+ unlink "messages";
-+}
-+
-+sub print_error_not_existing
-+{
-+ my ($file) = @_;
-+
-+ ## Report error if supplied language file is non-existing
-+ print "$PROGRAM: $file does not exist!\n";
-+ print "Try '$PROGRAM --help' for more information.\n";
-+ exit;
-+}
-+
-+sub gather_po_files
-+{
-+ my @po_files = glob ("./*.po");
-+
-+ @languages = map (&po_file2lang, @po_files);
-+
-+ foreach my $lang (@languages) {
-+ $po_files_by_lang{$lang} = shift (@po_files);
-+ }
-+}
-+
-+sub po_file2lang ($)
-+{
-+ my $tmp = $_;
-+ $tmp =~ s/^.*\/(.*)\.po$/$1/;
-+ return $tmp;
-+}
-+
-+sub print_status
-+{
-+ my ($lang) = @_;
-+
-+ system ("msgfmt", "--statistics", "$lang.po");
-+ print "\n";
-+}
-+
-+sub print_report
-+{
-+ &generate_headers;
-+ &generate_po_template;
-+ &gather_po_files;
-+
-+ foreach my $lang (@languages) {
-+ print "$lang: ";
-+ &update_po_file ($lang);
-+ }
-+
-+ print "\n\n * Current translation support in $MODULE \n\n";
-+
-+ foreach my $lang (@languages){
-+ print "$lang: ";
-+ system ("msgfmt", "--statistics", "$lang.po");
-+ }
-+}
-+
-+sub find_package_name
-+{
-+ my $base_dirname = getcwd();
-+ $base_dirname =~ s@.*/@@;
-+
-+ my ($conf_in, $src_dir);
-+
-+ if ($base_dirname =~ /^po(-.+)?$/) {
-+ if (-f "../configure.in") {
-+ $conf_in = "../configure.in";
-+ } elsif (-f "../configure.ac") {
-+ $conf_in = "../configure.ac";
-+ } else {
-+ my $makefile_source;
-+ local (*IN);
-+ open IN, "<Makefile" || die "can't open Makefile: $!";
-+
-+ while (<IN>) {
-+ if (/^top_srcdir[ \t]*=/) {
-+ $src_dir = $_;
-+ # print "${src_dir}\n";
-+
-+ $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
-+ # print "${src_dir}\n";
-+ chomp $src_dir;
-+ $conf_in = "$src_dir" . "/configure.in" . "\n";
-+ last;
-+ }
-+ }
-+ $conf_in || die "Cannot find top_srcdir in Makefile."
-+ }
-+
-+ my %varhash = ();
-+ my $conf_source; {
-+ local (*IN);
-+ open (IN, "<$conf_in") || die "can't open $conf_in: $!";
-+ while (<IN>) {
-+ if (/^(\w+)=(\S+)/) { $varhash{$1} = $2 };
-+ }
-+ seek (IN, 0, 0);
-+ local $/; # slurp mode
-+ $conf_source = <IN>;
-+ }
-+
-+ my $name = "";
-+ $name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m;
-+ if ($conf_source =~ /^AC_INIT\([\s\[]*([^,\)\s\]]+)\]?\s*,/m) {
-+ $name = $1;
-+ $varhash{"AC_PACKAGE_NAME"} = $1;
-+ }
-+ $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\s\]]+)/m;
-+
-+ $name = "\$AC_PACKAGE_NAME" if "$name" eq "AC_PACKAGE_NAME";
-+
-+ my $oldname = "";
-+ while (($name =~ /[\$](\S+)/) && ("$oldname" ne "$name")) {
-+ $oldname = $name;
-+ if (exists $varhash{$1}) {
-+ $name =~ s/[\$](\S+)/$varhash{$1}/;
-+ }
-+ }
-+ return $name if $name;
-+ }
-+
-+ print "$PROGRAM: Unable to determine package name.\n" .
-+ "Make sure to run this script inside the po directory.\n";
-+ exit;
-+}
-diff -urN now-1.0.d4/Makefile.am now-1.0.d4-hacked/Makefile.am
---- now-1.0.d4/Makefile.am 2003-07-26 01:27:05.000000000 +1200
-+++ now-1.0.d4-hacked/Makefile.am 2004-06-02 09:22:19.000000000 +1200
-@@ -1,5 +1,5 @@
-
--SUBDIRS = config src icons
-+SUBDIRS = config src icons po help
-
- EXTRA_DIST = \
- intltool-extract.in \
-diff -urN now-1.0.d4/po/POTFILES.in now-1.0.d4-hacked/po/POTFILES.in
---- now-1.0.d4/po/POTFILES.in 2003-06-23 00:34:11.000000000 +1200
-+++ now-1.0.d4-hacked/po/POTFILES.in 2004-06-02 09:22:19.000000000 +1200
-@@ -2,5 +2,41 @@
- # Please keep this file sorted alphabetically.
- src/applet/GNOME_Panel_NowApplet.server.in.in
- src/applet/GNOME_Panel_NowApplet.xml
-+src/applet/now-applet.c
-+src/applet/now-prefs.c
-+src/applet/now-window.c
-+src/cli-view.c
-+src/cua/cua-cache.c
-+src/cua/cua-cmd.c
-+src/cua/cua-comp.c
-+src/cua/cua-day.c
-+src/cua/cua-ds.c
-+src/cua/cua-error.c
-+src/cua/cua-order.c
-+src/cua/cua-time.c
-+src/cua/cua-util.c
-+src/cua/cua-week.c
-+src/cua/cua.c
-+src/gui/cal-bin-event.c
-+src/gui/cal-bin.c
-+src/gui/cal-box.c
-+src/gui/cal-date-view.c
-+src/gui/cal-day-comp-view.c
-+src/gui/cal-day-field.c
-+src/gui/cal-day-summ-comp.c
-+src/gui/cal-day-summ-view.c
-+src/gui/cal-day-view.c
-+src/gui/cal-i18n.c
-+src/gui/cal-week-day-view.c
-+src/gui/cal-week-nav-view.c
-+src/gui/cal-week-nav.c
-+src/gui/cal-week-view.c
-+src/icsc/cal-session-comp.c
-+src/icsc/cal-session-range.c
-+src/icsc/cal-session-uri.c
-+src/icsc/cal-session-wcap.c
-+src/icsc/cal-session.c
-+src/icsc/wcap-helper.c
-+src/main.c
- src/now.schemas.in
--
-+src/util/commander.c
-diff -urN now-1.0.d4/src/applet/GNOME_Panel_NowApplet.server.in.in now-1.0.d4-hacked/src/applet/GNOME_Panel_NowApplet.server.in.in
---- now-1.0.d4/src/applet/GNOME_Panel_NowApplet.server.in.in 2003-08-06 04:51:13.000000000 +1200
-+++ now-1.0.d4-hacked/src/applet/GNOME_Panel_NowApplet.server.in.in 2004-06-02 09:22:59.000000000 +1200
-@@ -20,9 +20,9 @@
- <item value="IDL:Bonobo/Control:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
-- <oaf_attribute name="name" type="string" _value="Now"/>
-- <oaf_attribute name="description" type="string" _value="Sun ONE™ Calendar Server client applet"/>
-- <oaf_attribute name="panel:category" type="string" value="Accessories"/>
-+ <oaf_attribute name="name" type="string" _value="Appointments and Tasks"/>
-+ <oaf_attribute name="description" type="string" _value="Sun ONE Calendar Server client applet"/>
-+ <oaf_attribute name="panel:category" type="string" _value="Accessories"/>
- <oaf_attribute name="panel:icon" type="string" value="now-logo.svg"/>
-
- </oaf_server>
-diff -urN now-1.0.d4/src/applet/Makefile.am now-1.0.d4-hacked/src/applet/Makefile.am
---- now-1.0.d4/src/applet/Makefile.am 2003-07-04 00:27:51.000000000 +1200
-+++ now-1.0.d4-hacked/src/applet/Makefile.am 2004-06-02 09:22:19.000000000 +1200
-@@ -1,6 +1,11 @@
-+NULL =
- SRCS_DIR = @top_srcdir@/src
-
--INCLUDES = -I@top_srcdir@/src
-+INCLUDES = \
-+ -I@top_srcdir@/src \
-+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ $(NULL)
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- AM_CFLAGS = \
- -DICONS_DIR=\""${datadir}/icons/now"\" \
- -DPIXMAPS_DIR=\""${datadir}/pixmaps"\" \
-@@ -46,7 +51,9 @@
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
- @INTLTOOL_SERVER_RULE@
--
-+ sed -e 's/Sun ONE /Sun ONE™ /' -e 's/Sun ONE"/Sun ONE™"/' $@ > $(@).bak
-+ mv $(@).bak $@
-+
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_Panel_NowApplet.xml
-
-diff -urN now-1.0.d4/src/applet/now-applet.c now-1.0.d4-hacked/src/applet/now-applet.c
---- now-1.0.d4/src/applet/now-applet.c 2003-09-26 07:44:53.000000000 +1200
-+++ now-1.0.d4-hacked/src/applet/now-applet.c 2004-06-02 09:22:19.000000000 +1200
-@@ -20,6 +20,7 @@
- * Michael Krivoruchko <[email protected]>
- */
-
-+#include <config.h>
- #include <string.h>
-
- #include <bonobo/bonobo-i18n.h>
-@@ -32,7 +33,6 @@
- #include <panel-applet-gconf.h>
- #include <librsvg/rsvg.h>
-
--#include "config.h"
-
- #include "icsc/cal-session-uri.h"
- #include "cua/cua.h"
-@@ -576,7 +576,7 @@
- NULL
- };
- static const gchar *translator_credits =
-- _("translator_credits");
-+ N_("translator_credits");
-
- g_return_if_fail (applet != NULL);
-
-@@ -584,10 +584,13 @@
- applet->about =
- gnome_about_new (_("Now Applet"), VERSION,
- "Copyright \xc2\xa9 2003 Sun Microsystems, Inc.\n",
-- _("This applet is a light-weight Sun ONE\xe2\x84\xa2 Calendar Server client."),
-+ g_strdup_printf (
-+/* "This applet is a light-weight Sun ONE\xe2\x84\xa2 Calendar Server client." */
-+ _("This applet is a light-weight %s Calendar Server client."),
-+ "Sun ONE\xe2\x84\xa2"),
- authors,
- documenters,
-- strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL,
-+ strcmp (_(translator_credits), "translator_credits") != 0 ? _(translator_credits) : NULL,
- applet->logo);
- if (applet->logo != NULL)
- gtk_window_set_icon (GTK_WINDOW (applet->about), applet->logo);
-@@ -1165,7 +1168,10 @@
- "/schemas/apps/now_applet/prefs", NULL);
-
- _setup_tooltips (applet,
-- _("Now, a light-weight Sun ONE\xe2\x84\xa2 Calendar Server client"));
-+ g_strdup_printf (
-+/* "Now, a light-weight Sun ONE\xe2\x84\xa2 Calendar Server client" */
-+ _("Now, a light-weight %s Calendar Server client"),
-+ "Sun ONE\xe2\x84\xa2"));
- }
- }
-
-@@ -1174,7 +1180,9 @@
-
- PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Panel_NowApplet_Factory",
- GTK_TYPE_NOW_APPLET,
-- _("Sun ONE\xe2\x84\xa2 Calendar Server client applet"),
-+/* "Sun ONE\xe2\x84\xa2 Calendar Server client applet" */
-+ g_strdup_printf (_("%s Calendar Server client applet"),
-+ "Sun ONE\xe2\x84\xa2"),
- "0",
- (PanelAppletFactoryCallback) _factory,
- NULL)
-diff -urN now-1.0.d4/src/applet/now-prefs.c now-1.0.d4-hacked/src/applet/now-prefs.c
---- now-1.0.d4/src/applet/now-prefs.c 2003-07-25 06:53:04.000000000 +1200
-+++ now-1.0.d4-hacked/src/applet/now-prefs.c 2004-06-02 09:22:19.000000000 +1200
-@@ -20,6 +20,7 @@
- * Michael Krivoruchko <[email protected]>
- */
-
-+#include <config.h>
- #include <gconf/gconf.h>
- #include <gconf/gconf-client.h>
- #include <bonobo/bonobo-i18n.h>
-diff -urN now-1.0.d4/src/applet/now-window.c now-1.0.d4-hacked/src/applet/now-window.c
---- now-1.0.d4/src/applet/now-window.c 2003-09-26 05:33:56.000000000 +1200
-+++ now-1.0.d4-hacked/src/applet/now-window.c 2004-06-02 09:22:19.000000000 +1200
-@@ -20,6 +20,7 @@
- * Michael Krivoruchko <[email protected]>
- */
-
-+#include <config.h>
- #include <bonobo/bonobo-i18n.h>
-
- #include "icsc/cal-session-uri.h"
-@@ -325,6 +326,9 @@
- /* Release the URI object */
- g_object_unref (G_OBJECT (uri));
- } else {
-- gtk_window_set_title (GTK_WINDOW (window), _("Now - Sun ONE\xe2\x84\xa2 CS client"));
-+ gtk_window_set_title (GTK_WINDOW (window),
-+/* "Now - Sun ONE\xe2\x84\xa2 CS client" */
-+ g_strdup_printf (_("Now - %s CS client"),
-+ "Sun ONE\xe2\x84\xa2"));
- }
- }
-diff -urN now-1.0.d4/src/gui/cal-day-field.c now-1.0.d4-hacked/src/gui/cal-day-field.c
---- now-1.0.d4/src/gui/cal-day-field.c 2003-07-11 23:39:09.000000000 +1200
-+++ now-1.0.d4-hacked/src/gui/cal-day-field.c 2004-06-02 09:22:19.000000000 +1200
-@@ -20,6 +20,9 @@
- * Michael Krivoruchko <[email protected]>
- */
-
-+#include <config.h>
-+#include <libgnome/gnome-i18n.h>
-+
- #include "gui/cal-bin.h"
- #include "gui/cal-box.h"
- #include "gui/cal-date-view.h"
-@@ -536,7 +539,7 @@
-
- case CAL_DAY_FIELD_STATE_PASSWD:
- view->text.layout = gtk_widget_create_pango_layout (
-- GTK_WIDGET (view), "password:");
-+ GTK_WIDGET (view), _("password:"));
- g_return_if_fail (view->text.layout != NULL);
- pango_layout_get_pixel_size (view->text.layout,
- &(view->text.rect.width), &(view->text.rect.height));
-diff -urN now-1.0.d4/src/gui/cal-i18n.c now-1.0.d4-hacked/src/gui/cal-i18n.c
---- now-1.0.d4/src/gui/cal-i18n.c 2003-07-11 23:40:03.000000000 +1200
-+++ now-1.0.d4-hacked/src/gui/cal-i18n.c 2004-06-02 09:22:19.000000000 +1200
-@@ -20,44 +20,47 @@
- * Michael Krivoruchko <[email protected]>
- */
-
-+#include <config.h>
-+#include <libgnome/gnome-i18n.h>
-+
- #include "gui/cal-i18n.h"
-
- static const gchar * WeekDays[] = {
- "",
-- "Monday",
-- "Tuesday",
-- "Wednesday",
-- "Thursday",
-- "Friday",
-- "Saturday",
-- "Sunday"
-+ N_("Monday"),
-+ N_("Tuesday"),
-+ N_("Wednesday"),
-+ N_("Thursday"),
-+ N_("Friday"),
-+ N_("Saturday"),
-+ N_("Sunday")
- };
-
- static const gchar * WeekDays3[] = {
- "",
-- "Mon",
-- "Tue",
-- "Wed",
-- "Thu",
-- "Fri",
-- "Sat",
-- "Sun"
-+ N_("Mon"),
-+ N_("Tue"),
-+ N_("Wed"),
-+ N_("Thu"),
-+ N_("Fri"),
-+ N_("Sat"),
-+ N_("Sun")
- };
-
- static const gchar * Months[] = {
- "",
-- "January",
-- "February",
-- "March",
-- "April",
-- "May",
-- "June",
-- "July",
-- "August",
-- "September",
-- "October",
-- "November",
-- "December"
-+ N_("January"),
-+ N_("February"),
-+ N_("March"),
-+ N_("April"),
-+ N_("May"),
-+ N_("June"),
-+ N_("July"),
-+ N_("August"),
-+ N_("September"),
-+ N_("October"),
-+ N_("November"),
-+ N_("December")
- };
-
-
-@@ -82,16 +85,16 @@
-
- switch (format) {
- case CAL_I18N_DATE_FORMAT_DATE_VIEW:
-- cstr = g_strdup_printf ("%s, %s %u, %u",
-- WeekDays[g_date_get_weekday (gdate)],
-- Months[g_date_get_month (gdate)],
-+ cstr = g_strdup_printf (_("%s, %s %u, %u"),
-+ _(WeekDays[g_date_get_weekday (gdate)]),
-+ _(Months[g_date_get_month (gdate)]),
- g_date_get_day (gdate),
- g_date_get_year (gdate));
- break;
-
- case CAL_I18N_DATE_FORMAT_WEEK_NAV_VIEW:
-- cstr = g_strdup_printf ("%s %u, %u",
-- Months[g_date_get_month (gdate)],
-+ cstr = g_strdup_printf (_("%s %u, %u"),
-+ _(Months[g_date_get_month (gdate)]),
- g_date_get_day (gdate),
- g_date_get_year (gdate));
- break;
-@@ -120,7 +123,7 @@
-
- switch (format) {
- case CAL_I18N_DATE_FORMAT_WEEK_DAY_VIEW:
-- cstr = WeekDays3[wday];
-+ cstr = g_strdup(_(WeekDays3[wday]));
- break;
-
- default:
-diff -urN now-1.0.d4/src/gui/Makefile.am now-1.0.d4-hacked/src/gui/Makefile.am
---- now-1.0.d4/src/gui/Makefile.am 2003-07-04 00:54:27.000000000 +1200
-+++ now-1.0.d4-hacked/src/gui/Makefile.am 2004-06-02 09:22:19.000000000 +1200
-@@ -1,10 +1,13 @@
-+NULL =
- INCLUDES = -I@top_srcdir@/src
- AM_CFLAGS = \
- -DICONS_DIR="\"$(datadir)/icons/now\"" \
- $(EXTRA_CFLAGS) \
- $(GNULIB_CFLAGS) \
- $(GTKPLUS_CFLAGS) \
-- $(LIBRSVG_CFLAGS)
-+ $(LIBRSVG_CFLAGS) \
-+ $(PANEL_CFLAGS) \
-+ $(NULL)
-
- noinst_LIBRARIES = libgui.a
-
-diff -urN now-1.0.d4/src/Makefile.am now-1.0.d4-hacked/src/Makefile.am
---- now-1.0.d4/src/Makefile.am 2003-07-04 00:51:29.000000000 +1200
-+++ now-1.0.d4-hacked/src/Makefile.am 2004-06-02 09:22:19.000000000 +1200
-@@ -8,6 +8,15 @@
- SUBDIRS = util icsc cua gui applet
-
- bin_PROGRAMS = now
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+
-+NULL =
-+datadir = @datadir@
-+INCLUDES = \
-+ -I. \
-+ -I.. \
-+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ $(NULL)
-
- now_SOURCES= \
- main.c \
---- now-1.0.d4/configure.in 2004-08-06 11:31:08.000000000 +0100
-+++ now-1.0.d4-hacked/configure.in 2004-08-06 11:34:12.000000000 +0100
-@@ -29,7 +29,11 @@
-
- AM_GCONF_SOURCE_2
-
--ALL_LINGUAS=""
-+GETTEXT_PACKAGE=now
-+AC_SUBST(GETTEXT_PACKAGE)
-+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
-+
-+ALL_LINGUAS="de es fr it ja ko pl pt_BR ru sv zh_CN zh_HK zh_TW"
- AM_GLIB_GNU_GETTEXT
-
- dnl
-@@ -108,6 +112,8 @@
- config/Makefile
- icons/Makefile
- po/Makefile.in
-+ help/Makefile
-+ help/C/Makefile
- src/util/Makefile
- src/icsc/Makefile
- src/cua/Makefile
--- a/patches/now-02-g11n-branding.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-diff -urN now-1.0.d4-orig/configure.in now-1.0.d4/configure.in
---- now-1.0.d4-orig/configure.in 2003-12-27 22:28:43.000000000 +0900
-+++ now-1.0.d4/configure.in 2003-12-27 22:50:21.000000000 +0900
-@@ -1,8 +1,8 @@
- dnl
--dnl Configure.in file for Now, a Sun ONE calendar server client.
-+dnl Configure.in file for Now, a Sun Java System calendar server client.
- dnl
-
--AC_INIT([Now, a Sun ONE calendar server client], [1.0.d4], [[email protected]])
-+AC_INIT([Now, a Sun Java System calendar server client], [1.0.d4], [[email protected]])
- #AC_COPYRIGHT
- AC_PREREQ(2.52)
- AC_CONFIG_SRCDIR([src/main.c])
-diff -urN now-1.0.d4-orig/src/applet/Makefile.am now-1.0.d4/src/applet/Makefile.am
---- now-1.0.d4-orig/src/applet/Makefile.am 2003-12-27 22:28:43.000000000 +0900
-+++ now-1.0.d4/src/applet/Makefile.am 2003-12-27 22:59:03.000000000 +0900
-@@ -51,7 +51,9 @@
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
- @INTLTOOL_SERVER_RULE@
-- sed -e 's/Sun ONE /Sun ONE™ /' -e 's/Sun ONE"/Sun ONE™"/' $@ > $(@).bak
-+ sed -e 's/Sun ONE /Sun Java™ System /' -e 's/Sun ONE"/Sun Java™ System"/' \
-+ -e 's/Java /Java™ /' -e 's/Java"/Java™"/' \
-+ $@ > $(@).bak
- mv $(@).bak $@
-
- uidir = $(datadir)/gnome-2.0/ui
-diff -urN now-1.0.d4-orig/src/applet/now-applet.c now-1.0.d4/src/applet/now-applet.c
---- now-1.0.d4-orig/src/applet/now-applet.c 2003-12-27 22:28:43.000000000 +0900
-+++ now-1.0.d4/src/applet/now-applet.c 2003-12-27 22:48:30.000000000 +0900
-@@ -74,7 +74,7 @@
- NOW_GCONFID_END
- } NowGConfId;
-
--/* Sun ONE calendar client GNOME panel applet. */
-+/* Sun Java System calendar client GNOME panel applet. */
- typedef struct {
- PanelApplet parent;
-
-@@ -585,9 +585,9 @@
- gnome_about_new (_("Now Applet"), VERSION,
- "Copyright \xc2\xa9 2003 Sun Microsystems, Inc.\n",
- g_strdup_printf (
--/* "This applet is a light-weight Sun ONE\xe2\x84\xa2 Calendar Server client." */
-+/* "This applet is a light-weight Sun Java\xe2\x84\xa2 System Calendar Server client." */
- _("This applet is a light-weight %s Calendar Server client."),
-- "Sun ONE\xe2\x84\xa2"),
-+ "Sun Java\xe2\x84\xa2 System"),
- authors,
- documenters,
- strcmp (_(translator_credits), "translator_credits") != 0 ? _(translator_credits) : NULL,
-@@ -1169,9 +1169,9 @@
-
- _setup_tooltips (applet,
- g_strdup_printf (
--/* "Now, a light-weight Sun ONE\xe2\x84\xa2 Calendar Server client" */
-+/* "Now, a light-weight Sun Java\xe2\x84\xa2 System Calendar Server client" */
- _("Now, a light-weight %s Calendar Server client"),
-- "Sun ONE\xe2\x84\xa2"));
-+ "Sun Java\xe2\x84\xa2 System"));
- }
- }
-
-@@ -1180,9 +1180,9 @@
-
- PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Panel_NowApplet_Factory",
- GTK_TYPE_NOW_APPLET,
--/* "Sun ONE\xe2\x84\xa2 Calendar Server client applet" */
-+/* "Sun Java\xe2\x84\xa2 System Calendar Server client applet" */
- g_strdup_printf (_("%s Calendar Server client applet"),
-- "Sun ONE\xe2\x84\xa2"),
-+ "Sun Java\xe2\x84\xa2 System"),
- "0",
- (PanelAppletFactoryCallback) _factory,
- NULL)
-diff -urN now-1.0.d4-orig/src/applet/now-window.c now-1.0.d4/src/applet/now-window.c
---- now-1.0.d4-orig/src/applet/now-window.c 2003-12-27 22:28:43.000000000 +0900
-+++ now-1.0.d4/src/applet/now-window.c 2003-12-27 22:49:52.000000000 +0900
-@@ -327,8 +327,8 @@
- g_object_unref (G_OBJECT (uri));
- } else {
- gtk_window_set_title (GTK_WINDOW (window),
--/* "Now - Sun ONE\xe2\x84\xa2 CS client" */
-+/* "Now - Sun Java\xe2\x84\xa2 System CS client" */
- g_strdup_printf (_("Now - %s CS client"),
-- "Sun ONE\xe2\x84\xa2"));
-+ "Sun Java\xe2\x84\xa2 System"));
- }
- }
--- a/patches/now-03-docs.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1074 +0,0 @@
-diff -r -u -N now-1.0.d4.orig/help/C/Makefile.am now-1.0.d4/help/C/Makefile.am
---- now-1.0.d4.orig/help/C/Makefile.am Thu Jan 1 01:00:00 1970
-+++ now-1.0.d4/help/C/Makefile.am Thu Aug 5 17:57:29 2004
-@@ -0,0 +1,7 @@
-+figdir = figures
-+docname = now
-+lang = C
-+omffile = now-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -r -u -N now-1.0.d4.orig/help/C/Makefile.in now-1.0.d4/help/C/Makefile.in
---- now-1.0.d4.orig/help/C/Makefile.in Thu Jan 1 01:00:00 1970
-+++ now-1.0.d4/help/C/Makefile.in Thu Aug 5 17:59:07 2004
-@@ -0,0 +1,457 @@
-+# Makefile.in generated by automake 1.7.2 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# To use this template:
-+# 1) Define: figdir, docname, lang, omffile, and entities in
-+# your Makefile.am file for each document directory,
-+# although figdir, omffile, and entities may be empty
-+# 2) Make sure the Makefile in (1) also includes
-+# "include $(top_srcdir)/xmldocs.make" and
-+# "dist-hook: app-dist-hook".
-+# 3) Optionally define 'entities' to hold xml entities which
-+# you would also like installed
-+# 4) Figures must go under $(figdir)/ and be in PNG format
-+# 5) You should only have one document per directory
-+# 6) Note that the figure directory, $(figdir)/, should not have its
-+# own Makefile since this Makefile installs those figures.
-+#
-+# example Makefile.am:
-+# figdir = figures
-+# docname = scrollkeeper-manual
-+# lang = C
-+# omffile=scrollkeeper-manual-C.omf
-+# entities = fdl.xml
-+# include $(top_srcdir)/xmldocs.make
-+# dist-hook: app-dist-hook
-+#
-+# About this file:
-+# This file was taken from scrollkeeper_example2, a package illustrating
-+# how to install documentation and OMF files for use with ScrollKeeper
-+# 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.2 (last updated: March 20, 2002)
-+#
-+
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# This file contains the build instructions for installing OMF files. It is
-+# generally called from the makefiles for particular formats of documentation.
-+#
-+# Note that you must configure your package with --localstatedir=/var
-+# so that the scrollkeeper-update command below will update the database
-+# in the standard scrollkeeper directory.
-+#
-+# If it is impossible to configure with --localstatedir=/var, then
-+# modify the definition of scrollkeeper_localstate_dir so that
-+# it points to the correct location. Note that you must still use
-+# $(localstatedir) in this or when people build RPMs it will update
-+# the real database on their system instead of the one under RPM_BUILD_ROOT.
-+#
-+# Note: This make file is not incorporated into xmldocs.make because, in
-+# general, there will be other documents install besides XML documents
-+# and the makefiles for these formats should also include this file.
-+#
-+# About this file:
-+# This file was derived from scrollkeeper_example2, a package
-+# illustrating how to install documentation and OMF files for use with
-+# ScrollKeeper 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.3 (last updated: March 20, 2002)
-+#
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CATALOGS = @CATALOGS@
-+CATOBJEXT = @CATOBJEXT@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DATADIRNAME = @DATADIRNAME@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GMOFILES = @GMOFILES@
-+GMSGFMT = @GMSGFMT@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+INSTOBJEXT = @INSTOBJEXT@
-+INTLLIBS = @INTLLIBS@
-+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-+INTLTOOL_MERGE = @INTLTOOL_MERGE@
-+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-+INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MSGFMT = @MSGFMT@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+POFILES = @POFILES@
-+POSUB = @POSUB@
-+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+USE_NLS = @USE_NLS@
-+VERSION = @VERSION@
-+XGETTEXT = @XGETTEXT@
-+ZENITY_CFLAGS = @ZENITY_CFLAGS@
-+ZENITY_LIBS = @ZENITY_LIBS@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+bindir = @bindir@
-+build_alias = @build_alias@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host_alias = @host_alias@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+figdir = figures
-+docname = now
-+lang = C
-+omffile = now-C.omf
-+entities = legal.xml
-+
-+# ********** Begin of section some packagers may need to modify **********
-+# This variable (docdir) specifies where the documents should be installed.
-+# This default value should work for most packages.
-+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+
-+# ********** You should not have to edit below this line **********
-+xml_files = $(entities) $(docname).xml
-+
-+EXTRA_DIST = $(xml_files) $(omffile)
-+CLEANFILES = omf_timestamp
-+
-+omf_dest_dir = $(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+subdir = help/C
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DIST_COMMON = $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make \
-+ Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu help/C/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+ $(mkinstalldirs) $(distdir)/../..
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+ list='$(DISTFILES)'; for file in $$list; do \
-+ case $$file in \
-+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ esac; \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ dir="/$$dir"; \
-+ $(mkinstalldirs) "$(distdir)$$dir"; \
-+ else \
-+ dir=''; \
-+ fi; \
-+ if test -d $$d/$$file; then \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ fi; \
-+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
-+ || exit 1; \
-+ fi; \
-+ done
-+ $(MAKE) $(AM_MAKEFLAGS) \
-+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
-+ dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+
-+installdirs:
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ INSTALL_STRIP_FLAG=-s \
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-local mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+ @$(NORMAL_INSTALL)
-+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-local
-+
-+.PHONY: all all-am check check-am clean clean-generic clean-local \
-+ distclean distclean-generic distdir dvi dvi-am info info-am \
-+ install install-am install-data install-data-am \
-+ install-data-local install-exec install-exec-am install-info \
-+ install-info-am install-man install-strip installcheck \
-+ installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-+ uninstall-local
-+
-+
-+# At some point, it may be wise to change to something like this:
-+# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
-+
-+omf: omf_timestamp
-+
-+omf_timestamp: $(omffile)
-+ -for file in $(omffile); do \
-+ scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-+ done; \
-+ touch omf_timestamp
-+
-+install-data-hook-omf:
-+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-+ for file in $(omffile); do \
-+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ done
-+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+ -for file in $(srcdir)/*.omf; do \
-+ basefile=`basename $$file`; \
-+ rm -f $(omf_dest_dir)/$$basefile; \
-+ done
-+ -rmdir $(omf_dest_dir)
-+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+clean-local-omf:
-+ -for file in $(omffile); do \
-+ rm -f $$file.out; \
-+ done
-+
-+all: omf
-+
-+$(docname).xml: $(entities)
-+ -ourdir=`pwd`; \
-+ cd $(srcdir); \
-+ cp $(entities) $$ourdir
-+
-+app-dist-hook:
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(distdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-local: omf
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)
-+ for file in $(xml_files); do \
-+ cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
-+ done
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-hook: install-data-hook-omf
-+
-+uninstall-local: uninstall-local-doc uninstall-local-omf
-+
-+uninstall-local-doc:
-+ -if test "$(figdir)"; then \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-+ done; \
-+ rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+ fi
-+ -for file in $(xml_files); do \
-+ rm -f $(DESTDIR)$(docdir)/$$file; \
-+ done
-+ -rmdir $(DESTDIR)$(docdir)
-+
-+clean-local: clean-local-omf
-+dist-hook: app-dist-hook
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -r -u -N now-1.0.d4.orig/help/Makefile.am now-1.0.d4/help/Makefile.am
---- now-1.0.d4.orig/help/Makefile.am Thu Jan 1 01:00:00 1970
-+++ now-1.0.d4/help/Makefile.am Thu Aug 5 17:55:42 2004
-@@ -0,0 +1 @@
-+SUBDIRS = C
-diff -r -u -N now-1.0.d4.orig/help/Makefile.in now-1.0.d4/help/Makefile.in
---- now-1.0.d4.orig/help/Makefile.in Thu Jan 1 01:00:00 1970
-+++ now-1.0.d4/help/Makefile.in Thu Aug 5 17:55:56 2004
-@@ -0,0 +1,429 @@
-+# Makefile.in generated by automake 1.7.2 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# 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.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CATALOGS = @CATALOGS@
-+CATOBJEXT = @CATOBJEXT@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DATADIRNAME = @DATADIRNAME@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-+GMOFILES = @GMOFILES@
-+GMSGFMT = @GMSGFMT@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+INSTOBJEXT = @INSTOBJEXT@
-+INTLLIBS = @INTLLIBS@
-+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-+INTLTOOL_MERGE = @INTLTOOL_MERGE@
-+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-+INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MSGFMT = @MSGFMT@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+POFILES = @POFILES@
-+POSUB = @POSUB@
-+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+USE_NLS = @USE_NLS@
-+VERSION = @VERSION@
-+XGETTEXT = @XGETTEXT@
-+ZENITY_CFLAGS = @ZENITY_CFLAGS@
-+ZENITY_LIBS = @ZENITY_LIBS@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+bindir = @bindir@
-+build_alias = @build_alias@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host_alias = @host_alias@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+SUBDIRS = C
-+
-+subdir = help
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-+ ps-recursive install-info-recursive uninstall-info-recursive \
-+ all-recursive install-data-recursive install-exec-recursive \
-+ installdirs-recursive install-recursive uninstall-recursive \
-+ check-recursive installcheck-recursive
-+DIST_COMMON = Makefile.am Makefile.in
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu help/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+
-+# 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):
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
-+ dot_seen=no; \
-+ target=`echo $@ | sed s/-recursive//`; \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
-+ echo "Making $$target in $$subdir"; \
-+ if test "$$subdir" = "."; then \
-+ dot_seen=yes; \
-+ local_target="$$target-am"; \
-+ else \
-+ local_target="$$target"; \
-+ fi; \
-+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ done; \
-+ if test "$$dot_seen" = "no"; then \
-+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+ fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+ @set fnord $$MAKEFLAGS; amf=$$2; \
-+ 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; \
-+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ done && test -z "$$fail"
-+tags-recursive:
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
-+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+ done
-+ctags-recursive:
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
-+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+ done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+CTAGS = ctags
-+CTAGSFLAGS =
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+ fi; \
-+ done; \
-+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique
-+
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+ $$tags $$unique
-+
-+GTAGS:
-+ here=`$(am__cd) $(top_builddir) && pwd` \
-+ && cd $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+ list='$(DISTFILES)'; for file in $$list; do \
-+ case $$file in \
-+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ esac; \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ dir="/$$dir"; \
-+ $(mkinstalldirs) "$(distdir)$$dir"; \
-+ else \
-+ dir=''; \
-+ fi; \
-+ if test -d $$d/$$file; then \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ fi; \
-+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
-+ || exit 1; \
-+ fi; \
-+ done
-+ list='$(SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ test -d $(distdir)/$$subdir \
-+ || mkdir $(distdir)/$$subdir \
-+ || exit 1; \
-+ (cd $$subdir && \
-+ $(MAKE) $(AM_MAKEFLAGS) \
-+ top_distdir="$(top_distdir)" \
-+ distdir=../$(distdir)/$$subdir \
-+ distdir) \
-+ || exit 1; \
-+ fi; \
-+ done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ INSTALL_STRIP_FLAG=-s \
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-+ clean-generic clean-recursive ctags ctags-recursive distclean \
-+ distclean-generic distclean-recursive distclean-tags distdir \
-+ dvi dvi-am dvi-recursive info info-am info-recursive install \
-+ install-am install-data install-data-am install-data-recursive \
-+ install-exec install-exec-am install-exec-recursive \
-+ install-info install-info-am install-info-recursive install-man \
-+ install-recursive install-strip installcheck installcheck-am \
-+ installdirs installdirs-am installdirs-recursive \
-+ maintainer-clean maintainer-clean-generic \
-+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-+ ps-recursive tags tags-recursive uninstall uninstall-am \
-+ uninstall-info-am uninstall-info-recursive uninstall-recursive
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN now-1.0.d4.orig/omf.make now-1.0.d4/omf.make
---- now-1.0.d4.orig/omf.make Thu Jan 1 01:00:00 1970
-+++ now-1.0.d4/omf.make Fri Aug 6 12:52:15 2004
-@@ -0,0 +1,61 @@
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# This file contains the build instructions for installing OMF files. It is
-+# generally called from the makefiles for particular formats of documentation.
-+#
-+# Note that you must configure your package with --localstatedir=/var
-+# so that the scrollkeeper-update command below will update the database
-+# in the standard scrollkeeper directory.
-+#
-+# If it is impossible to configure with --localstatedir=/var, then
-+# modify the definition of scrollkeeper_localstate_dir so that
-+# it points to the correct location. Note that you must still use
-+# $(localstatedir) in this or when people build RPMs it will update
-+# the real database on their system instead of the one under RPM_BUILD_ROOT.
-+#
-+# Note: This make file is not incorporated into xmldocs.make because, in
-+# general, there will be other documents install besides XML documents
-+# and the makefiles for these formats should also include this file.
-+#
-+# About this file:
-+# This file was derived from scrollkeeper_example2, a package
-+# illustrating how to install documentation and OMF files for use with
-+# ScrollKeeper 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.3 (last updated: March 20, 2002)
-+#
-+
-+omf_dest_dir=$(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+
-+# At some point, it may be wise to change to something like this:
-+# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
-+
-+omf: omf_timestamp
-+
-+omf_timestamp: $(omffile)
-+ -for file in $(omffile); do \
-+ scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-+ done; \
-+ touch omf_timestamp
-+
-+install-data-hook-omf:
-+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-+ for file in $(omffile); do \
-+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ done
-+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+ -for file in $(srcdir)/*.omf; do \
-+ basefile=`basename $$file`; \
-+ rm -f $(omf_dest_dir)/$$basefile; \
-+ done
-+ -rmdir $(omf_dest_dir)
-+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+clean-local-omf:
-+ -for file in $(omffile); do \
-+ rm -f $$file.out; \
-+ done
-diff -urN now-1.0.d4.orig/xmldocs.make now-1.0.d4/xmldocs.make
---- now-1.0.d4.orig/xmldocs.make Thu Jan 1 01:00:00 1970
-+++ now-1.0.d4/xmldocs.make Fri Aug 6 11:57:54 2004
-@@ -0,0 +1,95 @@
-+#
-+# No modifications of this Makefile should be necessary.
-+#
-+# To use this template:
-+# 1) Define: figdir, docname, lang, omffile, and entities in
-+# your Makefile.am file for each document directory,
-+# although figdir, omffile, and entities may be empty
-+# 2) Make sure the Makefile in (1) also includes
-+# "include $(top_srcdir)/xmldocs.make" and
-+# "dist-hook: app-dist-hook".
-+# 3) Optionally define 'entities' to hold xml entities which
-+# you would also like installed
-+# 4) Figures must go under $(figdir)/ and be in PNG format
-+# 5) You should only have one document per directory
-+# 6) Note that the figure directory, $(figdir)/, should not have its
-+# own Makefile since this Makefile installs those figures.
-+#
-+# example Makefile.am:
-+# figdir = figures
-+# docname = scrollkeeper-manual
-+# lang = C
-+# omffile=scrollkeeper-manual-C.omf
-+# entities = fdl.xml
-+# include $(top_srcdir)/xmldocs.make
-+# dist-hook: app-dist-hook
-+#
-+# About this file:
-+# This file was taken from scrollkeeper_example2, a package illustrating
-+# how to install documentation and OMF files for use with ScrollKeeper
-+# 0.3.x and 0.4.x. For more information, see:
-+# http://scrollkeeper.sourceforge.net/
-+# Version: 0.1.2 (last updated: March 20, 2002)
-+#
-+
-+
-+# ********** Begin of section some packagers may need to modify **********
-+# This variable (docdir) specifies where the documents should be installed.
-+# This default value should work for most packages.
-+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+
-+# ********** You should not have to edit below this line **********
-+xml_files = $(entities) $(docname).xml
-+
-+EXTRA_DIST = $(xml_files) $(omffile)
-+CLEANFILES = omf_timestamp
-+
-+include $(top_srcdir)/omf.make
-+
-+all: omf
-+
-+$(docname).xml: $(entities)
-+ -ourdir=`pwd`; \
-+ cd $(srcdir); \
-+ cp $(entities) $$ourdir
-+
-+app-dist-hook:
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(distdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-local: omf
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)
-+ for file in $(xml_files); do \
-+ cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
-+ done
-+ if test "$(figdir)"; then \
-+ $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-+ done \
-+ fi
-+
-+install-data-hook: install-data-hook-omf
-+
-+uninstall-local: uninstall-local-doc uninstall-local-omf
-+
-+uninstall-local-doc:
-+ -if test "$(figdir)"; then \
-+ for file in $(srcdir)/$(figdir)/*.png; do \
-+ basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-+ rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-+ done; \
-+ rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+ fi
-+ -for file in $(xml_files); do \
-+ rm -f $(DESTDIR)$(docdir)/$$file; \
-+ done
-+ -rmdir $(DESTDIR)$(docdir)
-+
-+clean-local: clean-local-omf
--- a/patches/now-04-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
---- now-1.0.d4/src/applet/GNOME_Panel_NowApplet.xml 2004-08-26 17:20:58.000000000 +0530
-+++ now-1.0.d4-new/src/applet/GNOME_Panel_NowApplet.xml 2004-08-27 09:37:28.000000000 +0530
-@@ -3,6 +3,8 @@
- <popup name="button3">
- <menuitem name="NowApplet Preferences Item" verb="Preferences"
- _label="_Preferences..." pixtype="stock" pixname="gtk-properties"/>
-+ <menuitem name="NowApplet Help Item" verb="Help"
-+ _label="_Help" pixtype="stock" pixname="gtk-help"/>
- <menuitem name="NowApplet About Item" verb="About"
- _label="_About..." pixtype="stock" pixname="gnome-stock-about"/>
- </popup>
---- now-1.0.d4/src/applet/now-applet.c 2004-08-26 17:20:58.000000000 +0530
-+++ now-1.0.d4-new/src/applet/now-applet.c 2004-08-30 11:40:59.000000000 +0530
-@@ -124,6 +124,7 @@ static void _about_dialog_destroy (
- GtkWidget *widget, NowApplet *applet);
- static void _about_dialog_show (
- NowApplet *applet);
-+static void _help_dialog_show ();
- static void _do_uiverb (
- BonoboUIComponent *uic, gpointer user_data, const gchar *verb);
- static void _set_view (
-@@ -159,6 +160,7 @@ static GtkTooltips * tooltips = NULL;
-
- static const BonoboUIVerb menu_verbs [] = {
- BONOBO_UI_VERB ("Preferences", _do_uiverb),
-+ BONOBO_UI_VERB ("Help", _do_uiverb),
- BONOBO_UI_VERB ("About", _do_uiverb),
-
- BONOBO_UI_VERB_END
-@@ -606,6 +608,36 @@ _about_dialog_show (NowApplet *applet)
-
-
- /*
-+ * _help_dialog_show:
-+ * @applet: a widget of type #NowApplet.
-+ *
-+ * Displays the applet help window.
-+ *
-+ * Return value: void.
-+ */
-+static void
-+_help_dialog_show ()
-+{
-+ GError *error = NULL;
-+
-+ gnome_help_display_desktop (NULL, "now", "now.xml",
-+ "now-introduction", &error);
-+
-+ if (error) {
-+ GtkWidget *message_dialog;
-+ message_dialog = gtk_message_dialog_new (NULL, 0,
-+ GTK_MESSAGE_ERROR,
-+ GTK_BUTTONS_OK,
-+ _("There was an error displaying help: %s"),
-+ error->message);
-+ g_error_free (error);
-+ gtk_dialog_run (GTK_DIALOG (message_dialog));
-+ gtk_widget_destroy (message_dialog);
-+ }
-+}
-+
-+
-+/*
- * _do_uiverb:
- * @uic: a widget of type #NowApplet.
- * @user_data: .
-@@ -625,6 +657,8 @@ _do_uiverb (BonoboUIComponent *uic,
- _prefs_dialog_show (applet);
- } else if (g_str_equal (verb, "About") != FALSE) {
- _about_dialog_show (applet);
-+ } else if (g_str_equal (verb, "Help") != FALSE) {
-+ _help_dialog_show ();
- }
- }
-
--- a/patches/now-05-g11n-allinguas.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urN now-1.0.d4.bak/configure.in now-1.0.d4/configure.in
---- now-1.0.d4.bak/configure.in 2004-09-17 15:30:16.783920000 +0000
-+++ now-1.0.d4/configure.in 2004-09-17 15:31:22.359190000 +0000
-@@ -33,7 +33,7 @@
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
-
--ALL_LINGUAS="de es fr it ja ko pl pt_BR ru sv zh_CN zh_HK zh_TW"
-+ALL_LINGUAS="cs de es fr hu it ja ko pl pt_BR ru sv zh_CN zh_HK zh_TW"
- AM_GLIB_GNU_GETTEXT
-
- dnl
--- a/patches/now-06-help-build.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-diff -urN now-1.0.d5-orig/Makefile.am now-1.0.d5/Makefile.am
---- now-1.0.d5-orig/Makefile.am 2004-10-09 21:53:49.801667112 +0900
-+++ now-1.0.d5/Makefile.am 2004-10-09 21:54:46.409061480 +0900
-@@ -1,5 +1,5 @@
-
--SUBDIRS = config src icons po
-+SUBDIRS = config src icons po help
-
- EXTRA_DIST = \
- intltool-extract.in \
-diff -urN now-1.0.d5-orig/configure.in now-1.0.d5/configure.in
---- now-1.0.d5-orig/configure.in 2004-10-09 21:53:49.788669088 +0900
-+++ now-1.0.d5/configure.in 2004-10-09 21:54:27.703905096 +0900
-@@ -110,6 +110,8 @@
- Makefile
- config/Makefile
- icons/Makefile
-+ help/Makefile
-+ help/C/Makefile
- po/Makefile.in
- src/util/Makefile
- src/icsc/Makefile
--- a/patches/now-08-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -rNau now-1.0.d5/configure.in now-1.0.d5.new/configure.in
---- now-1.0.d5/configure.in 2004-10-28 14:06:25.975308000 +0900
-+++ now-1.0.d5.new/configure.in 2004-10-28 11:02:59.000000000 +0900
-@@ -121,6 +121,17 @@
- icons/Makefile
- help/Makefile
- help/C/Makefile
-+ help/de/Makefile
-+ help/es/Makefile
-+ help/fr/Makefile
-+ help/it/Makefile
-+ help/sv/Makefile
-+ help/ja/Makefile
-+ help/ko/Makefile
-+ help/zh_CN/Makefile
-+ help/zh_TW/Makefile
-+ help/zh_HK/Makefile
-+ help/pt_BR/Makefile
- po/Makefile.in
- src/util/Makefile
- src/icsc/Makefile
-diff -rNau now-1.0.d5/help/Makefile.am now-1.0.d5.new/help/Makefile.am
---- now-1.0.d5/help/Makefile.am 2004-10-28 14:06:25.907582000 +0900
-+++ now-1.0.d5.new/help/Makefile.am 2004-10-28 11:28:42.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
--- a/patches/quick-lounge-applet-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- ../quick-lounge-applet-2.10.0.old/configure.in 2005-06-16 15:50:47.290310672 +0100
-+++ ./configure.in 2005-06-16 15:49:53.344511680 +0100
-@@ -101,6 +101,7 @@
- help/zh_CN/Makefile
- help/zh_HK/Makefile
- help/zh_TW/Makefile
-+help/pt_BR/Makefile
- src/Makefile
- po/Makefile.in
- ])
---- ../quick-lounge-applet-2.10.0.old/help/Makefile.am 2005-06-16 15:45:36.648535400 +0100
-+++ ./help/Makefile.am 2005-06-16 15:50:00.726389464 +0100
-@@ -1 +1 @@
--SUBDIRS = C de es fr it ja ko sv zh_CN zh_HK zh_TW
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_HK zh_TW pt_BR
--- a/patches/scrollkeeper-02-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- scrollkeeper-0.3.11/po/POTFILES.in.potfiles_in_original 2003-07-15 10:00:40.000000000 +0100
-+++ scrollkeeper-0.3.11/po/POTFILES.in 2003-07-15 10:00:40.000000000 +0100
-@@ -1,12 +1,14 @@
--cl/src/scrollkeeper-install.c
-+buildtools/separate.c
-+cl/src/get-cl.c
- cl/src/preinstall.c
-+cl/src/scrollkeeper-install.c
- cl/src/scrollkeeper-uninstall.c
- cl/src/update.c
--cl/src/get-cl.c
-+cl/templates/scrollkeeper_cl.xml.in
-+extract/src/scrollkeeper-extract.c
-+libs/database.c
- libs/error.c
-+libs/extract.c
- libs/install.c
- libs/uninstall.c
--libs/database.c
- libs/update-url.c
--extract/src/scrollkeeper-extract.c
--cl/templates/scrollkeeper_cl.xml.in
--- a/patches/shared-mime-info-01-g11n-potfiles.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
---- ../shared-mime-info-0.16.old/po/POTFILES.in 2005-06-16 16:13:23.288167664 +0100
-+++ ./po/POTFILES.in 2005-06-16 16:14:49.624042616 +0100
-@@ -1 +1,4 @@
-+# Add files with translateable strings here.
-+# Please keep this file sorted alpabetically.
- freedesktop.org.xml.in
-+update-mime-database.c
--- a/patches/sun-gdm-themes-01-g11n-alllinguas.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urN sun-gdm-themes-0.15.bak/configure.in sun-gdm-themes-0.15/configure.in
---- sun-gdm-themes-0.15.bak/configure.in 2004-09-16 15:50:10.675953000 +0000
-+++ sun-gdm-themes-0.15/configure.in 2004-09-16 15:54:01.215306000 +0000
-@@ -9,7 +9,7 @@
-
- GETTEXT_PACKAGE=sun-gdm-themes
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE") AC_SUBST(GETTEXT_PACKAGE)
--ALL_LINGUAS=""
-+ALL_LINGUAS="cs de es fr hu it ja ko pt_BR sv zh_CN zh_TW"
- AM_GLIB_GNU_GETTEXT
-
- AC_OUTPUT([
--- a/patches/totem-04-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
---- ../totem-1.0.3.old/configure.in 2005-06-16 16:46:45.362806056 +0100
-+++ ./configure.in 2005-06-16 16:54:33.934572320 +0100
-@@ -374,6 +374,15 @@
- help/de/Makefile
- help/es/Makefile
- help/ru/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/pt_BR/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
- ])
-
- echo
---- ../totem-1.0.3.old/configure 2005-06-16 16:46:45.361806208 +0100
-+++ ./configure 2005-06-16 16:53:53.215762520 +0100
-@@ -23342,7 +23342,7 @@
- < $srcdir/po/POTFILES.in > po/POTFILES
-
-
-- ac_config_files="$ac_config_files Makefile totem.spec totem-plparser.pc src/Makefile data/Makefile data/totem.desktop.in.in data/vanity.desktop.in po/Makefile.in help/Makefile help/C/Makefile help/de/Makefile help/es/Makefile help/ru/Makefile"
-+ ac_config_files="$ac_config_files Makefile totem.spec totem-plparser.pc src/Makefile data/Makefile data/totem.desktop.in.in data/vanity.desktop.in po/Makefile.in help/Makefile help/C/Makefile help/de/Makefile help/es/Makefile help/ru/Makefile help/fr/Makefile help/it/Makefile help/sv/Makefile help/pt_BR/Makefile help/ja/Makefile help/ko/Makefile help/zh_CN/Makefile help/zh_TW/Makefile help/zh_HK/Makefile"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -23977,6 +23977,15 @@
- "help/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/de/Makefile" ;;
- "help/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/es/Makefile" ;;
- "help/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/ko/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/zh_TW/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
-+ "help/zh_HK/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/ru/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
---- ../totem-1.0.3.old/help/Makefile.am 2005-06-16 16:46:45.351807728 +0100
-+++ ./help/Makefile.am 2005-06-16 16:55:03.479080872 +0100
-@@ -1 +1 @@
--SUBDIRS = C de es ru
-+SUBDIRS = C de es ru fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
---- ../totem-1.0.3.old/help/Makefile.in 2005-06-16 16:46:45.351807728 +0100
-+++ ./help/Makefile.in 2005-06-16 16:55:33.504516312 +0100
-@@ -206,7 +206,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = C de es ru
-+SUBDIRS = C de es ru fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
- subdir = help
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- a/patches/usermode-03-potfiles-in.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- usermode-1.68/po/POTFILES.in.g11n_original 2003-07-23 15:23:41.000000000 +0100
-+++ usermode-1.68/po/POTFILES.in 2003-07-23 15:23:45.000000000 +0100
-@@ -1,14 +1,15 @@
- consolehelper.c
- dummy.h
-+gsmclient.c
-+pam-panel-icon.c
-+reaper.c
- userdialogs.h
--userhelper.c
- userhelper-wrap.c
--userinfo.c
--usermount.c
-+userhelper.c
- userhelper.h
--glade.strings
--# files added by intltool-prepare
--usermode.glade
-+userinfo.c
- userinfo.desktop.in
-+usermode.glade
-+usermount.c
- usermount.desktop.in
- userpasswd.desktop.in
--- a/patches/webeyes-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-diff -rNau webeyes-0.7/configure.in webeyes-0.7.new/configure.in
---- webeyes-0.7/configure.in 2004-07-29 19:13:16.000000000 +0900
-+++ webeyes-0.7.new/configure.in 2004-10-28 11:03:46.000000000 +0900
-@@ -51,4 +51,6 @@
- help/ko/Makefile
- help/zh_CN/Makefile
- help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
- ])
-diff -rNau webeyes-0.7/help/Makefile.am webeyes-0.7.new/help/Makefile.am
---- webeyes-0.7/help/Makefile.am 2004-01-09 20:04:22.000000000 +0900
-+++ webeyes-0.7.new/help/Makefile.am 2004-10-28 11:28:23.000000000 +0900
-@@ -1,2 +1,2 @@
- SUBDIRS = \
-- C de es fr it sv ja ko zh_CN zh_TW
-+ C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
--- a/patches/zenity-01-l10n-online-help.diff Tue Aug 09 11:42:33 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-diff -rNau zenity-2.6.0/configure.in zenity-2.6.0.new/configure.in
---- zenity-2.6.0/configure.in 2004-03-23 02:34:14.000000000 +0900
-+++ zenity-2.6.0.new/configure.in 2004-10-28 10:46:19.000000000 +0900
-@@ -62,5 +62,16 @@
- data/Makefile
- help/Makefile
- help/C/Makefile
-+help/de/Makefile
-+help/es/Makefile
-+help/fr/Makefile
-+help/it/Makefile
-+help/sv/Makefile
-+help/ja/Makefile
-+help/ko/Makefile
-+help/zh_CN/Makefile
-+help/zh_TW/Makefile
-+help/zh_HK/Makefile
-+help/pt_BR/Makefile
- help/sr/Makefile
- ])
-diff -rNau zenity-2.6.0/help/Makefile.am zenity-2.6.0.new/help/Makefile.am
---- zenity-2.6.0/help/Makefile.am 2004-03-22 14:14:26.000000000 +0900
-+++ zenity-2.6.0.new/help/Makefile.am 2004-10-28 11:19:00.000000000 +0900
-@@ -1,3 +1,14 @@
- SUBDIRS = \
- C \
-+ de \
-+ es \
-+ fr \
-+ it \
-+ sv \
-+ ja \
-+ ko \
-+ zh_CN \
-+ zh_TW \
-+ zh_HK \
-+ pt_BR \
- sr
--- a/planner.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/planner.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Planner, a project planning tool.
Source: http://ftp.gnome.org/pub/GNOME/sources/planner/%{version}/planner-%{version}.tar.bz2
-Source1: planner-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: planner-01-menu-entry.diff
URL: http://planner.imendio.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -92,10 +90,8 @@
%prep
%setup -q
-bzcat -dc %SOURCE1 | tar xf -
%patch1 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/pwlib.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/pwlib.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Portable Windows Libary
Source: pwlib-%{version}.tar.bz2
-Source1: l10n-configure.sh
Patch1: pwlib-01-makefiles.diff
URL: http://www.openh323.org/
BuildRoot: %{_tmppath}/%{name}-root
@@ -46,7 +45,6 @@
ln -s %{name}-%{version} %{name}
cd %{name}-%{version}
-bash -x %SOURCE1
%build
export PWLIBDIR=`pwd`
--- a/quick-lounge-applet.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/quick-lounge-applet.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,11 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Quick Lounge Panel Applet
Source: http://ftp.gnome.org/pub/GNOME/sources/quick-lounge-applet/2.10/%{name}-%{version}.tar.bz2
-Source1: quick-lounge-applet-l10n-po-1.16.tar.bz2
-Source2: quick-lounge-applet-docs-0.4.tar.bz2
-Source3: quick-lounge-applet-l10n-online-help-ci-linux-1.2.tar.bz2
-Source4: l10n-configure.sh
-Patch1: quick-lounge-applet-01-l10n-online-help.diff
Patch2: quick-lounge-applet-02-xlibs.diff
Patch3: quick-lounge-applet-03-launch-default-help.diff
URL: http://www.gnome.org
@@ -49,14 +44,9 @@
%prep
%setup -q
-bzcat %SOURCE1 | tar xf -
-bzcat %SOURCE2 | tar xf -
-bzcat %SOURCE3 | tar xf -
-%patch1 -p1
%patch2 -p1
%patch3 -p1
-bash -x %SOURCE4
%build
%ifos linux
--- a/scrollkeeper.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/scrollkeeper.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,7 @@
Vendor: Sun Microsystems, Inc.
Summary: Cataloging System for Documentation
Source: http://ftp.gnome.org/pub/GNOME/sources/scrollkeeper/0.3/scrollkeeper-%{version}.tar.bz2
-# FIXME Source1: scrollkeeper-l10n-po-1.16.tar.bz2
+Source1: scrollkeeper-update.1.gz
Source2: scrollkeeper.1.gz
Source3: scrollkeeper.conf.1.gz
Source4: scrollkeeper-config.1.gz
@@ -31,10 +31,7 @@
Source15: scrollkeeper-preinstall.1.gz
Source16: scrollkeeper-rebuilddb.1.gz
Source17: scrollkeeper-uninstall.1.gz
-Source18: scrollkeeper-update.1.gz
-Source19: l10n-configure.sh
Patch1: scrollkeeper-01-binddomain.diff
-Patch2: scrollkeeper-02-potfiles.diff
Patch3: scrollkeeper-03-merge-lang.diff
Patch4: scrollkeeper-04-help-sections.diff
Patch5: scrollkeeper-05-remove-man.diff
@@ -79,9 +76,7 @@
%prep
%setup -q
-#FIXME bzcat %SOURCE1 | tar xf -
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -89,7 +84,6 @@
%patch7 -p1 -b .rebuilddb-logdir
%patch8 -p1
-bash -x %SOURCE19
%build
%ifos linux
@@ -123,6 +117,7 @@
%find_lang %{name}
%endif
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -139,7 +134,6 @@
install --mode=0644 %SOURCE15 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE16 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE17 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE18 $RPM_BUILD_ROOT%{_mandir}/man1
#FIXME - should this be packaged or not ?
rm $RPM_BUILD_ROOT/var/log/scrollkeeper.log
rm -rf $RPM_BUILD_ROOT/%{my_localstatedir}
--- a/shared-mime-info.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/shared-mime-info.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,9 +16,7 @@
Source: http://www.freedesktop.org/Software/%{name}/%{name}-%{version}.tar.bz2
Source1: shared-mime-info-l10n-po-1.16.tar.bz2
Source2: update-mime-database.1.gz
-Source3: l10n-configure.sh
Source4: defaults.list
-Patch1: shared-mime-info-01-g11n-potfiles.diff
Patch2: shared-mime-info-02-add-mime-types.diff
URL: http://www.freedesktop.org/Software/%{name}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,10 +31,8 @@
%prep
%setup -q
bzcat -dc %SOURCE1|tar xf -
-%patch1 -p1
%patch2 -p1
-bash -x %SOURCE3
%build
%ifos linux
--- a/sound-juicer.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/sound-juicer.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,7 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: CD ripping tool
Source: http://ftp.gnome.org/pub/GNOME/sources/sound-juicer/2.10/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -46,7 +45,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/steel-theme.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/steel-theme.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,6 @@
Vendor: Sun Microsystems, Inc.
Group: System/GUI/GNOME
Source: %{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
-Source2: steel-theme-l10n-po-1.16.tar.bz2
Patch1: Steel-01-g11n-i18n-ui.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -26,10 +24,8 @@
%prep
%setup -q
-bzcat %SOURCE2 | tar xvf -
%patch1 -p1
-bash -x %SOURCE1
%build
%ifos linux
--- a/sun-gdm-themes.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/sun-gdm-themes.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,9 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Sun branded GNOME login manager theme
Source: %{name}-%{version}.tar.gz
-#FIXME Source1: sun-gdm-themes-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Patch1: sun-gdm-themes-01-g11n-alllinguas.diff
URL: http://sun.com
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -32,10 +29,6 @@
%prep
%setup -q
-#%patch1 -p1
-#FIXME /usr/bin/bzcat -dc %SOURCE1|tar xf -
-
-bash -x %SOURCE2
%build
%ifos linux
--- a/system-tools-backends.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/system-tools-backends.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,7 +16,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Backends for the GNOME System Tools
Source: http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/1.2/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -36,7 +35,6 @@
%prep
%setup -q
-bash -x %SOURCE1
%build
%ifos linux
--- a/totem.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/totem.spec Tue Aug 09 21:56:40 2005 +0000
@@ -16,14 +16,9 @@
Vendor: Sun Microsystems, Inc.
Summary: Totem Multimedia Player
Source: http://ftp.gnome.org/pub/GNOME/sources/totem/1.0/%{name}-%{version}.tar.bz2
-Source1: totem-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
-Source3: totem-docs-0.1.tar.bz2
-Source4: totem-l10n-online-help-ci-linux-1.2.tar.bz2
Patch1: totem-01-init-threads.diff
Patch2: totem-02-menu-entry.diff
Patch3: totem-03-use-jmplay-for-wav-mp3.diff
-Patch4: totem-04-l10n-online-help.diff
Patch5: totem-05-mnttab.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,17 +46,11 @@
%prep
%setup -q
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
-/usr/bin/bzcat -dc %SOURCE3|tar xf -
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
-/usr/bin/bzcat -dc %SOURCE4|tar xf -
-bash -x %SOURCE2
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
--- a/ttf-baekmuk.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/ttf-baekmuk.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Korean Baekmuk Truetype Fonts
Source: ftp://ftp.mizi.com/pub/baekmuk/baekmuk-ttf-%{version}.tar.gz
-Source1: l10n-configure.sh
URL: ftp://ftp.mizi.com/pub/baekmuk/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -36,7 +35,6 @@
%prep
%setup -q -c -n %{name}-%{version}
-bash -x %SOURCE1
%install
install -d ${RPM_BUILD_ROOT}%{font_dir}
--- a/ttf-freefont.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/ttf-freefont.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,7 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Free UCS TrueType Fonts
Source: http://savannah.nongnu.org/download/freefont/freefont-ttf-%{version}.tar.gz
-Source1: l10n-configure.sh
URL: http://savannah.nongnu.org/projects/freefont/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -36,7 +35,6 @@
%prep
%setup -q -c -n ttf-freefont
-bash -x %SOURCE1
%install
install -d ${RPM_BUILD_ROOT}%{font_dir}
--- a/usermode.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/usermode.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,11 +15,8 @@
Vendor: Sun Microsystems, Inc.
Summary: Tools for certain user account management tasks.
Source: usermode-%{version}.tar.bz2
-#FIXME Source1: usermode-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: usermode-01-dont-use-desktop-file-install.diff
Patch2: usermode-02-dont-use-libuser.diff
-Patch3: usermode-03-potfiles-in.diff
Patch4: usermode-04-remove-console-apps-user-support.diff
Patch5: usermode-05-bad-passwd-message.diff
Patch6: usermode-06-maintain-http-proxy.diff
@@ -63,10 +60,8 @@
%prep
%setup -q
-#FIXME /usr/bin/bzcat -dc %SOURCE1|tar xf -
%patch1
%patch2
-%patch3 -p1
%patch4
%patch5 -p1
%patch6
@@ -74,7 +69,6 @@
%patch8 -p1
%patch10 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/vino.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/vino.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,6 @@
Vendor: Sun Microsystems, Inc.
Summary: GNOME Remote Desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-#FIXME: Source1: vino-l10n-po-1.16.tar.bz2
-Source2: l10n-configure.sh
Patch1: vino-01-allow-resolution-change.diff
#FIXME GNOME210:
Patch8: vino-08-fix-a11y-hang.diff
@@ -48,11 +46,9 @@
%prep
%setup -q
-/usr/bin/bzcat -dc %SOURCE1|tar xf -
%patch1 -p1
%patch8 -p1
-bash -x %SOURCE2
%build
%ifos linux
--- a/vte.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/vte.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,10 +14,8 @@
Vendor: Sun Microsystems, Inc.
Summary: Terminal Emulation Widget Library
Source: http://ftp.gnome.org/pub/GNOME/sources/vte/0.11/vte-%{version}.tar.bz2
-#FIXME: Source1: vte-l10n-po-1.16.tar.bz2
-Source2: vte.1.gz
-Source3: libvte.3.gz
-Source4: l10n-configure.sh
+Source1: vte.1.gz
+Source2: libvte.3.gz
Patch1: vte-01-vtefc.diff
Patch2: vte-02-glib.diff
Patch3: vte-03-fcconfig.diff
@@ -70,7 +68,6 @@
%patch12 -p1
%patch13 -p1
-bash -x %SOURCE4
%build
%ifos linux
@@ -106,8 +103,8 @@
install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
# Clean up unpackaged files
rm $RPM_BUILD_ROOT%{_libdir}/*.a
rm $RPM_BUILD_ROOT%{_libdir}/*.la
--- a/webeyes.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/webeyes.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,11 +14,6 @@
Vendor: Sun Microsystems, Inc.
Summary: Web Eyes Applet
Source: webeyes-%{version}.tar.bz2
-#FIXME Source1: webeyes-l10n-po-1.16.tar.bz2
-Source2: webeyes_docs-0.3.tar.bz2
-#FIXME Source3: webeyes-l10n-online-help-ci-linux-1.2.tar.bz2
-Source4: l10n-configure.sh
-#FIXME Patch1: webeyes-01-l10n-online-help.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/webeyes
@@ -37,12 +32,6 @@
%prep
%setup -q
-#FIXME /usr/bin/bzcat -dc %SOURCE1| tar xf -
-/usr/bin/bzcat -dc %SOURCE2| tar xf -
-#FIXME /usr/bin/bzcat -dc %SOURCE3| tar xf -
-#FIXME %patch1 -p1
-
-bash -x %SOURCE4
%build
%ifos linux
--- a/xscreensaver.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/xscreensaver.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,8 +15,6 @@
Summary: Screensaver and locker
Source: http://www.jwz.org/xscreensaver/xscreensaver-4.10.tar.gz
Source1: xscreensaver.pamd
-Source2: xscreensaver-l10n-po-1.16.tar.bz2
-Source3: l10n-configure.sh
Patch1: xscreensaver-01-passwd-helper.diff
Patch2: xscreensaver-02-customise-hacks.diff
Patch3: xscreensaver-03-dot-desktop.diff
@@ -69,10 +67,6 @@
%patch12 -p1
%patch13 -p1
-bzcat %SOURCE2 | tar xf -
-
-bash -x %SOURCE3
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
--- a/yelp.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/yelp.spec Tue Aug 09 21:56:40 2005 +0000
@@ -15,10 +15,8 @@
Vendor: Sun Microsystems, Inc.
Summary: The GNOME 2.4 Help Browser
Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.5/yelp-%{version}.tar.bz2
-#FIXME Source1: yelp-l10n-po-1.16.tar.bz2
-Source2: gnome-help.1.gz
-Source3: yelp.1.gz
-Source4: l10n-configure.sh
+Source1: gnome-help.1.gz
+Source2: yelp.1.gz
Patch1: yelp-01-yelp-sections.diff
Patch2: yelp-02-solaris-compile.diff
URL: www.gnome.org
@@ -77,10 +75,6 @@
%patch2 -p1
%endif
-#FIXME bzcat %SOURCE1 | tar xf -
-
-bash -x %SOURCE4
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -108,8 +102,8 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
--- a/zenity.spec Tue Aug 09 11:42:33 2005 +0000
+++ b/zenity.spec Tue Aug 09 21:56:40 2005 +0000
@@ -14,14 +14,8 @@
Vendor: Sun Microsystems, Inc.
Summary: Show graphical dialog boxes from scripts
Source: http://ftp.gnome.org/pub/GNOME/sources/zenity/2.10/%{name}-%{version}.tar.bz2
-Source1: l10n-configure.sh
-#FIXME: Source2: zenity-l10n-po-1.16.tar.bz2
-Source3: zenity.1.gz
-Source4: gdialog.1.gz
-#FIXME: Source5: zenity-l10n-online-help-ci-linux-1.2.tar.bz2
-#FIXME: Source6: zenity-docs-0.2.tar.bz2
-#FIXME: Source7: zenity-docs-0.3linux.tar.bz2
-Patch1: zenity-01-l10n-online-help.diff
+Source1: zenity.1.gz
+Source2: gdialog.1.gz
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -53,17 +47,6 @@
%prep
%setup -q
-%ifos solaris
-#FIXME: bzcat %SOURCE6 | tar xf -
-%else
-#FIXME: bzcat %SOURCE7 | tar xf -
-%endif
-#FIXME: bzcat %SOURCE2 | tar xf -
-#FIXME: bzcat %SOURCE5 | tar xf -
-#FIXME: %patch1 -p1
-
-bash -x %SOURCE1
-
%build
%ifos linux
if [ -x /usr/bin/getconf ]; then
@@ -90,8 +73,8 @@
%install
make -i install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES