Bug#907834: Some TEG annoyance/bug with the new porting
Yavor Doganov
yavor at gnu.org
Sat Sep 8 08:27:09 BST 2018
tags 907834 + patch
thanks
On Sun, 02 Sep 2018 16:12:14 +0300,
Luca Perico wrote:
> 1) in some case some single click seem send two troop instead of
> one(i am tapping on the trackpad)
Unfortunately I could not reproduce this with an ordinary mouse.
> 2) Zooming the map don't make the map expand
This is fixed.
> 3)if i click on a card to locate a country the area remain greyed on
> the map
Also fixed.
> 4) the Button bar can be hidden /or configured
Fixed with the third patch but it's up to the maintainer whether to
apply it, as it's a deviation from upstream code. (Although it could
be argued that GNOME/GTK+ 3 effectively forced application developers
to implement such functionality.)
> 5) in some case (in the fog of war mode seem but i am not sure) some
> country become unselectable when this the player extract the card and
> receive 2 troups.
Also fixed, this was a consequence from problem 3).
-------------- next part --------------
>From 2e7e098f1b7bc89506edbe2ade95154ae136a022 Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor at gnu.org>
Date: Fri, 7 Sep 2018 15:15:51 +0300
Subject: [PATCH 1/3] Fix the distclean target
---
debian/patches/fix_xml-doc-for-yelp.diff | 1425 ----------------------
debian/rules | 6 +
2 files changed, 6 insertions(+), 1425 deletions(-)
diff --git a/debian/patches/fix_xml-doc-for-yelp.diff b/debian/patches/fix_xml-doc-for-yelp.diff
index 26f1845..86d0e81 100644
--- a/debian/patches/fix_xml-doc-for-yelp.diff
+++ b/debian/patches/fix_xml-doc-for-yelp.diff
@@ -38,844 +38,6 @@ Subject: fix_xml-doc-for-yelp
delete mode 100644 docs/gnome-help/pl/teg.sgml
create mode 100644 docs/gnome-help/pl/teg.xml
-diff --git a/Makefile.in b/Makefile.in
-index 0b9dabc..925d8bb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -126,6 +126,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -203,13 +204,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -226,6 +223,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -245,18 +245,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/Makefile.in b/client/Makefile.in
-index 83fac01..e27d2ab 100644
---- a/client/Makefile.in
-+++ b/client/Makefile.in
-@@ -141,6 +141,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,13 +219,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -241,6 +238,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -260,18 +260,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/gui-gnome/Makefile.in b/client/gui-gnome/Makefile.in
-index 0e1b6d0..d74558f 100644
---- a/client/gui-gnome/Makefile.in
-+++ b/client/gui-gnome/Makefile.in
-@@ -144,6 +144,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -221,13 +222,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -244,6 +241,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -263,18 +263,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/gui-gnome/stock/Makefile.in b/client/gui-gnome/stock/Makefile.in
-index 64e0bb1..447d6a2 100644
---- a/client/gui-gnome/stock/Makefile.in
-+++ b/client/gui-gnome/stock/Makefile.in
-@@ -100,6 +100,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -177,13 +178,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -200,6 +197,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -219,18 +219,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/teg_pix/Makefile.in b/client/teg_pix/Makefile.in
-index b10d02c..3973e91 100644
---- a/client/teg_pix/Makefile.in
-+++ b/client/teg_pix/Makefile.in
-@@ -111,6 +111,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -188,13 +189,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -211,6 +208,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -230,18 +230,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/themes/Makefile.in b/client/themes/Makefile.in
-index 9b01584..940e999 100644
---- a/client/themes/Makefile.in
-+++ b/client/themes/Makefile.in
-@@ -109,6 +109,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -186,13 +187,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -209,6 +206,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -228,18 +228,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/themes/draco/Makefile.in b/client/themes/draco/Makefile.in
-index 4fbc768..f2a504f 100644
---- a/client/themes/draco/Makefile.in
-+++ b/client/themes/draco/Makefile.in
-@@ -110,6 +110,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,13 +188,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -210,6 +207,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -229,18 +229,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/themes/m2/Makefile.in b/client/themes/m2/Makefile.in
-index 21ea6a7..4dced1f 100644
---- a/client/themes/m2/Makefile.in
-+++ b/client/themes/m2/Makefile.in
-@@ -110,6 +110,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,13 +188,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -210,6 +207,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -229,18 +229,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/client/themes/sentimental/Makefile.in b/client/themes/sentimental/Makefile.in
-index a7cd861..2da74c1 100644
---- a/client/themes/sentimental/Makefile.in
-+++ b/client/themes/sentimental/Makefile.in
-@@ -110,6 +110,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,13 +188,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -210,6 +207,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -229,18 +229,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/common/Makefile.in b/common/Makefile.in
-index 0cfe40e..dfbd699 100644
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -124,6 +124,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -201,13 +202,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -224,6 +221,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -243,18 +243,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 8cae6bc..1490e05 100644
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
-@@ -109,6 +109,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -186,13 +187,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -209,6 +206,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -228,18 +228,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/docs/gnome-help/C/Makefile.in b/docs/gnome-help/C/Makefile.in
-index ad05353..1d0fb04 100644
---- a/docs/gnome-help/C/Makefile.in
-+++ b/docs/gnome-help/C/Makefile.in
-@@ -15,27 +15,27 @@
- @SET_MAKE@
-
- # To use this template:
--# 1) Define: figs, docname, lang, omffile, sgml_ents although figs,
--# omffile, and sgml_ents may be empty in your Makefile.am which
-+# 1) Define: figs, docname, lang, omffile, xml_ents although figs,
-+# omffile, and xml_ents may be empty in your Makefile.am which
- # will "include" this one
- # 2) Figures must go under figures/ and be in PNG format
- # 3) You should only have one document per directory
- #
- # Note that this makefile forces the directory name under
--# $prefix/share/gnome/help/ to be the same as the SGML filename
-+# $prefix/share/gnome/help/ to be the same as the XML filename
- # of the document. This is required by GNOME. eg:
--# $prefix/share/gnome/help/fish_applet/C/fish_applet.sgml
-+# $prefix/share/gnome/help/fish_applet/C/fish_applet.xml
- # ^^^^^^^^^^^ ^^^^^^^^^^^
- # Definitions:
- # figs A list of screenshots which will be included in EXTRA_DIST
- # Note that these should reside in figures/ and should be .png
- # files, or you will have to make modifications below.
--# docname This is the name of the SGML file: <docname>.sgml
-+# docname This is the name of the XML file: <docname>.xml
- # lang This is the document locale
- # omffile This is the name of the OMF file. Convention is to name
- # it <docname>-<locale>.omf.
--# sgml_ents This is a list of SGML entities which must be installed
--# with the main SGML file and included in EXTRA_DIST.
-+# xml_ents This is a list of XML entities which must be installed
-+# with the main XML file and included in EXTRA_DIST.
- # eg:
- # figs = \
- # figures/fig1.png \
-@@ -43,8 +43,8 @@
- # docname = scrollkeeper-manual
- # lang = C
- # omffile=scrollkeeper-manual-C.omf
--# sgml_ents = fdl.sgml
--# include $(top_srcdir)/help/sgmldocs.make
-+# xml_ents = fdl.xml
-+# include $(top_srcdir)/help/xmldocs.make
- # dist-hook: app-dist-hook
- #
-
-@@ -145,6 +145,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -222,13 +223,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -245,6 +242,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -264,18 +264,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -292,15 +296,14 @@ docname = teg
- lang = C
- omffile = teg-C.omf
- sgml_ents =
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
- doc_DATA = index.html
--sgml_files = $(sgml_ents) $(docname).sgml
-+xml_files = $(xml_ents) $(docname).xml
- omf_dir = $(top_srcdir)/omf-install
--EXTRA_DIST = $(sgml_files) $(doc_DATA) $(omffile) $(figs)
-+EXTRA_DIST = $(xml_files) $(doc_DATA) $(omffile) $(figs)
- CLEANFILES = omf_timestamp
- ourdir = `pwd`; \
- cd $(srcdir); \
-- cp $(sgml_ents) $$ourdir
-+ cp $(xml_ents) $$ourdir
-
- all: all-am
-
-@@ -493,24 +496,22 @@ omf: omf_timestamp
-
- omf_timestamp: $(omffile)
- -for file in $(omffile); do \
-- scrollkeeper-preinstall $(docdir)/$(docname).sgml $$file $(omf_dir)/$$file; \
-+ scrollkeeper-preinstall $(docdir)/$(docname).xml $$file $(omf_dir)/$$file; \
- done
- touch omf_timestamp
-
- index.html: $(docname)/index.html
- -cp $(docname)/index.html .
-
--$(docname).sgml: $(sgml_ents)
-+$(docname).xml: $(xml_ents)
-
- # The weird srcdir trick is because the db2html from the Cygnus RPMs
- # cannot handle relative filenames
- # Suse Linux 10.0 does not have "db2html", only "docbook2html" which is a script that calls "jw"
- # Check if any of those is available.
--$(docname)/index.html: $(srcdir)/$(docname).sgml
-+$(docname)/index.html: $(srcdir)/$(docname).xml
- -srcdir=`cd $(srcdir) && pwd`; \
-- test ! "x`which db2html`" = "x" && db2html $$srcdir/$(docname).sgml; \
-- test ! "x`which docbook2html`" = "x" && docbook2html $$srcdir/$(docname).sgml; \
-- test ! "x`which jw`" = "x" && jw -f docbook -b html $$srcdir/$(docname).sgml
-+ test ! "x`xmlto`" = "x" && xmlto --skip-validation html-nochunks html $$srcdir/$(docname).xml
-
- # remove $(docname) to make installation work
- app-dist-hook: index.html
-@@ -530,7 +531,7 @@ app-dist-hook: index.html
- install-data-am: index.html omf
- -$(mkinstalldirs) $(DESTDIR)$(docdir)/stylesheet-images
- -$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
-- -cp $(srcdir)/$(sgml_files) $(DESTDIR)$(docdir)
-+ -cp $(srcdir)/$(xml_files) $(DESTDIR)$(docdir)
- -for file in $(srcdir)/*.html $(srcdir)/$(docname)/*.css; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$$basefile; \
-@@ -547,13 +548,13 @@ install-data-am: index.html omf
- $(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(docdir); \
- fi
-
--$(docname).ps: $(srcdir)/$(docname).sgml
-+$(docname).ps: $(srcdir)/$(docname).xml
- -srcdir=`cd $(srcdir) && pwd`; \
-- db2ps $$srcdir/$(docname).sgml
-+ db2ps $$srcdir/$(docname).xml
-
--$(docname).rtf: $(srcdir)/$(docname).sgml
-+$(docname).rtf: $(srcdir)/$(docname).xml
- -srcdir=`cd $(srcdir) && pwd`; \
-- db2ps $$srcdir/$(docname).sgml
-+ db2ps $$srcdir/$(docname).xml
-
- uninstall-local:
- -for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
-@@ -568,7 +569,7 @@ uninstall-local:
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(DESTDIR)$(docdir)/$$basefile; \
- done
-- -for file in $(sgml_files); do \
-+ -for file in $(xml_files); do \
- rm -f $(DESTDIR)$(docdir)/$$file; \
- done
- -rmdir $(DESTDIR)$(docdir)/stylesheet-images
diff --git a/docs/gnome-help/C/teg-C.omf b/docs/gnome-help/C/teg-C.omf
index af542bf..9f2af39 100644
--- a/docs/gnome-help/C/teg-C.omf
@@ -1803,65 +965,6 @@ index 0000000..9416d99
+ </sect2>
+ </sect1>
+</article>
-diff --git a/docs/gnome-help/Makefile.in b/docs/gnome-help/Makefile.in
-index 1901e90..6e2cd70 100644
---- a/docs/gnome-help/Makefile.in
-+++ b/docs/gnome-help/Makefile.in
-@@ -109,6 +109,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -186,13 +187,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -209,6 +206,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -228,18 +228,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
diff --git a/docs/gnome-help/pl/Makefile.am b/docs/gnome-help/pl/Makefile.am
index 6ea9939..54d40bd 100644
--- a/docs/gnome-help/pl/Makefile.am
@@ -1873,239 +976,6 @@ index 6ea9939..54d40bd 100644
-include $(top_srcdir)/docs/gnome-help/pl/sgmldocs.make
+include $(top_srcdir)/docs/gnome-help/sgmldocs.make
dist-hook: app-dist-hook
-diff --git a/docs/gnome-help/pl/Makefile.in b/docs/gnome-help/pl/Makefile.in
-index 5154bd7..4a5d2a2 100644
---- a/docs/gnome-help/pl/Makefile.in
-+++ b/docs/gnome-help/pl/Makefile.in
-@@ -17,27 +17,27 @@
- # We need our own version of sgmldocs.make to get the Polish letters right!
-
- # To use this template:
--# 1) Define: figs, docname, lang, omffile, sgml_ents although figs,
--# omffile, and sgml_ents may be empty in your Makefile.am which
-+# 1) Define: figs, docname, lang, omffile, xml_ents although figs,
-+# omffile, and xml_ents may be empty in your Makefile.am which
- # will "include" this one
- # 2) Figures must go under figures/ and be in PNG format
- # 3) You should only have one document per directory
- #
- # Note that this makefile forces the directory name under
--# $prefix/share/gnome/help/ to be the same as the SGML filename
-+# $prefix/share/gnome/help/ to be the same as the XML filename
- # of the document. This is required by GNOME. eg:
--# $prefix/share/gnome/help/fish_applet/C/fish_applet.sgml
-+# $prefix/share/gnome/help/fish_applet/C/fish_applet.xml
- # ^^^^^^^^^^^ ^^^^^^^^^^^
- # Definitions:
- # figs A list of screenshots which will be included in EXTRA_DIST
- # Note that these should reside in figures/ and should be .png
- # files, or you will have to make modifications below.
--# docname This is the name of the SGML file: <docname>.sgml
-+# docname This is the name of the XML file: <docname>.xml
- # lang This is the document locale
- # omffile This is the name of the OMF file. Convention is to name
- # it <docname>-<locale>.omf.
--# sgml_ents This is a list of SGML entities which must be installed
--# with the main SGML file and included in EXTRA_DIST.
-+# xml_ents This is a list of XML entities which must be installed
-+# with the main XML file and included in EXTRA_DIST.
- # eg:
- # figs = \
- # figures/fig1.png \
-@@ -45,8 +45,8 @@
- # docname = scrollkeeper-manual
- # lang = C
- # omffile=scrollkeeper-manual-C.omf
--# sgml_ents = fdl.sgml
--# include $(top_srcdir)/help/sgmldocs.make
-+# xml_ents = fdl.xml
-+# include $(top_srcdir)/help/xmldocs.make
- # dist-hook: app-dist-hook
- #
-
-@@ -73,7 +73,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-- $(top_srcdir)/docs/gnome-help/pl/sgmldocs.make
-+ $(top_srcdir)/docs/gnome-help/sgmldocs.make
- subdir = docs/gnome-help/pl
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/macros/ggz.m4 \
-@@ -147,6 +147,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -224,13 +225,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -247,6 +244,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -266,18 +266,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -294,20 +298,19 @@ docname = teg
- lang = pl
- omffile = teg-pl.omf
- sgml_ents =
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
- doc_DATA = index.html
--sgml_files = $(sgml_ents) $(docname).sgml
-+xml_files = $(xml_ents) $(docname).xml
- omf_dir = $(top_srcdir)/omf-install
--EXTRA_DIST = $(sgml_files) $(doc_DATA) $(omffile) $(figs)
-+EXTRA_DIST = $(xml_files) $(doc_DATA) $(omffile) $(figs)
- CLEANFILES = omf_timestamp
- ourdir = `pwd`; \
- cd $(srcdir); \
-- cp $(sgml_ents) $$ourdir
-+ cp $(xml_ents) $$ourdir
-
- all: all-am
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docs/gnome-help/pl/sgmldocs.make $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docs/gnome-help/sgmldocs.make $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-@@ -371,7 +374,7 @@ CTAGS:
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/../../../docs/gnome-help/pl $(distdir)/figure
-+ $(mkdir_p) $(distdir)/../../../docs/gnome-help $(distdir)/figure
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
-@@ -495,37 +498,24 @@ omf: omf_timestamp
-
- omf_timestamp: $(omffile)
- -for file in $(omffile); do \
-- scrollkeeper-preinstall $(docdir)/$(docname).sgml $$file $(omf_dir)/$$file; \
-+ scrollkeeper-preinstall $(docdir)/$(docname).xml $$file $(omf_dir)/$$file; \
- done
- touch omf_timestamp
-
--# Used to contain "-cp $(docname)/index.html .", but that is pointless
- index.html: $(docname)/index.html
-+ -cp $(docname)/index.html .
-
--$(docname).sgml: $(sgml_ents)
-+$(docname).xml: $(xml_ents)
-
- # The weird srcdir trick is because the db2html from the Cygnus RPMs
- # cannot handle relative filenames
--
- # Suse Linux 10.0 does not have "db2html", only "docbook2html" which is a script that calls "jw"
- # Check if any of those is available.
--
--# Use "iconv" and "tidy" to convert the non-ASCII Polish letters to html-entities.
--# Do it in the following steps:
--# SGML iso8859-2 -> HTML iso8859-2 -> HTML UTF-8 -> HTML ASCII with entities
--$(docname)/index.html: $(srcdir)/$(docname).sgml
-+$(docname)/index.html: $(srcdir)/$(docname).xml
- -srcdir=`cd $(srcdir) && pwd`; \
-- test ! "x`which db2html`" = "x" && db2html $$srcdir/$(docname).sgml; \
-- test ! "x`which docbook2html`" = "x" && docbook2html $$srcdir/$(docname).sgml; \
-- test ! "x`which jw`" = "x" && jw -f docbook -b html $$srcdir/$(docname).sgml
--
-- -for file in *.html; do \
-- iconv -f iso-8859-2 -t utf-8 $$file > utf8_$$file; \
-- tidy --show-warnings no --quiet yes --input-encoding utf8 utf8_$$file > $$file; \
-- rm -f utf8_$$file; \
-- done
-+ test ! "x`xmlto`" = "x" && xmlto --skip-validation html-nochunks html $$srcdir/$(docname).xml
-
--# removed $(docname) to make thing install
-+# remove $(docname) to make installation work
- app-dist-hook: index.html
- -$(mkinstalldirs) $(distdir)/$(docname)/stylesheet-images
- -$(mkinstalldirs) $(distdir)/figures
-@@ -539,11 +529,11 @@ app-dist-hook: index.html
- cp $(srcdir)/topic.dat $(distdir); \
- fi
-
--# removed $(docname) to make things install
-+# remove $(docname) to make installation work
- install-data-am: index.html omf
- -$(mkinstalldirs) $(DESTDIR)$(docdir)/stylesheet-images
- -$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
-- -cp $(srcdir)/$(sgml_files) $(DESTDIR)$(docdir)
-+ -cp $(srcdir)/$(xml_files) $(DESTDIR)$(docdir)
- -for file in $(srcdir)/*.html $(srcdir)/$(docname)/*.css; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$$basefile; \
-@@ -560,13 +550,13 @@ install-data-am: index.html omf
- $(INSTALL_DATA) $(srcdir)/topic.dat $(DESTDIR)$(docdir); \
- fi
-
--$(docname).ps: $(srcdir)/$(docname).sgml
-+$(docname).ps: $(srcdir)/$(docname).xml
- -srcdir=`cd $(srcdir) && pwd`; \
-- db2ps $$srcdir/$(docname).sgml
-+ db2ps $$srcdir/$(docname).xml
-
--$(docname).rtf: $(srcdir)/$(docname).sgml
-+$(docname).rtf: $(srcdir)/$(docname).xml
- -srcdir=`cd $(srcdir) && pwd`; \
-- db2ps $$srcdir/$(docname).sgml
-+ db2ps $$srcdir/$(docname).xml
-
- uninstall-local:
- -for file in $(srcdir)/$(docname)/stylesheet-images/*.gif; do \
-@@ -581,7 +571,7 @@ uninstall-local:
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(DESTDIR)$(docdir)/$$basefile; \
- done
-- -for file in $(sgml_files); do \
-+ -for file in $(xml_files); do \
- rm -f $(DESTDIR)$(docdir)/$$file; \
- done
- -rmdir $(DESTDIR)$(docdir)/stylesheet-images
diff --git a/docs/gnome-help/pl/sgmldocs.make b/docs/gnome-help/pl/sgmldocs.make
deleted file mode 100644
index de10324..0000000
@@ -3364,298 +2234,3 @@ index edd3104..7415c95 100644
rm -f $(DESTDIR)$(docdir)/$$file; \
done
-rmdir $(DESTDIR)$(docdir)/stylesheet-images
-diff --git a/ggz/Makefile.in b/ggz/Makefile.in
-index bf4075a..14e54e3 100644
---- a/ggz/Makefile.in
-+++ b/ggz/Makefile.in
-@@ -101,6 +101,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -178,13 +179,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -201,6 +198,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -220,18 +220,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/macros/Makefile.in b/macros/Makefile.in
-index f5a2371..bfa1afa 100644
---- a/macros/Makefile.in
-+++ b/macros/Makefile.in
-@@ -100,6 +100,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -177,13 +178,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -200,6 +197,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -219,18 +219,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/metaserver/Makefile.in b/metaserver/Makefile.in
-index 7e5a583..a51a263 100644
---- a/metaserver/Makefile.in
-+++ b/metaserver/Makefile.in
-@@ -100,6 +100,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -177,13 +178,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -200,6 +197,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -219,18 +219,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/robot/Makefile.in b/robot/Makefile.in
-index 3caf4d5..da6b44f 100644
---- a/robot/Makefile.in
-+++ b/robot/Makefile.in
-@@ -123,6 +123,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -200,13 +201,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -223,6 +220,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -242,18 +242,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-diff --git a/server/Makefile.in b/server/Makefile.in
-index bca9e84..70c96b0 100644
---- a/server/Makefile.in
-+++ b/server/Makefile.in
-@@ -125,6 +125,7 @@ GGZSUPPORT_TRUE = @GGZSUPPORT_TRUE@
- GGZ_CONFIG = @GGZ_CONFIG@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -202,13 +203,9 @@ VERSION = @VERSION@
- XGETTEXT = @XGETTEXT@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -225,6 +222,9 @@ build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- ggz_config = @ggz_config@
- ggzdatadir = @ggzdatadir@
-@@ -244,18 +244,22 @@ host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- packagesrcdir = @packagesrcdir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
diff --git a/debian/rules b/debian/rules
index c8716ff..76fb5de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,12 @@ override_dh_auto_configure:
--sysconfdir=/etc
override_dh_auto_clean:
+# Upstream's tarball is not sane.
+ if grep "nordi/.eclipse" Makefile > /dev/null; then \
+ find -name Makefile -delete; \
+ fi
+ rm -f po/stamp-po po/*.gmo
+ dh_auto_clean
override_dh_installdocs:
dh_installdocs AUTHORS HACKING PEOPLE README.GGZ TODO
--
2.19.0.rc2
-------------- next part --------------
>From f392bcc74026ff03d0753862c8d39c96771da608 Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor at gnu.org>
Date: Fri, 7 Sep 2018 21:43:47 +0300
Subject: [PATCH 2/3] Fix regressions in the GTK+ 3 port reported by Luca
Perico (#907834)
---
debian/patches/goocanvas-gsettings-port.patch | 247 +++++++++---------
1 file changed, 127 insertions(+), 120 deletions(-)
diff --git a/debian/patches/goocanvas-gsettings-port.patch b/debian/patches/goocanvas-gsettings-port.patch
index 082bc01..2d68814 100644
--- a/debian/patches/goocanvas-gsettings-port.patch
+++ b/debian/patches/goocanvas-gsettings-port.patch
@@ -21,13 +21,14 @@ Description: Port to Goocanvas, GTK+ and GSettings.
GResource. AFAIU there is no other way to implement stock icons
(even app-specific) in GTK+ 3.
Bug-Debian: https://bugs.debian.org/885751
+Bug-Debian: https://bugs.debian.org/907834
Author: Yavor Doganov <yavor at gnu.org>
Forwarded: no
-Last-Update: 2018-08-30
+Last-Update: 2018-09-07
---
---- teg-0.11.2+debian.orig/client/gui-gnome/Makefile.am
-+++ teg-0.11.2+debian/client/gui-gnome/Makefile.am
+--- teg.orig/client/gui-gnome/Makefile.am
++++ teg/client/gui-gnome/Makefile.am
@@ -1,9 +1,8 @@
## Process this file with automake to produce Makefile.in
-Gamesdir = $(datadir)/gnome/apps/Games
@@ -81,8 +82,8 @@ Last-Update: 2018-08-30
- GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+data_convertdir = $(datadir)/GConf/gsettings
+dist_data_convert_DATA = teg.convert
---- teg-0.11.2+debian.orig/configure.in
-+++ teg-0.11.2+debian/configure.in
+--- teg.orig/configure.in
++++ teg/configure.in
@@ -12,7 +12,6 @@
AC_PROG_CC
AC_PROG_CPP
@@ -142,8 +143,8 @@ Last-Update: 2018-08-30
dnl DATADIRNAME is generated by AM_GNU_GETTEXT;
---- teg-0.11.2+debian.orig/client/gui-gnome/gui.c
-+++ teg-0.11.2+debian/client/gui-gnome/gui.c
+--- teg.orig/client/gui-gnome/gui.c
++++ teg/client/gui-gnome/gui.c
@@ -25,7 +25,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -379,8 +380,8 @@ Last-Update: 2018-08-30
return TEG_STATUS_SUCCESS;
}
---- teg-0.11.2+debian.orig/client/gui-gnome/priv.h
-+++ teg-0.11.2+debian/client/gui-gnome/priv.h
+--- teg.orig/client/gui-gnome/priv.h
++++ teg/client/gui-gnome/priv.h
@@ -22,8 +22,7 @@
#ifndef __TEG_GUI_GNOME_PRIV_H
#define __TEG_GUI_GNOME_PRIV_H
@@ -400,8 +401,8 @@ Last-Update: 2018-08-30
TEG_STATUS priv_init( void );
---- teg-0.11.2+debian.orig/client/gui-gnome/callbacks.h
-+++ teg-0.11.2+debian/client/gui-gnome/callbacks.h
+--- teg.orig/client/gui-gnome/callbacks.h
++++ teg/client/gui-gnome/callbacks.h
@@ -21,7 +21,7 @@
#ifndef __GUI_GNOME_CALLBACKS_H
#define __GUI_GNOME_CALLBACKS_H
@@ -425,8 +426,8 @@ Last-Update: 2018-08-30
+gboolean pre_client_recv(GIOChannel *source, GIOCondition cond, gpointer data);
#endif /* __GUI_GNOME_CALLBACKS_H */
---- teg-0.11.2+debian.orig/client/gui-gnome/g_country.h
-+++ teg-0.11.2+debian/client/gui-gnome/g_country.h
+--- teg.orig/client/gui-gnome/g_country.h
++++ teg/client/gui-gnome/g_country.h
@@ -24,7 +24,7 @@
#ifndef __TEG_GUI_GNOME_GCOUNTRY_H
#define __TEG_GUI_GNOME_GCOUNTRY_H
@@ -451,8 +452,8 @@ Last-Update: 2018-08-30
};
extern struct _G_countries G_countries[];
---- teg-0.11.2+debian.orig/client/gui-gnome/interface.h
-+++ teg-0.11.2+debian/client/gui-gnome/interface.h
+--- teg.orig/client/gui-gnome/interface.h
++++ teg/client/gui-gnome/interface.h
@@ -36,8 +36,6 @@
TEG_STATUS set_sensitive_tb(void);
void tropas_window( int src, int dst, int cant );
@@ -462,8 +463,8 @@ Last-Update: 2018-08-30
#endif /* __TEG_GUI_GNOME_INTERFACE_H */
---- teg-0.11.2+debian.orig/client/gui-gnome/dices.h
-+++ teg-0.11.2+debian/client/gui-gnome/dices.h
+--- teg.orig/client/gui-gnome/dices.h
++++ teg/client/gui-gnome/dices.h
@@ -26,6 +26,6 @@
void dices_view();
@@ -472,8 +473,8 @@ Last-Update: 2018-08-30
+void dices_init(GooCanvasItem *root);
#endif
---- teg-0.11.2+debian.orig/client/gui-gnome/armies.h
-+++ teg-0.11.2+debian/client/gui-gnome/armies.h
+--- teg.orig/client/gui-gnome/armies.h
++++ teg/client/gui-gnome/armies.h
@@ -27,7 +27,7 @@
typedef struct _armies_pos {
int cant;
@@ -483,8 +484,8 @@ Last-Update: 2018-08-30
} ARMIES_POS, *PARMIES_POS;
TEG_STATUS armies_add(int country);
---- teg-0.11.2+debian.orig/client/gui-gnome/colors.h
-+++ teg-0.11.2+debian/client/gui-gnome/colors.h
+--- teg.orig/client/gui-gnome/colors.h
++++ teg/client/gui-gnome/colors.h
@@ -51,18 +51,15 @@
extern GdkPixbuf *g_color_players[];
extern GdkPixbuf *g_color_circles[];
@@ -510,8 +511,8 @@ Last-Update: 2018-08-30
char * get_tag_for_color( int color );
char * get_background_for_color( int c );
char * get_foreground_for_color( int c );
---- teg-0.11.2+debian.orig/client/gui-gnome/callbacks.c
-+++ teg-0.11.2+debian/client/gui-gnome/callbacks.c
+--- teg.orig/client/gui-gnome/callbacks.c
++++ teg/client/gui-gnome/callbacks.c
@@ -25,7 +25,8 @@
# include <config.h>
#endif
@@ -678,8 +679,8 @@ Last-Update: 2018-08-30
+ gtk_show_uri_on_window (GTK_WINDOW (main_window), "ghelp:teg",
+ GDK_CURRENT_TIME, NULL);
}
---- teg-0.11.2+debian.orig/client/gui-gnome/interface.c
-+++ teg-0.11.2+debian/client/gui-gnome/interface.c
+--- teg.orig/client/gui-gnome/interface.c
++++ teg/client/gui-gnome/interface.c
@@ -33,7 +33,8 @@
#include <unistd.h>
#include <string.h>
@@ -962,7 +963,7 @@ Last-Update: 2018-08-30
}
#endif
return TEG_STATUS_SUCCESS;
-@@ -388,48 +184,59 @@
+@@ -388,48 +184,60 @@
static TEG_STATUS canvas_create_map( void )
{
char *filename;
@@ -975,6 +976,7 @@ Last-Update: 2018-08-30
- canvas_map = gnome_canvas_new ();
- root = gnome_canvas_root(GNOME_CANVAS(canvas_map));
+ canvas_map = goo_canvas_new ();
++ g_object_set (canvas_map, "anchor", GOO_CANVAS_ANCHOR_CENTER, NULL);
+ root = goo_canvas_get_root_item(GOO_CANVAS(canvas_map));
filename = theme_load_file( gui_theme.board );
@@ -1039,7 +1041,7 @@ Last-Update: 2018-08-30
/**
* @fn GtkWidget* create_mainwin (void)
* Crea la ventana principal
-@@ -438,6 +245,40 @@
+@@ -438,6 +246,40 @@
{
GtkWidget *app1;
GtkWidget *dock1;
@@ -1080,7 +1082,7 @@ Last-Update: 2018-08-30
GtkWidget *eventbox1;
GtkWidget *viewport1;
GtkWidget *vbox_main;
-@@ -449,54 +290,359 @@
+@@ -449,54 +291,359 @@
GtkWidget *sw;
GtkWidget *ahbox;
@@ -1467,11 +1469,8 @@ Last-Update: 2018-08-30
gtk_widget_show (vbox_main);
gtk_container_add (GTK_CONTAINER (viewport1), vbox_main);
-@@ -504,11 +650,12 @@
- if( mainstatus_create(&window_mainstatus) != TEG_STATUS_SUCCESS )
- goto error;
+@@ -506,9 +653,9 @@
gtk_box_pack_start( GTK_BOX(vbox_main), window_mainstatus, FALSE,FALSE,0);
-+ gtk_widget_set_halign (window_mainstatus, GTK_ALIGN_CENTER);
/* paned */
- paned = gtk_vpaned_new();
@@ -1482,7 +1481,7 @@ Last-Update: 2018-08-30
gtk_paned_add1(GTK_PANED(paned), vbox_paned);
gtk_widget_show (vbox_paned);
-@@ -517,19 +664,23 @@
+@@ -517,19 +664,22 @@
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(scrolledwindow),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
@@ -1497,7 +1496,6 @@ Last-Update: 2018-08-30
gtk_container_add(GTK_CONTAINER(scrolledwindow), canvas_map);
- gtk_container_add(GTK_CONTAINER(vbox_paned),scrolledwindow);
-+ gtk_widget_set_halign(vbox_paned, GTK_ALIGN_CENTER);
+ gtk_box_pack_start(GTK_BOX(vbox_paned), scrolledwindow, TRUE, TRUE, 0);
gtk_widget_show (canvas_map);
gtk_widget_show (scrolledwindow);
@@ -1509,7 +1507,7 @@ Last-Update: 2018-08-30
gtk_paned_pack2(GTK_PANED(paned), ahbox, TRUE, TRUE);
sw = gtk_scrolled_window_new(NULL, NULL);
-@@ -570,30 +721,27 @@
+@@ -570,30 +720,27 @@
/* status bar */
@@ -1549,7 +1547,7 @@ Last-Update: 2018-08-30
}
gtk_widget_show(app1);
-@@ -614,125 +762,125 @@
+@@ -614,125 +761,125 @@
/* CONNECT & START */
if( e == PLAYER_STATUS_DESCONECTADO ) {
@@ -1712,7 +1710,7 @@ Last-Update: 2018-08-30
}
-@@ -743,21 +891,22 @@
+@@ -743,21 +890,22 @@
/*
* tropas
*/
@@ -1745,7 +1743,7 @@ Last-Update: 2018-08-30
}
/* shows how many armies you can move after an attack */
-@@ -774,43 +923,36 @@
+@@ -774,43 +922,36 @@
tropas_src = src;
tropas_dst = dst;
@@ -1804,7 +1802,7 @@ Last-Update: 2018-08-30
snprintf(buf,sizeof(buf)-1,_("You conquered '%s' in your attack from '%s'!!\n"), countries_get_name(dst), countries_get_name(src) );
buf[ sizeof(buf) -1 ] = 0;
-@@ -818,13 +960,14 @@
+@@ -818,13 +959,14 @@
gtk_box_pack_start( GTK_BOX( vbox), label, TRUE, TRUE, 0);
if( cant > 0) {
@@ -1821,7 +1819,7 @@ Last-Update: 2018-08-30
gtk_box_pack_start( GTK_BOX( hbox), tropas_hscale_cant, TRUE, TRUE, 0);
gtk_scale_set_digits(GTK_SCALE(tropas_hscale_cant), 0);
gtk_scale_set_draw_value(GTK_SCALE(tropas_hscale_cant),1);
-@@ -838,27 +981,32 @@
+@@ -838,27 +980,32 @@
gtk_container_add (GTK_CONTAINER (frame), vbox);
@@ -1865,7 +1863,7 @@ Last-Update: 2018-08-30
}
/* window that shows armies to move in a regroup */
-@@ -875,54 +1023,50 @@
+@@ -875,54 +1022,50 @@
reagrupe_src = src;
reagrupe_dst = dst;
@@ -1937,7 +1935,7 @@ Last-Update: 2018-08-30
gtk_box_pack_start( GTK_BOX( hbox), reagrupe_hscale_cant, TRUE, TRUE, 0);
gtk_scale_set_digits(GTK_SCALE(reagrupe_hscale_cant), 0);
-@@ -936,11 +1080,10 @@
+@@ -936,11 +1079,10 @@
gtk_container_add (GTK_CONTAINER (frame), vbox);
@@ -1951,8 +1949,8 @@ Last-Update: 2018-08-30
gtk_widget_show_all (reagrupe_dialog);
else
gtk_widget_destroy (reagrupe_dialog);
---- teg-0.11.2+debian.orig/client/gui-gnome/g_cont.h
-+++ teg-0.11.2+debian/client/gui-gnome/g_cont.h
+--- teg.orig/client/gui-gnome/g_cont.h
++++ teg/client/gui-gnome/g_cont.h
@@ -22,17 +22,17 @@
#ifndef __TEG_GUI_GNOME_GCONT_H
#define __TEG_GUI_GNOME_GCONT_H
@@ -1974,8 +1972,8 @@ Last-Update: 2018-08-30
int G_cont_tot();
#endif /* __TEG_GUI_GNOME_GCONT_H */
---- teg-0.11.2+debian.orig/client/gui-gnome/chatline.c
-+++ teg-0.11.2+debian/client/gui-gnome/chatline.c
+--- teg.orig/client/gui-gnome/chatline.c
++++ teg/client/gui-gnome/chatline.c
@@ -15,7 +15,8 @@
#include <config.h>
#endif
@@ -1986,8 +1984,8 @@ Last-Update: 2018-08-30
#include <stdio.h>
#include <stdlib.h>
---- teg-0.11.2+debian.orig/client/gui-gnome/priv.c
-+++ teg-0.11.2+debian/client/gui-gnome/priv.c
+--- teg.orig/client/gui-gnome/priv.c
++++ teg/client/gui-gnome/priv.c
@@ -22,7 +22,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -2014,8 +2012,8 @@ Last-Update: 2018-08-30
gui_private.country_i_am = -1;
return TEG_STATUS_SUCCESS;
---- teg-0.11.2+debian.orig/client/gui-gnome/support.c
-+++ teg-0.11.2+debian/client/gui-gnome/support.c
+--- teg.orig/client/gui-gnome/support.c
++++ teg/client/gui-gnome/support.c
@@ -30,7 +30,8 @@
#include <stdio.h>
#include <iconv.h>
@@ -2336,8 +2334,8 @@ Last-Update: 2018-08-30
}
gchar *translate_to_utf8(const gchar *string )
---- teg-0.11.2+debian.orig/client/gui-gnome/support.h
-+++ teg-0.11.2+debian/client/gui-gnome/support.h
+--- teg.orig/client/gui-gnome/support.h
++++ teg/client/gui-gnome/support.h
@@ -27,7 +27,7 @@
void teg_dialog( char* title, char* bigtitle, char* data );
GtkWidget* teg_dialog_new( char* title, char* bigtitle );
@@ -2347,8 +2345,8 @@ Last-Update: 2018-08-30
gchar *translate_to_utf8(const gchar *string );
#endif /* __TEG_GUI_GNOME_SUPPORT_H */
---- teg-0.11.2+debian.orig/client/gui-gnome/g_cont.c
-+++ teg-0.11.2+debian/client/gui-gnome/g_cont.c
+--- teg.orig/client/gui-gnome/g_cont.c
++++ teg/client/gui-gnome/g_cont.c
@@ -21,7 +21,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -2379,8 +2377,8 @@ Last-Update: 2018-08-30
- NULL));
+ NULL);
}
---- teg-0.11.2+debian.orig/client/gui-gnome/g_country.c
-+++ teg-0.11.2+debian/client/gui-gnome/g_country.c
+--- teg.orig/client/gui-gnome/g_country.c
++++ teg/client/gui-gnome/g_country.c
@@ -24,7 +24,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -3111,8 +3109,8 @@ Last-Update: 2018-08-30
return TEG_STATUS_SUCCESS;
}
---- teg-0.11.2+debian.orig/client/gui-gnome/stock.c
-+++ teg-0.11.2+debian/client/gui-gnome/stock.c
+--- teg.orig/client/gui-gnome/stock.c
++++ teg/client/gui-gnome/stock.c
@@ -19,65 +19,16 @@
*/
@@ -3186,8 +3184,8 @@ Last-Update: 2018-08-30
+ theme = gtk_icon_theme_get_default ();
+ gtk_icon_theme_add_resource_path (theme, "/net/sf/teg/icons");
}
---- teg-0.11.2+debian.orig/client/gui-gnome/cards.c
-+++ teg-0.11.2+debian/client/gui-gnome/cards.c
+--- teg.orig/client/gui-gnome/cards.c
++++ teg/client/gui-gnome/cards.c
@@ -26,7 +26,8 @@
# include <config.h>
#endif
@@ -3487,8 +3485,8 @@ Last-Update: 2018-08-30
}
}
---- teg-0.11.2+debian.orig/client/gui-gnome/dices.c
-+++ teg-0.11.2+debian/client/gui-gnome/dices.c
+--- teg.orig/client/gui-gnome/dices.c
++++ teg/client/gui-gnome/dices.c
@@ -26,7 +26,8 @@
# include <config.h>
#endif
@@ -3653,8 +3651,8 @@ Last-Update: 2018-08-30
}
for(i=0;i<3;i++) {
---- teg-0.11.2+debian.orig/client/gui-gnome/mission.c
-+++ teg-0.11.2+debian/client/gui-gnome/mission.c
+--- teg.orig/client/gui-gnome/mission.c
++++ teg/client/gui-gnome/mission.c
@@ -26,7 +26,8 @@
# include <config.h>
#endif
@@ -4023,8 +4021,8 @@ Last-Update: 2018-08-30
- raise_and_focus(dialog);
+ gtk_dialog_run(GTK_DIALOG(dialog));
}
---- teg-0.11.2+debian.orig/client/gui-gnome/status.c
-+++ teg-0.11.2+debian/client/gui-gnome/status.c
+--- teg.orig/client/gui-gnome/status.c
++++ teg/client/gui-gnome/status.c
@@ -26,7 +26,9 @@
#endif
@@ -4335,7 +4333,7 @@ Last-Update: 2018-08-30
TEG_STATUS mainstatus_create( GtkWidget **window )
{
int i;
-@@ -452,15 +369,17 @@
+@@ -452,15 +369,19 @@
if( mainstatus_canvas )
goto error;
@@ -4353,10 +4351,12 @@ Last-Update: 2018-08-30
+ MAINSTATUS_X, MAINSTATUS_Y + 1 );
+ goo_canvas_set_bounds (GOO_CANVAS (mainstatus_canvas), 0, 0,
+ MAINSTATUS_X, MAINSTATUS_Y);
++ g_object_set (mainstatus_canvas, "anchor",
++ GOO_CANVAS_ANCHOR_CENTER, NULL);
/* background */
if( gui_theme.toolbar_custom && gui_theme.toolbar_name )
-@@ -470,133 +389,124 @@
+@@ -470,133 +391,124 @@
im = gdk_pixbuf_new_from_file(filename, NULL);
if( im ) {
@@ -4562,7 +4562,7 @@ Last-Update: 2018-08-30
mainstatus_update();
-@@ -622,29 +532,30 @@
+@@ -622,29 +534,30 @@
i=0;
@@ -4599,7 +4599,7 @@ Last-Update: 2018-08-30
players_color[i],
"pixbuf", g_color_circles[pJ->color],
"x", (double) PLAYERS_COLORS_OFFSET + (i%3) * 14,
-@@ -664,22 +575,24 @@
+@@ -664,22 +577,24 @@
{
PCPLAYER pJ;
@@ -4628,7 +4628,7 @@ Last-Update: 2018-08-30
return TEG_STATUS_SUCCESS;
}
-@@ -688,9 +601,9 @@
+@@ -688,9 +603,9 @@
{
char buffer[256];
static int offset_right=-1, offset_left=-1;
@@ -4641,7 +4641,7 @@ Last-Update: 2018-08-30
if( ! mainstatus_canvas )
-@@ -703,80 +616,85 @@
+@@ -703,80 +618,85 @@
}
/* game status */
@@ -4766,8 +4766,8 @@ Last-Update: 2018-08-30
}
}
---- teg-0.11.2+debian.orig/client/gui-gnome/connect.c
-+++ teg-0.11.2+debian/client/gui-gnome/connect.c
+--- teg.orig/client/gui-gnome/connect.c
++++ teg/client/gui-gnome/connect.c
@@ -28,8 +28,8 @@
#endif
@@ -5302,8 +5302,8 @@ Last-Update: 2018-08-30
}
---- teg-0.11.2+debian.orig/client/gui-gnome/armies.c
-+++ teg-0.11.2+debian/client/gui-gnome/armies.c
+--- teg.orig/client/gui-gnome/armies.c
++++ teg/client/gui-gnome/armies.c
@@ -26,7 +26,8 @@
# include <config.h>
#endif
@@ -5634,8 +5634,8 @@ Last-Update: 2018-08-30
}
initialized=1;
---- teg-0.11.2+debian.orig/client/gui-gnome/colors.c
-+++ teg-0.11.2+debian/client/gui-gnome/colors.c
+--- teg.orig/client/gui-gnome/colors.c
++++ teg/client/gui-gnome/colors.c
@@ -24,7 +24,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -5816,8 +5816,8 @@ Last-Update: 2018-08-30
+ return G_colores[NR_COLORS-1].ellip_color;
return G_colores[c].ellip_color;
}
---- teg-0.11.2+debian.orig/client/gui-gnome/preferences.c
-+++ teg-0.11.2+debian/client/gui-gnome/preferences.c
+--- teg.orig/client/gui-gnome/preferences.c
++++ teg/client/gui-gnome/preferences.c
@@ -26,7 +26,7 @@
# include <config.h>
#endif
@@ -6451,8 +6451,8 @@ Last-Update: 2018-08-30
+ gtk_dialog_run (GTK_DIALOG (pref_dialog));
+ gtk_widget_destroy (pref_dialog);
}
---- teg-0.11.2+debian.orig/client/gui-gnome/g_scores.c
-+++ teg-0.11.2+debian/client/gui-gnome/g_scores.c
+--- teg.orig/client/gui-gnome/g_scores.c
++++ teg/client/gui-gnome/g_scores.c
@@ -26,7 +26,8 @@
#endif
@@ -6797,8 +6797,8 @@ Last-Update: 2018-08-30
gtk_container_add (GTK_CONTAINER (frame),GTK_WIDGET(mini_scores_clist));
}
---- teg-0.11.2+debian.orig/client/gui-gnome/locate_country.c
-+++ teg-0.11.2+debian/client/gui-gnome/locate_country.c
+--- teg.orig/client/gui-gnome/locate_country.c
++++ teg/client/gui-gnome/locate_country.c
@@ -24,7 +24,7 @@
# include <config.h>
#endif
@@ -6813,7 +6813,7 @@ Last-Update: 2018-08-30
if( list_locate_countries[i].is_hidden ) {
list_locate_countries[i].is_hidden = FALSE;
- gnome_canvas_item_show( G_countries[ list_locate_countries[i].country ].country_item );
-+ g_object_set( G_countries[ list_locate_countries[i].country ].country_item, "visibility", TRUE, NULL );
++ g_object_set( G_countries[ list_locate_countries[i].country ].country_item, "visibility", GOO_CANVAS_ITEM_VISIBLE, NULL );
if( ++list_locate_countries[i].number_times_refreshed == MAX_REFRESHES_COUNTRY ) {
locate_country_init_entry( &list_locate_countries[i] );
@@ -6821,7 +6821,7 @@ Last-Update: 2018-08-30
} else {
list_locate_countries[i].is_hidden = TRUE;
- gnome_canvas_item_hide( G_countries[ list_locate_countries[i].country ].country_item );
-+ g_object_set( G_countries[ list_locate_countries[i].country ].country_item, "visibility", FALSE, NULL );
++ g_object_set( G_countries[ list_locate_countries[i].country ].country_item, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL );
}
}
@@ -6831,8 +6831,8 @@ Last-Update: 2018-08-30
list_locate_armies[i].is_hidden = FALSE;
- gnome_canvas_item_show( G_countries[ list_locate_armies[i].country ].ellip_item );
- gnome_canvas_item_show( G_countries[ list_locate_armies[i].country ].text_item );
-+ g_object_set( G_countries[ list_locate_armies[i].country ].ellip_item, "visibility", TRUE, NULL );
-+ g_object_set( G_countries[ list_locate_armies[i].country ].text_item, "visibility", TRUE, NULL );
++ g_object_set( G_countries[ list_locate_armies[i].country ].ellip_item, "visibility", GOO_CANVAS_ITEM_VISIBLE, NULL );
++ g_object_set( G_countries[ list_locate_armies[i].country ].text_item, "visibility", GOO_CANVAS_ITEM_VISIBLE, NULL );
if( ++list_locate_armies[i].number_times_refreshed == MAX_REFRESHES_ARMY ) {
locate_country_init_entry( &list_locate_armies[i] );
@@ -6841,8 +6841,8 @@ Last-Update: 2018-08-30
list_locate_armies[i].is_hidden = TRUE;
- gnome_canvas_item_hide( G_countries[ list_locate_armies[i].country ].ellip_item );
- gnome_canvas_item_hide( G_countries[ list_locate_armies[i].country ].text_item );
-+ g_object_set( G_countries[ list_locate_armies[i].country ].ellip_item, "visibility", FALSE, NULL );
-+ g_object_set( G_countries[ list_locate_armies[i].country ].text_item, "visibility", FALSE, NULL );
++ g_object_set( G_countries[ list_locate_armies[i].country ].ellip_item, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL );
++ g_object_set( G_countries[ list_locate_armies[i].country ].text_item, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL );
}
}
@@ -6865,8 +6865,8 @@ Last-Update: 2018-08-30
return TEG_STATUS_SUCCESS;
}
--- /dev/null
-+++ teg-0.11.2+debian/client/gui-gnome/tegcanvasimage.c
-@@ -0,0 +1,696 @@
++++ teg/client/gui-gnome/tegcanvasimage.c
+@@ -0,0 +1,704 @@
+/*
+ * GooCanvas. Copyright (C) 2005 Damon Chaplin.
+ * Released under the GNU LGPL license. See COPYING for details.
@@ -7087,7 +7087,6 @@ Last-Update: 2018-08-30
+ if (pixbuf)
+ {
+ image_data->pattern = goo_canvas_cairo_pattern_from_pixbuf (pixbuf);
-+ image_data->pixbuf = gdk_pixbuf_copy (pixbuf);
+ image_data->width = gdk_pixbuf_get_width (pixbuf);
+ image_data->height = gdk_pixbuf_get_height (pixbuf);
+
@@ -7113,8 +7112,6 @@ Last-Update: 2018-08-30
+ {
+ cairo_pattern_destroy (image->image_data->pattern);
+ image->image_data->pattern = NULL;
-+ g_object_unref (image->image_data->pixbuf);
-+ image->image_data->pixbuf = NULL;
+ }
+
+ G_OBJECT_CLASS (teg_canvas_image_parent_class)->dispose (object);
@@ -7277,18 +7274,29 @@ Last-Update: 2018-08-30
+{
+ TegCanvasImage *image = (TegCanvasImage*) simple;
+ TegCanvasImageData *image_data = image->image_data;
-+ guchar *src;
++ cairo_surface_t *surface;
++ unsigned char *rawdata;
++ guint32 *pixel;
++ int alpha, stride;
+
+ if (x < image_data->x || (x > image_data->x + image_data->width)
+ || y < image_data->y || (y > image_data->y + image_data->height))
+ return FALSE;
+
++ cairo_pattern_get_surface (image_data->pattern, &surface);
++
++ if (cairo_surface_get_type (surface) != CAIRO_SURFACE_TYPE_IMAGE
++ || cairo_image_surface_get_format (surface) != CAIRO_FORMAT_ARGB32)
++ return TRUE;
++
+ /* Check whether the pixel where the pointer is is translucent. */
-+ src = gdk_pixbuf_get_pixels (image_data->pixbuf)
-+ + (int) y * gdk_pixbuf_get_rowstride (image_data->pixbuf)
-+ + (int) x * gdk_pixbuf_get_n_channels (image_data->pixbuf);
++ cairo_surface_flush (surface);
++ rawdata = cairo_image_surface_get_data (surface);
++ stride = cairo_image_surface_get_stride (surface);
++ pixel = (guint32*) (rawdata + ((int) (y - image_data->y)) * stride);
++ alpha = (pixel[(int) (x - image_data->x)] & 0xff000000) >> 24;
+
-+ if (src[3] < 128)
++ if (alpha == 0)
+ return FALSE;
+
+ return TRUE;
@@ -7564,8 +7572,8 @@ Last-Update: 2018-08-30
+ iface->create_item = teg_canvas_image_model_create_item;
+}
--- /dev/null
-+++ teg-0.11.2+debian/client/gui-gnome/tegcanvasimage.h
-@@ -0,0 +1,96 @@
++++ teg/client/gui-gnome/tegcanvasimage.h
+@@ -0,0 +1,95 @@
+/*
+ * GooCanvas. Copyright (C) 2005 Damon Chaplin.
+ * Released under the GNU LGPL license. See COPYING for details.
@@ -7581,7 +7589,6 @@ Last-Update: 2018-08-30
+struct _TegCanvasImageData
+{
+ cairo_pattern_t *pattern;
-+ GdkPixbuf *pixbuf;
+
+ gdouble x, y, width, height;
+};
@@ -7663,7 +7670,7 @@ Last-Update: 2018-08-30
+ gdouble y,
+ ...);
--- /dev/null
-+++ teg-0.11.2+debian/client/gui-gnome/stock.gresource.xml
++++ teg/client/gui-gnome/stock.gresource.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
@@ -7674,8 +7681,8 @@ Last-Update: 2018-08-30
+ <file alias="stock-viewplayers.xpm">stock/stock-viewplayers.xpm</file>
+ </gresource>
+</gresources>
---- teg-0.11.2+debian.orig/client/gui-gnome/stock.h
-+++ teg-0.11.2+debian/client/gui-gnome/stock.h
+--- teg.orig/client/gui-gnome/stock.h
++++ teg/client/gui-gnome/stock.h
@@ -29,10 +29,10 @@
#define STOCK_ZOOM_FIT "TEG_stock_zoom_fit"
#define STOCK_ZOOM_IN "TEG_stock_zoom_in"
@@ -7692,7 +7699,7 @@ Last-Update: 2018-08-30
void stock_init (void);
--- /dev/null
-+++ teg-0.11.2+debian/po/Makevars
++++ teg/po/Makevars
@@ -0,0 +1,53 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
@@ -7747,8 +7754,8 @@ Last-Update: 2018-08-30
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
---- teg-0.11.2+debian.orig/client/gui-gnome/robot.xpm
-+++ teg-0.11.2+debian/client/gui-gnome/robot.xpm
+--- teg.orig/client/gui-gnome/robot.xpm
++++ teg/client/gui-gnome/robot.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * robot_xpm[] = {
@@ -7756,8 +7763,8 @@ Last-Update: 2018-08-30
"21 19 9 1",
" c None",
". c #F91616",
---- teg-0.11.2+debian.orig/client/teg_pix/teg_icono.xpm
-+++ teg-0.11.2+debian/client/teg_pix/teg_icono.xpm
+--- teg.orig/client/teg_pix/teg_icono.xpm
++++ teg/client/teg_pix/teg_icono.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * teg_icono_xpm[] = {
@@ -7765,8 +7772,8 @@ Last-Update: 2018-08-30
"49 48 839 2",
" c None",
". c #BA833A",
---- teg-0.11.2+debian.orig/client/gui-gnome/connect.h
-+++ teg-0.11.2+debian/client/gui-gnome/connect.h
+--- teg.orig/client/gui-gnome/connect.h
++++ teg/client/gui-gnome/connect.h
@@ -24,6 +24,7 @@
#ifndef __GUI_GNOME_CONECTAR_H
#define __GUI_GNOME_CONECTAR_H
@@ -7776,7 +7783,7 @@ Last-Update: 2018-08-30
void gametype_view();
void colortype_view( char *colores);
--- /dev/null
-+++ teg-0.11.2+debian/client/gui-gnome/net.sf.teg.gschema.xml
++++ teg/client/gui-gnome/net.sf.teg.gschema.xml
@@ -0,0 +1,44 @@
+<schemalist gettext-domain="teg">
+ <schema id="net.sf.teg" path="/net/sf/teg/">
@@ -7823,7 +7830,7 @@ Last-Update: 2018-08-30
+ </schema>
+</schemalist>
--- /dev/null
-+++ teg-0.11.2+debian/client/gui-gnome/teg.convert
++++ teg/client/gui-gnome/teg.convert
@@ -0,0 +1,11 @@
+[net.sf.teg]
+port = /apps/teg/port
@@ -7836,7 +7843,7 @@ Last-Update: 2018-08-30
+status-show = /apps/teg/status_show
+dialog-show = /apps/teg/dialog_show
+robot-in-server = /apps/teg/robot_in_server
---- teg-0.11.2+debian.orig/client/gui-gnome/teg.schemas
+--- teg.orig/client/gui-gnome/teg.schemas
+++ /dev/null
@@ -1,126 +0,0 @@
-<gconfschemafile>
@@ -7965,8 +7972,8 @@ Last-Update: 2018-08-30
- </schemalist>
-
-</gconfschemafile>
---- teg-0.11.2+debian.orig/client/gui-gnome/teg.desktop
-+++ teg-0.11.2+debian/client/gui-gnome/teg.desktop
+--- teg.orig/client/gui-gnome/teg.desktop
++++ teg/client/gui-gnome/teg.desktop
@@ -6,7 +6,7 @@
Comment[es]=Cliente del Tenes Empanadas Graciela
Comment[de]=Client für Tenes Empanadas Graciela
@@ -7976,8 +7983,8 @@ Last-Update: 2018-08-30
Terminal=false
Type=Application
Categories=GTK;GNOME;Game;StrategyGame;
---- teg-0.11.2+debian.orig/po/POTFILES.in
-+++ teg-0.11.2+debian/po/POTFILES.in
+--- teg.orig/po/POTFILES.in
++++ teg/po/POTFILES.in
@@ -46,6 +46,7 @@
client/gui-gnome/stock.c
client/gui-gnome/support.c
--
2.19.0.rc2
-------------- next part --------------
>From d38892a210037adab0178ecec785cb7561dcd26c Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor at gnu.org>
Date: Sat, 8 Sep 2018 09:38:56 +0300
Subject: [PATCH 3/3] Make the toolbar configurable (#907834)
---
debian/patches/configurable-toolbar.patch | 205 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 206 insertions(+)
create mode 100644 debian/patches/configurable-toolbar.patch
diff --git a/debian/patches/configurable-toolbar.patch b/debian/patches/configurable-toolbar.patch
new file mode 100644
index 0000000..e9e08f9
--- /dev/null
+++ b/debian/patches/configurable-toolbar.patch
@@ -0,0 +1,205 @@
+Description: Make the toolbar configurable.
+Bug-Debian: https://bugs.debian.org/907834
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2018-09-08
+---
+
+--- teg.orig/client/gui-gnome/interface.c
++++ teg/client/gui-gnome/interface.c
+@@ -50,6 +50,7 @@
+ #include "dices.h"
+ #include "themes.h"
+ #include "fonts.h"
++#include "priv.h"
+
+ #include "robot.xpm"
+
+@@ -57,6 +58,7 @@
+
+ GtkTextView *main_message_area = NULL;
+ GtkWidget *main_window = NULL;
++GtkWidget *toolbar_main = NULL;
+ GtkWidget *statusbar = NULL;
+ GtkWidget *canvas_map = NULL;
+ GtkWidget *window_mainstatus = NULL;
+@@ -270,7 +272,6 @@
+ GtkWidget *help_menu;
+ GtkWidget *manual_menu;
+ GtkWidget *about_menu;
+- GtkWidget *toolbar_main;
+ GtkWidget *image;
+ GtkToolItem *button1;
+ GtkToolItem *button2;
+@@ -540,7 +541,8 @@
+ gtk_widget_show_all (menubar);
+
+ toolbar_main = gtk_toolbar_new ();
+- gtk_toolbar_set_style (GTK_TOOLBAR (toolbar_main), GTK_TOOLBAR_BOTH);
++ g_settings_bind (settings, "toolbar-style", toolbar_main,
++ "toolbar-style", G_SETTINGS_BIND_DEFAULT);
+ gtk_widget_show (toolbar_main);
+ gtk_container_add (GTK_CONTAINER (dock1), toolbar_main);
+
+--- teg.orig/client/gui-gnome/interface.h
++++ teg/client/gui-gnome/interface.h
+@@ -28,6 +28,7 @@
+ extern GtkTextView *main_message_area;
+ extern GtkWidget *text_scrollbar;
+ extern GtkWidget *main_window;
++extern GtkWidget *toolbar_main;
+ extern GtkWidget *statusbar;
+ extern GtkWidget *canvas_map;
+
+--- teg.orig/client/gui-gnome/net.sf.teg.gschema.xml
++++ teg/client/gui-gnome/net.sf.teg.gschema.xml
+@@ -1,4 +1,12 @@
+ <schemalist gettext-domain="teg">
++
++ <enum id="net.sf.teg.ToolbarStyle">
++ <value nick="both" value="0"/>
++ <value nick="both-horiz" value="1"/>
++ <value nick="icons" value="2"/>
++ <value nick="text" value="3"/>
++ </enum>
++
+ <schema id="net.sf.teg" path="/net/sf/teg/">
+ <key name="port" type="i">
+ <default>2000</default>
+@@ -36,6 +44,16 @@
+ <default>7</default>
+ <summary>Which dialogs should be shown</summary>
+ </key>
++ <key name="toolbar-visibility" type="b">
++ <default>true</default>
++ <summary>Toolbar visibility</summary>
++ </key>
++ <key name="toolbar-style" enum="net.sf.teg.ToolbarStyle">
++ <default>'both'</default>
++ <summary>Toolbar style</summary>
++ <description>Valid values are "both", "both-horiz", "icons" and
++ "text".</description>
++ </key>
+ <key name="robot-in-server" type="b">
+ <default>true</default>
+ <summary>Launch robot in server</summary>
+--- teg.orig/client/gui-gnome/preferences.c
++++ teg/client/gui-gnome/preferences.c
+@@ -45,10 +45,12 @@
+ static GtkWidget *conf_cb_showmsgcolor=NULL;
+ static GtkWidget *conf_cb_showinf=NULL;
+
+-/** dialogs */
++/** dialogs & toolbar */
+ static GtkWidget *conf_cb_showattackturn=NULL;
+ static GtkWidget *conf_cb_showplacearmies=NULL;
+ static GtkWidget *conf_cb_showregrouparmies=NULL;
++static GtkWidget *conf_cb_showtoolbar=NULL;
++static GtkWidget *conf_cb_toolbarstyle=NULL;
+
+ /** themes */
+ static char *theme_activated=NULL;
+@@ -118,6 +120,27 @@
+ }
+
+ static void
++toolbar_style_cb (GtkComboBox *combo, gpointer data)
++{
++ gint sel;
++
++ sel = gtk_combo_box_get_active (combo);
++ g_settings_set_enum (settings, "toolbar-style", sel);
++}
++
++static void
++show_toolbar_cb (GtkToggleButton *button, gpointer data)
++{
++ if (gtk_toggle_button_get_active (button)) {
++ g_settings_set_boolean (settings, "toolbar-visibility", TRUE);
++ gtk_widget_show (toolbar_main);
++ } else {
++ g_settings_set_boolean (settings, "toolbar-visibility", FALSE);
++ gtk_widget_hide (toolbar_main);
++ }
++}
++
++static void
+ free_str (GtkWidget *widget, void *data)
+ {
+ free (data);
+@@ -324,6 +347,8 @@
+ GtkWidget *dialog_frame;
+ GtkWidget *robot_frame;
+ GtkWidget *theme_frame_sel, *theme_vbox;
++ GtkWidget *toolbar_frame, *toolbar_vbox;
++ GtkComboBoxText *combo;
+ GtkWidget *vbox, *hbox;
+ GtkWidget *omenu, *nb;
+
+@@ -496,7 +521,8 @@
+ gtk_container_add (GTK_CONTAINER (robot_frame), vbox);
+
+
+- /* Dialogs Options */
++ /* Dialogs & Toolbar Options */
++ toolbar_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, GNOME_PAD);
+ dialog_frame = gtk_frame_new (_("Popup Dialogs"));
+ gtk_container_set_border_width (GTK_CONTAINER (dialog_frame), GNOME_PAD);
+
+@@ -519,7 +545,44 @@
+ gtk_box_pack_start( GTK_BOX(vbox), conf_cb_showplacearmies, FALSE, FALSE, 0);
+
+ gtk_container_add (GTK_CONTAINER (dialog_frame), vbox);
++ gtk_box_pack_start (GTK_BOX (toolbar_vbox), dialog_frame,
++ TRUE, TRUE, 0);
++
++ toolbar_frame = gtk_frame_new (_("Toolbar Visibility & Style"));
++ gtk_container_set_border_width (GTK_CONTAINER (toolbar_frame),
++ GNOME_PAD);
++ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
++ gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD);
++ conf_cb_showtoolbar
++ = gtk_check_button_new_with_label (_("Show toolbar"));
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (conf_cb_showtoolbar),
++ g_settings_get_boolean (settings,
++ "toolbar-visibility"));
++ g_signal_connect (conf_cb_showtoolbar, "toggled",
++ G_CALLBACK (show_toolbar_cb), NULL);
++ gtk_box_pack_start (GTK_BOX (hbox), conf_cb_showtoolbar,
++ TRUE, TRUE, 0);
++
++ label = gtk_label_new (_("Toolbar style:"));
++ gtk_widget_set_halign (label, GTK_ALIGN_END);
++ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
++
++ conf_cb_toolbarstyle = gtk_combo_box_text_new ();
++ combo = GTK_COMBO_BOX_TEXT (conf_cb_toolbarstyle);
++ gtk_combo_box_text_append_text (combo, _("Text Below Icons"));
++ gtk_combo_box_text_append_text (combo, _("Priority Text Beside Icons"));
++ gtk_combo_box_text_append_text (combo, _("Icons Only"));
++ gtk_combo_box_text_append_text (combo, _("Text Only"));
++ gtk_combo_box_set_active (GTK_COMBO_BOX (combo),
++ g_settings_get_enum (settings,
++ "toolbar-style"));
++ g_signal_connect (combo, "changed",
++ G_CALLBACK (toolbar_style_cb), NULL);
++ gtk_box_pack_start (GTK_BOX (hbox), conf_cb_toolbarstyle,
++ TRUE, TRUE, 0);
+
++ gtk_container_add (GTK_CONTAINER (toolbar_frame), hbox);
++ gtk_container_add (GTK_CONTAINER (toolbar_vbox), toolbar_frame);
+
+ /** end **/
+
+@@ -552,9 +615,9 @@
+ gtk_notebook_append_page (GTK_NOTEBOOK (nb),
+ robot_frame, label);
+
+- label = gtk_label_new (_("Popup Dialogs"));
++ label = gtk_label_new (_("Dialogs & Toolbar"));
+ gtk_notebook_append_page (GTK_NOTEBOOK (nb),
+- dialog_frame, label);
++ toolbar_vbox, label);
+
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 33a8fa6..5bf3379 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ keywords.patch
unescaped-left-brace.patch
remove-deprecated-USE_GNOME2_MACROS.patch
goocanvas-gsettings-port.patch
+configurable-toolbar.patch
--
2.19.0.rc2
More information about the Pkg-games-devel
mailing list