Mailinglist Archive: opensuse-commit (1318 mails)

< Previous Next >
commit sax2
  • From: root@xxxxxxx (h_root)
  • Date: Sat, 12 Aug 2006 19:03:15 +0200 (CEST)
  • Message-id: <20060812170315.C522695128@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package sax2
checked in at Sat Aug 12 19:03:15 CEST 2006.

--------
--- sax2/sax2.changes 2006-08-07 11:44:02.000000000 +0200
+++ sax2/sax2.changes 2006-08-12 11:52:02.000000000 +0200
@@ -1,0 +2,12 @@
+Sat Aug 12 11:51:27 CEST 2006 - thoenig@xxxxxxx
+
+- Add patch sax2-dbus-api-fix-thoenig-01.patch: Use
+ dbus_connection_close, not dbus_connection_disconnect
+
+-------------------------------------------------------------------
+Fri Aug 11 18:32:12 CEST 2006 - sndirsch@xxxxxxx
+
+- sax2-xorg-fontpath.patch:
+ * fixes wrong fontpath (Bug #198653)
+
+-------------------------------------------------------------------

New:
----
sax2-dbus-api-fix-thoenig-01.patch
sax2-xorg-fontpath.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.oz1d4c/_old 2006-08-12 19:03:09.000000000 +0200
+++ /var/tmp/diff_new_pack.oz1d4c/_new 2006-08-12 19:03:09.000000000 +0200
@@ -43,7 +43,7 @@
%endif
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 7
+Release: 8
Group: System/X11/Utilities
License: Other License(s), see package, GPL
Source: sax2.tar.bz2
@@ -52,6 +52,8 @@
Source1: sax2.desktop
%endif
Patch: sax2-xorg-include.patch
+Patch1: sax2-xorg-fontpath.patch
+Patch2: sax2-dbus-api-fix-thoenig-01.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390

@@ -66,7 +68,7 @@

%package -n sax2-tools
Version: 8.1
-Release: 7
+Release: 8
Summary: X Window System tools for SaX2
Group: System/X11/Utilities
Requires: coreutils
@@ -95,7 +97,7 @@

%package -n sax2-ident
Version: 8.1
-Release: 7
+Release: 8
Summary: SaX2 identity and profile information
Group: System/X11/Utilities
Requires: sax2-libsax-perl
@@ -114,7 +116,7 @@

%package -n sax2-gui
Version: 8.1
-Release: 7
+Release: 8
%if %{?suse_version:1}0
# SuSE Requires...
Requires: netpbm sax2-tools qt3 fvwm2 sax2
@@ -136,7 +138,7 @@

%package -n sax2-libsax
Version: 8.1
-Release: 7
+Release: 8
%if %{?suse_version:1}0
# SuSE Requires...
Requires: sax2-tools qt3 fvwm2 sax2
@@ -162,7 +164,7 @@

%package -n sax2-libsax-devel
Version: 8.1
-Release: 7
+Release: 8
Requires: sax2-libsax
Summary: SaX management library header files for X Window System-configuration development
Group: Development/Libraries/X11
@@ -179,7 +181,7 @@

%package -n sax2-libsax-perl
Version: 8.1
-Release: 7
+Release: 8
Requires: sax2-libsax
Summary: Language binding to use libsax with perl
Group: Development/Libraries/X11
@@ -196,7 +198,7 @@

%package -n sax2-libsax-python
Version: 8.1
-Release: 7
+Release: 8
Requires: sax2-libsax
%if %{?suse_version:1}0
# SuSE Requires...
@@ -219,7 +221,7 @@
%ifnarch ppc64 s390x
%package -n sax2-libsax-java
Version: 8.1
-Release: 7
+Release: 8
Requires: sax2-libsax jre1.2.x
Summary: Language binding to use libsax with java
Group: Development/Libraries/X11
@@ -239,6 +241,8 @@
%prep
%setup -n sax
%patch
+%patch1
+%patch2

%build
test -e /.buildenv && . /.buildenv
@@ -480,6 +484,12 @@
%endif

%changelog -n sax2
+* Sat Aug 12 2006 - thoenig@xxxxxxx
+- Add patch sax2-dbus-api-fix-thoenig-01.patch: Use
+ dbus_connection_close, not dbus_connection_disconnect
+* Fri Aug 11 2006 - sndirsch@xxxxxxx
+- sax2-xorg-fontpath.patch:
+ * fixes wrong fontpath (Bug #198653)
* Mon Aug 07 2006 - aj@xxxxxxx
- Fix build failure with xorg7 include files.
* Thu Jul 27 2006 - ms@xxxxxxx

++++++ sax2-dbus-api-fix-thoenig-01.patch ++++++
--- sysp/lib/libhd/hd/hal.c 2006-08-12 11:26:23.000000000 +0200
+++ sysp/lib/libhd/hd/hal.c 2006-08-12 11:26:41.000000000 +0200
@@ -217,7 +217,7 @@

libhal_ctx_free(hal_ctx);

- dbus_connection_disconnect(conn);
+ dbus_connection_close(conn);
dbus_connection_unref(conn);

dbus_error_free(&error);
++++++ sax2-xorg-fontpath.patch ++++++
diff -u -r ../sax.orig/api/data/LangFirstPath ./api/data/LangFirstPath
--- ../sax.orig/api/data/LangFirstPath 2006-08-11 18:27:46.000000000 +0200
+++ ./api/data/LangFirstPath 2006-08-11 18:29:12.000000000 +0200
@@ -1,19 +1,19 @@
[Format:(.*)=(.*)]
-de = /usr/lib/X11/fonts/misc:unscaled
-en = /usr/lib/X11/fonts/misc:unscaled
-fr = /usr/lib/X11/fonts/misc:unscaled
-it = /usr/lib/X11/fonts/latin1/75dpi
-es = /usr/lib/X11/fonts/misc:unscaled
-br = /usr/lib/X11/fonts/latin1/75dpi
-nl = /usr/lib/X11/fonts/misc:unscaled
-hu = /usr/lib/X11/fonts/latin2/75dpi
-pl = /usr/lib/X11/fonts/latin2/75dpi
-pt = /usr/lib/X11/fonts/misc:unscaled
-sk = /usr/lib/X11/fonts/latin2/75dpi
-ro = /usr/lib/X11/fonts/misc:unscaled
-el = /usr/lib/X11/fonts/latin7/75dpi
-id = /usr/lib/X11/fonts/latin1/75dpi
-ru = /usr/lib/X11/fonts/cyrillic
-cs = /usr/lib/X11/fonts/latin2/misc,/usr/lib/X11/fonts/latin2/75dpi,/usr/lib/X11/fonts/latin2/100dpi,/usr/lib/X11/fonts/latin2/Type1
-tr = /usr/lib/X11/fonts/latin5/misc,/usr/lib/X11/fonts/latin5/75dpi,/usr/lib/X11/fonts/latin5/100dpi
-jp = /usr/lib/X11/fonts/misc:unscaled,/usr/lib/X11/fonts/japanese:unscaled,/usr/lib/X11/fonts/baekmuk:unscaled
+de = /usr/share/fonts/misc:unscaled
+en = /usr/share/fonts/misc:unscaled
+fr = /usr/share/fonts/misc:unscaled
+it = /usr/share/fonts/latin1/75dpi
+es = /usr/share/fonts/misc:unscaled
+br = /usr/share/fonts/latin1/75dpi
+nl = /usr/share/fonts/misc:unscaled
+hu = /usr/share/fonts/latin2/75dpi
+pl = /usr/share/fonts/latin2/75dpi
+pt = /usr/share/fonts/misc:unscaled
+sk = /usr/share/fonts/latin2/75dpi
+ro = /usr/share/fonts/misc:unscaled
+el = /usr/share/fonts/latin7/75dpi
+id = /usr/share/fonts/latin1/75dpi
+ru = /usr/share/fonts/cyrillic
+cs = /usr/share/fonts/latin2/misc,/usr/share/fonts/latin2/75dpi,/usr/share/fonts/latin2/100dpi,/usr/share/fonts/latin2/Type1
+tr = /usr/share/fonts/latin5/misc,/usr/share/fonts/latin5/75dpi,/usr/share/fonts/latin5/100dpi
+jp = /usr/share/fonts/misc:unscaled,/usr/share/fonts/japanese:unscaled,/usr/share/fonts/baekmuk:unscaled
diff -u -r ../sax.orig/api/data/StaticFontPathList ./api/data/StaticFontPathList
--- ../sax.orig/api/data/StaticFontPathList 2006-08-11 18:27:46.000000000 +0200
+++ ./api/data/StaticFontPathList 2006-08-11 18:29:06.000000000 +0200
@@ -1,32 +1,32 @@
[Format:(.*)=(.*)]
-default=/usr/lib/X11/fonts/local
- /usr/lib/X11/fonts/misc:unscaled
- /usr/lib/X11/fonts/75dpi:unscaled
- /usr/lib/X11/fonts/100dpi:unscaled
- /usr/lib/X11/fonts/Type1
- /usr/lib/X11/fonts/URW
- /usr/lib/X11/fonts/Speedo
- /usr/lib/X11/fonts/PEX
- /usr/lib/X11/fonts/cyrillic
- /usr/lib/X11/fonts/latin2/misc:unscaled
- /usr/lib/X11/fonts/latin2/75dpi:unscaled
- /usr/lib/X11/fonts/latin2/100dpi:unscaled
- /usr/lib/X11/fonts/latin2/Type1
- /usr/lib/X11/fonts/latin7/75dpi:unscaled
- /usr/lib/X11/fonts/baekmuk:unscaled
- /usr/lib/X11/fonts/japanese:unscaled
- /usr/lib/X11/fonts/kwintv
- /usr/lib/X11/fonts/truetype
- /usr/lib/X11/fonts/uni:unscaled
- /usr/lib/X11/fonts/CID
- /usr/lib/X11/fonts/ucs/misc:unscaled
- /usr/lib/X11/fonts/ucs/75dpi:unscaled
- /usr/lib/X11/fonts/ucs/100dpi:unscaled
- /usr/lib/X11/fonts/hellas/misc:unscaled
- /usr/lib/X11/fonts/hellas/75dpi:unscaled
- /usr/lib/X11/fonts/hellas/100dpi:unscaled
- /usr/lib/X11/fonts/hellas/Type1
- /usr/lib/X11/fonts/misc/sgi:unscaled
- /usr/lib/X11/fonts/xtest
+default=/usr/share/fonts/local
+ /usr/share/fonts/misc:unscaled
+ /usr/share/fonts/75dpi:unscaled
+ /usr/share/fonts/100dpi:unscaled
+ /usr/share/fonts/Type1
+ /usr/share/fonts/URW
+ /usr/share/fonts/Speedo
+ /usr/share/fonts/PEX
+ /usr/share/fonts/cyrillic
+ /usr/share/fonts/latin2/misc:unscaled
+ /usr/share/fonts/latin2/75dpi:unscaled
+ /usr/share/fonts/latin2/100dpi:unscaled
+ /usr/share/fonts/latin2/Type1
+ /usr/share/fonts/latin7/75dpi:unscaled
+ /usr/share/fonts/baekmuk:unscaled
+ /usr/share/fonts/japanese:unscaled
+ /usr/share/fonts/kwintv
+ /usr/share/fonts/truetype
+ /usr/share/fonts/uni:unscaled
+ /usr/share/fonts/CID
+ /usr/share/fonts/ucs/misc:unscaled
+ /usr/share/fonts/ucs/75dpi:unscaled
+ /usr/share/fonts/ucs/100dpi:unscaled
+ /usr/share/fonts/hellas/misc:unscaled
+ /usr/share/fonts/hellas/75dpi:unscaled
+ /usr/share/fonts/hellas/100dpi:unscaled
+ /usr/share/fonts/hellas/Type1
+ /usr/share/fonts/misc/sgi:unscaled
+ /usr/share/fonts/xtest
/opt/kde3/share/fonts
unix/:7100
diff -u -r ../sax.orig/doc/appendix-api.tex ./doc/appendix-api.tex
--- ../sax.orig/doc/appendix-api.tex 2006-08-11 18:27:48.000000000 +0200
+++ ./doc/appendix-api.tex 2006-08-11 18:30:17.000000000 +0200
@@ -280,7 +280,7 @@
}
Path {
0 ServerFlags = AllowMouseOpenFail
- 0 FontPath = /usr/lib/X11/fonts/misc:unscaled
+ 0 FontPath = /usr/share/fonts/misc:unscaled
0 ModuleLoad = dbe,type1,speedo,extmod,freetype
}
Layout {
diff -u -r ../sax.orig/sysp/cfg.c ./sysp/cfg.c
--- ../sax.orig/sysp/cfg.c 2006-08-11 18:27:50.000000000 +0200
+++ ./sysp/cfg.c 2006-08-11 18:30:08.000000000 +0200
@@ -53,7 +53,7 @@
string XF86ConfigFile::DoFilesSection (void) {
string section;
section = "Section \"Files\"\n";
- section = section + " FontPath \"/usr/lib/X11/fonts/misc\"\n";
+ section = section + " FontPath \"/usr/share/fonts/misc\"\n";
section = section + "EndSection\n";
return(section);
}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >