December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-libfontenc
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package xorg-x11-libfontenc checked in at Tue Dec 19 17:27:52 CET 2006. -------- --- xorg-x11-libfontenc/xorg-x11-libfontenc.changes 2006-10-14 06:20:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-libfontenc/xorg-x11-libfontenc.changes 2006-12-18 11:03:20.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 18 11:02:59 CET 2006 - sndirsch(a)suse.de + +- updated to release 1.0.4 + * Makefile.am: make ChangeLog hook safer + +------------------------------------------------------------------- Old: ---- libfontenc-1.0.3.tar.bz2 New: ---- libfontenc-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libfontenc.spec ++++++ --- /var/tmp/diff_new_pack.wgvoD7/_old 2006-12-19 17:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.wgvoD7/_new 2006-12-19 17:27:37.000000000 +0100 @@ -11,11 +11,11 @@ # norootforbuild Name: xorg-x11-libfontenc -%define dirsuffix 1.0.3 +%define dirsuffix 1.0.4 BuildRequires: pkgconfig xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 1 +Release: 14 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -77,6 +77,9 @@ /usr/%{_lib}/pkgconfig/*.pc %changelog -n xorg-x11-libfontenc +* Mon Dec 18 2006 - sndirsch(a)suse.de +- updated to release 1.0.4 + * Makefile.am: make ChangeLog hook safer * Sat Oct 14 2006 - sndirsch(a)suse.de - updated to X.Org 7.2RC1 * Tue Aug 15 2006 - sndirsch(a)suse.de ++++++ libfontenc-1.0.3.tar.bz2 -> libfontenc-1.0.4.tar.bz2 ++++++ ++++ 15346 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-1.0.3/ChangeLog new/libfontenc-1.0.4/ChangeLog --- old/libfontenc-1.0.3/ChangeLog 2006-10-13 21:18:06.000000000 +0200 +++ new/libfontenc-1.0.4/ChangeLog 2006-12-16 00:20:11.000000000 +0100 @@ -1,3 +1,22 @@ +commit 1b4ca41a58016053220047b9f77a2eec812c03a0 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 01:19:45 2006 +0200 + + bump to 1.0.4 + +commit 38855c00c9efe88af97a5f8208c2e6aef0e9e93f +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Dec 6 18:57:29 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + +commit 111a9501c2c01d4b4f00ed221035953bfb256898 +Author: Adam Jackson <ajax(a)benzedrine.nwnk.net> +Date: Fri Oct 13 15:20:48 2006 -0400 + + Bump to 1.0.3 + commit fc19e19275c213f5122b120e7b45f63c302916a1 Author: Adam Jackson <ajax(a)benzedrine.nwnk.net> Date: Thu Oct 12 18:35:04 2006 -0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-1.0.3/Makefile.am new/libfontenc-1.0.4/Makefile.am --- old/libfontenc-1.0.3/Makefile.am 2006-10-13 00:34:31.000000000 +0200 +++ new/libfontenc-1.0.4/Makefile.am 2006-12-06 17:57:17.000000000 +0100 @@ -27,9 +27,10 @@ EXTRA_DIST = fontenc.pc.in autogen.sh ChangeLog CLEANFILES = ChangeLog -ChangeLog: FORCE - git-log > ChangeLog -FORCE: +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog if LINT lint: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-1.0.3/config.h.in new/libfontenc-1.0.4/config.h.in --- old/libfontenc-1.0.3/config.h.in 2006-10-13 21:18:06.000000000 +0200 +++ new/libfontenc-1.0.4/config.h.in 2006-12-16 00:20:00.000000000 +0100 @@ -51,6 +51,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libfontenc-1.0.3/configure.ac new/libfontenc-1.0.4/configure.ac --- old/libfontenc-1.0.3/configure.ac 2006-10-13 20:57:56.000000000 +0200 +++ new/libfontenc-1.0.4/configure.ac 2006-12-16 00:19:36.000000000 +0100 @@ -23,7 +23,7 @@ AC_PREREQ([2.57]) -AC_INIT(libfontenc, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libfontenc) +AC_INIT(libfontenc, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libfontenc) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit solfege
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package solfege checked in at Tue Dec 19 17:27:30 CET 2006. -------- --- solfege/solfege.changes 2006-11-07 13:58:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/solfege/solfege.changes 2006-12-19 17:06:40.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 19 17:02:30 CET 2006 - tiwai(a)suse.de + +- updated to version 3.6.4: + * preferences window fix + * fix source code encoding + * fix some po files + +------------------------------------------------------------------- Old: ---- solfege-3.6.3.tar.bz2 New: ---- solfege-3.6.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solfege.spec ++++++ --- /var/tmp/diff_new_pack.YfsCHZ/_old 2006-12-19 17:26:20.000000000 +0100 +++ /var/tmp/diff_new_pack.YfsCHZ/_new 2006-12-19 17:26:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package solfege (Version 3.6.3) +# spec file for package solfege (Version 3.6.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,9 +14,9 @@ BuildRequires: docbook-xsl-stylesheets gnome-doc-utils libxslt python-devel python-gtk-devel update-desktop-files %define my_provides /tmp/my-provides Summary: Eartraining program -Version: 3.6.3 -Release: 10 -License: GNU General Public License (GPL) - all versions +Version: 3.6.4 +Release: 1 +License: GNU General Public License (GPL) Group: Productivity/Multimedia/Sound/Utilities Source: %{name}-%{version}.tar.bz2 Patch: solfege-configure-fix.dif @@ -81,6 +81,11 @@ %{_datadir}/applications/*.desktop %changelog -n solfege +* Tue Dec 19 2006 - tiwai(a)suse.de +- updated to version 3.6.4: + * preferences window fix + * fix source code encoding + * fix some po files * Tue Nov 07 2006 - ro(a)suse.de - fix icon permissions * Wed Oct 18 2006 - tiwai(a)suse.de ++++++ solfege-3.6.3.tar.bz2 -> solfege-3.6.4.tar.bz2 ++++++ ++++ 12195 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qv
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package qv checked in at Tue Dec 19 17:26:15 CET 2006. -------- --- qv/qv.changes 2006-10-20 16:17:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/qv/qv.changes 2006-12-19 17:16:48.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 19 17:16:28 CET 2006 - kukuk(a)suse.de + +- Version 0.6 + - Display GPS coordinates + +------------------------------------------------------------------- Old: ---- qv-0.5.tar.bz2 New: ---- qv-0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qv.spec ++++++ --- /var/tmp/diff_new_pack.7jpBOe/_old 2006-12-19 17:26:07.000000000 +0100 +++ /var/tmp/diff_new_pack.7jpBOe/_new 2006-12-19 17:26:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qv (Version 0.5) +# spec file for package qv (Version 0.6) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,9 +13,9 @@ Name: qv Summary: Quick Viewer for Pictures and Slideshows BuildRequires: gtk2-devel libexif -Version: 0.5 +Version: 0.6 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Autoreqprov: on Prefix: %{_prefix} Group: Productivity/Graphics/Viewers @@ -45,6 +45,9 @@ %{_bindir}/qv %changelog -n qv +* Tue Dec 19 2006 - kukuk(a)suse.de +- Version 0.6 + - Display GPS coordinates * Fri Oct 20 2006 - kukuk(a)suse.de - Version 0.5 - Fix fullscreen mode without WM ++++++ qv-0.5.tar.bz2 -> qv-0.6.tar.bz2 ++++++ ++++ 2453 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qv-0.5/ChangeLog new/qv-0.6/ChangeLog --- old/qv-0.5/ChangeLog 2006-10-20 16:15:47.000000000 +0200 +++ new/qv-0.6/ChangeLog 2006-12-19 17:12:26.000000000 +0100 @@ -1,4 +1,17 @@ -2006-10-20 Thorsten Kukuk <kukuk(a)suse.de> +2006-12-19 Thorsten Kukuk <kukuk(a)thkukuk.de> + + * release version 0.6 + + * src/exif.c (callback_exif_entry): Finalize GPS data display. + +2006-11-25 Thorsten Kukuk <kukuk(a)thkukuk.de> + + * src/event_handler.c (event_handler): Open image with gimp. + + * src/exif.c (callback_exif_entry): Add first support for + GPS data. + +2006-10-20 Thorsten Kukuk <kukuk(a)thkukuk.de> * release version 0.5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qv-0.5/NEWS new/qv-0.6/NEWS --- old/qv-0.5/NEWS 2006-10-20 16:01:16.000000000 +0200 +++ new/qv-0.6/NEWS 2006-12-19 17:13:47.000000000 +0100 @@ -4,6 +4,9 @@ Please send bug reports, questions and suggestions to <kukuk(a)thkukuk.de>. +* Version 0.6 +- Show GPS coordinates from Exif data + * Version 0.5 - Support fullscreen mode without windowmanager diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qv-0.5/configure.in new/qv-0.6/configure.in --- old/qv-0.5/configure.in 2006-10-20 16:01:24.000000000 +0200 +++ new/qv-0.6/configure.in 2006-12-19 17:12:11.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/qv.c) -AM_INIT_AUTOMAKE(qv, 0.5) +AM_INIT_AUTOMAKE(qv, 0.6) AM_CONFIG_HEADER(config.h) AC_SUBST(PACKAGE) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qv-0.5/src/event_handler.c new/qv-0.6/src/event_handler.c --- old/qv-0.5/src/event_handler.c 2006-10-20 15:46:27.000000000 +0200 +++ new/qv-0.6/src/event_handler.c 2006-12-19 14:20:04.000000000 +0100 @@ -46,6 +46,7 @@ N_("e Display EXIF data"), N_("E Edit image note file"), N_("f Fullscreen mode on/off"), + N_("g Open image with gimp"), N_("h Histogram on/off"), N_("i Statusbar on/off"), N_("m Maxpect on/off"), @@ -168,6 +169,25 @@ } +static void +run_gimp (qv_image *q) +{ + pid_t pid; + int i; + + pid = fork (); + + if (pid > 0) /* parent */ + return; + + for (i = 0; i < sysconf (_SC_OPEN_MAX); i++) + close (i); + + execlp ("gimp", "gimp", q->image_name, NULL); + fprintf (stderr, _("execlp failed: %m\n")); +} + + void event_handler (GdkEvent *ev, gpointer data) { @@ -519,6 +539,11 @@ } break; + /* Open image with gimp */ + case 'g': + run_gimp (q); + break; + /* Histogram on/off */ case 'h': histogram ^= 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qv-0.5/src/exif.c new/qv-0.6/src/exif.c --- old/qv-0.5/src/exif.c 2006-10-16 14:35:34.000000000 +0200 +++ new/qv-0.6/src/exif.c 2006-12-19 14:58:10.000000000 +0100 @@ -29,11 +29,14 @@ #include "qv.h" -#define MAX_LINES 16 +#define MAX_LINES 17 static void callback_exif_entry (ExifEntry *ee, void *user_data) { + static int have_gps_data = 0; + static char *gps_latitude, *gps_latitude_ref; + static char *gps_longitude, *gps_longitude_ref; char **output = (char **)user_data; char buf[1024]; const char *name = exif_tag_get_name (ee->tag); @@ -41,7 +44,7 @@ exif_entry_get_value (ee, buf, sizeof (buf)); - // printf ("name=[%s], value=[%s]\n", name, buf); + //printf ("name=[%s], value=[%s]\n", name, buf); if (strcasecmp (name, "Make") == 0) asprintf (&output[0], "%20s: %s", title, buf); @@ -73,6 +76,59 @@ asprintf (&output[11], "%20s: %s", title, buf); else if (strcasecmp (name, "ExposureBias") == 0) asprintf (&output[12], "%20s: %s", title, buf); + else if (strcasecmp (name, "GPSVersionID") == 0) + have_gps_data = 5; + else if (strcasecmp (name, "InteroperabilityIndex") == 0) + { + if (have_gps_data) + { + --have_gps_data; + gps_latitude_ref = strdup (buf); + } + } + else if (strcasecmp (name, "InteroperabilityVersion") == 0) + { + if (have_gps_data) + { + --have_gps_data; + gps_latitude = strdup (buf); + } + } + else if (strcasecmp (name, "GPSLongitudeRef") == 0) + { + --have_gps_data; + gps_longitude_ref = strdup (buf); + } + else if (strcasecmp (name, "GPSLongitude") == 0) + { + --have_gps_data; + gps_longitude = strdup (buf); + } + + if (have_gps_data == 1) + { + double lat_deg, lat_min, lat_sec; + double long_deg, long_min, long_sec; + have_gps_data = 0; + + sscanf (gps_latitude, "%lf, %lf, %lf", &lat_deg, &lat_min, &lat_sec); + sscanf (gps_longitude, "%lf, %lf, %lf", &long_deg, &long_min, &long_sec); + + setlocale (LC_NUMERIC, "POSIX"); + + asprintf (&output[13], "%20s: %g deg %g' %g'' %s, %g deg %g' %g'' %s", + _("GPS Position"), + lat_deg, lat_min, lat_sec, gps_latitude_ref, + long_deg, long_min, long_sec, gps_longitude_ref); + + free (gps_latitude); + free (gps_latitude_ref); + free (gps_longitude); + free (gps_longitude_ref); + + setlocale (LC_NUMERIC, ""); + } + } static void @@ -123,9 +179,9 @@ sizeof (buf)); if (strcasecmp (name, "FirmwareVersion") == 0) - asprintf (&output[14], "%20s: %s", title, value); - else if (strcasecmp (name, "OwnerName") == 0) asprintf (&output[15], "%20s: %s", title, value); + else if (strcasecmp (name, "OwnerName") == 0) + asprintf (&output[16], "%20s: %s", title, value); else if (strcasecmp (name, "Long focal length of lens") == 0) longfocal = strdup (value); else if (strcasecmp (name, "Short focal length of lens") @@ -135,7 +191,7 @@ } if (shortfocal || longfocal) { - asprintf (&output[13], "%20s: %s-%s", _("Lens"), + asprintf (&output[14], "%20s: %s-%s", _("Lens"), shortfocal, longfocal); if (shortfocal) free (shortfocal); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-File-MMagic
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package perl-File-MMagic checked in at Tue Dec 19 17:24:11 CET 2006. -------- --- perl-File-MMagic/perl-File-MMagic.changes 2006-01-25 21:39:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-File-MMagic/perl-File-MMagic.changes 2006-12-19 17:07:12.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Dec 19 17:01:02 CET 2006 - mfabian(a)suse.de + +- update to 1.27 (required by namazu 2.0.16). + • MMagic.pm (checktype_data): performance improve. + http://www.namazu.org/trac-namazu/trac.cgi/ticket/8 + • MMagic.pm (magicMatchStr): Fixed time waste problem. + • MMagic.pm (__DATA__): Perfomance tuning for mknmz. + http://www.namazu.org/pipermail/namazu-devel-ja/2005-December/000793.html + +------------------------------------------------------------------- Old: ---- File-MMagic-1.22.tar.bz2 New: ---- File-MMagic-1.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-MMagic.spec ++++++ --- /var/tmp/diff_new_pack.FXCXPC/_old 2006-12-19 17:20:46.000000000 +0100 +++ /var/tmp/diff_new_pack.FXCXPC/_new 2006-12-19 17:20:46.000000000 +0100 @@ -1,11 +1,11 @@ # -# spec file for package perl-File-MMagic (Version 1.22) +# spec file for package perl-File-MMagic (Version 1.27) # -# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -18,9 +18,9 @@ Requires: perl = %{perl_version} Autoreqprov: on Summary: Perl modules to guess file types -Version: 1.22 +Version: 1.27 Release: 1 -Source: File-MMagic-%{version}.tar.bz2 +Source: http://search.cpan.org/CPAN/authors/id/K/KN/KNOK/File-MMagic-%{version}.tar… BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +54,13 @@ /var/adm/perl-modules/perl-File-MMagic %changelog -n perl-File-MMagic +* Tue Dec 19 2006 - mfabian(a)suse.de +- update to 1.27 (required by namazu 2.0.16). + • MMagic.pm (checktype_data): performance improve. + http://www.namazu.org/trac-namazu/trac.cgi/ticket/8 + • MMagic.pm (magicMatchStr): Fixed time waste problem. + • MMagic.pm (__DATA__): Perfomance tuning for mknmz. + http://www.namazu.org/pipermail/namazu-devel-ja/2005-December/000793.html * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jul 29 2004 - ro(a)suse.de ++++++ File-MMagic-1.22.tar.bz2 -> File-MMagic-1.27.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/ChangeLog new/File-MMagic-1.27/ChangeLog --- old/File-MMagic-1.22/ChangeLog 2004-03-15 09:22:12.000000000 +0100 +++ new/File-MMagic-1.27/ChangeLog 2006-05-23 07:55:27.000000000 +0200 @@ -1,3 +1,68 @@ +2006-05-23 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * MMagic.pm: Version 1.27. + + * MMagic.pm (readMagicLine): Changed regex for magic entry. + (Reported by Dylan Vanderhoof, thank you) + +2006-05-17 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * MMagic.pm: Added a new line at the end of file. + (Reported by Vilmos Soti, thank you.) + +2006-02-08 Yukio USUDA <usu(a)namazu.org> + + * MMagic.pm (magicMatch, dumpMagic): Fixed time waste problem. + +2006-01-30 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * MMagic.pm: Version 1.26. + +2006-01-12 Yukio USUDA <usu(a)namazu.org> + + * MMagic.pm (magicMatchStr): Fixed Bug. Enbuged at Chageset 194. + +2006-01-11 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * README.* : Added the Trac URL. + +2006-01-05 Yukio USUDA <usu(a)namazu.org> + + * MMagic.pm (checktype_data): performance improve. + http://www.namazu.org/trac-namazu/trac.cgi/ticket/8 + + * MMagic.pm (magicMatchStr): Fixed time waste problem. + + * MMagic.pm (__DATA__): Perfomance tuning for mknmz. + http://www.namazu.org/pipermail/namazu-devel-ja/2005-December/000793.html + +2005-08-27 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * Version 1.25. + + * Moved Build.PL to contrib directory. + +2005-08-01 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * Version 1.24. + + * MMagic.pm (check_binary): Removed brackets, closes #13535. + (Reported by dakkar, thank you) + +2005-07-29 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * MMagic.pm: Version 1.23. + +2004-04-21 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * MMagic.pm (magicMatchStr): Added a length check. + Reported by Tadamasa Teranishi, thank you. + +2004-03-17 NOKUBI Takatsugu <knok(a)daionet.gr.jp> + + * Build.PL: Added. + Contributed by Ryuji Abe, thank you. + 2004-03-15 NOKUBI Takatsugu <knok(a)daionet.gr.jp> * MMagic.pm: Version 1.22. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/MANIFEST new/File-MMagic-1.27/MANIFEST --- old/File-MMagic-1.22/MANIFEST 2004-03-15 09:19:59.000000000 +0100 +++ new/File-MMagic-1.27/MANIFEST 2006-05-23 07:56:03.000000000 +0200 @@ -10,4 +10,6 @@ t/03-typecheck.t t/test.html t/04-string-mod.t +t/test-magic +contrib/Build.PL META.yml Module meta-data (added by MakeMaker) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/META.yml new/File-MMagic-1.27/META.yml --- old/File-MMagic-1.22/META.yml 2004-03-15 09:23:23.000000000 +0100 +++ new/File-MMagic-1.27/META.yml 2006-05-23 07:56:03.000000000 +0200 @@ -1,7 +1,7 @@ # http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: File-MMagic -version: 1.22 +version: 1.27 version_from: MMagic.pm installdirs: site requires: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/MMagic.pm new/File-MMagic-1.27/MMagic.pm --- old/File-MMagic-1.22/MMagic.pm 2004-03-15 09:23:04.000000000 +0100 +++ new/File-MMagic-1.27/MMagic.pm 2006-05-23 07:55:27.000000000 +0200 @@ -1,6 +1,6 @@ # File::MMagic # -# $Id: MMagic.pm,v 1.60 2004/03/15 08:23:04 knok Exp $ +# $Id: MMagic.pm 259 2006-05-23 05:55:32Z knok $ # # This program is originated from file.kulp that is a production of The # Unix Reconstruction Projct. @@ -339,7 +339,7 @@ t => "\t", f => "\f"); -$VERSION = "1.22"; +$VERSION = "1.27"; $allowEightbit = 1; } @@ -678,24 +678,26 @@ { # in BSD's version, there's an effort to search from # more specific to less, but I don't do that. - my ($token, %val); + my %val; foreach my $type (keys %{$self->{SPECIALS}}) { - my $token = '(' . - (join '|', sort {length($a) <=> length($b)} @{$self->{SPECIALS}->{$type}}) - . ')'; - my $tdata = $data; - if ($tdata =~ /$token/mg) { - $val{$type} = pos($tdata); + my $matched_pos = undef; + foreach my $token (@{$self->{SPECIALS}->{$type}}){ + pos($data) = 0; + if ($data =~ /$token/mg) { + my $tmp = pos($data); + if ((! defined $matched_pos) || ($matched_pos > $tmp)) { + $matched_pos = $tmp; + } + } } + $val{$type} = $matched_pos if $matched_pos; } - # search latest match if (%val) { my @skeys = sort { $val{$a} <=> $val{$b} } keys %val; $mtype = $skeys[0]; } - ALLDONE: # $mtype = 'text/plain' if (! defined $mtype); } if (! defined $mtype && check_binary($data)) { @@ -727,11 +729,11 @@ my ($data) = @_; my $len = length($data); if ($allowEightbit) { - my $count = ($data =~ tr/[\x00-\x08\x0b-\x0c\x0e-\x1a\x1c-\x1f]//); # exclude TAB, ESC, nl, cr + my $count = ($data =~ tr/\x00-\x08\x0b-\x0c\x0e-\x1a\x1c-\x1f//); # exclude TAB, ESC, nl, cr return 1 if ($len <= 0); # no contents return 1 if (($count/$len) > 0.1); # binary } else { - my $count = ($data =~ tr/[\x00-\x08\x0b-\x0c\x0e-\x1a\x1c-\x1f\x80-\xff]//); # exclude TAB, ESC, nl, cr + my $count = ($data =~ tr/\x00-\x08\x0b-\x0c\x0e-\x1a\x1c-\x1f\x80-\xff//); # exclude TAB, ESC, nl, cr return 1 if ($len <= 0); # no contents return 1 if (($count/$len) > 0.3); # binary } @@ -760,7 +762,10 @@ # this item, then parse out its structure. @$item is just the # raw string, line number, and subtests until we need the real info. # this saves time otherwise wasted parsing unused subtests. - $item = readMagicLine(@$item) if @$item == 3; + if (@$item == 3){ + my $tmp = readMagicLine(@$item); + @$item = @$tmp; + } # $item could be undef if we ran into troubles while reading # the entry. @@ -913,11 +918,15 @@ # this item, then parse out its structure. @$item is just the # raw string, line number, and subtests until we need the real info. # this saves time otherwise wasted parsing unused subtests. - $item = readMagicLine(@$item) if @$item == 3; + if (@$item == 3){ + my $tmp = readMagicLine(@$item); - # $item could be undef if we ran into troubles while reading - # the entry. - return unless defined($item); + # $item could be undef if we ran into troubles while reading + # the entry. + return unless defined($tmp); + + @$item = @$tmp; + } # $fh is not be defined if -c. that way we always return # false for every item which allows reading/checking the entire @@ -986,6 +995,7 @@ #numeric # read up to 4 bytes + return if (length($str) < 4); $data = substr($str, 0, 4); # If template is a ref to an array of 3 letters, @@ -1158,7 +1168,7 @@ # or hex offset or an indirect offset specified in parenthesis # like (x[.[bsl]][+-][y]), or a relative offset specified by &. # offtype : 0 = absolute, 1 = indirect, 2 = relative - if ($line =~ s/^>*([&$]?[a-flsx\.\+\-\d]+$?)\s+(\S+)\s+//) { + if ($line =~ s/^>*([&$]?[a-fA-Flsx\.\+\-\d]+$?)\s+(\S+)\s+//) { ($offset,$type) = ($1,$2); if ($offset =~ /^\(/) { @@ -1312,7 +1322,10 @@ my $entry; foreach $entry (@$magic) { # delayed evaluation. - $entry = readMagicLine(@$entry) if @$entry == 3; + if (@$entry == 3){ + my $tmp = readMagicLine(@$entry); + @$entry = @$tmp; + } next if !defined($entry); @@ -1377,6 +1390,57 @@ #------------------------------------------------------------------------------ #------------------------------------------------------------------------------ +# html: file(1) magic for HTML (HyperText Markup Language) docs +# +# from Daniel Quinlan <quinlan(a)yggdrasil.com> +# +0 string \<!DOCTYPE\ HTML text/html +0 string \<!DOCTYPE\ html text/html +0 string \<HEAD text/html +0 string \<head text/html +0 string \<TITLE text/html +0 string \<title text/html +0 string \<html text/html +0 string \<HTML text/html +0 string \<!-- text/html +0 string \<h1 text/html +0 string \<H1 text/html + +#------------------------------------------------------------------------------ +# mail.news: file(1) magic for mail and news +# +# There are tests to ascmagic.c to cope with mail and news. +0 string Relay-Version: message/rfc822 +0 string #!\ rnews message/rfc822 +0 string N#!\ rnews message/rfc822 +0 string Forward\ to message/rfc822 +0 string Pipe\ to message/rfc822 +0 string Return-Path: message/rfc822 +0 string Received: message/rfc822 +0 string Path: message/news +0 string Xref: message/news +0 string From: message/rfc822 +0 string Article message/news + +# Acrobat +# (due to clamen(a)cs.cmu.edu) +0 string %PDF- application/pdf + +# ZIP archiver +0 string PK application/x-zip + +#------------------------------------------------------------------------------ +# msword: file(1) magic for MS Word files +# +# Contributor claims: +# Reversed-engineered MS Word magic numbers +# + +0 string \376\067\0\043 application/msword +#0 string \320\317\021\340\241\261 application/msword +0 string \333\245-\0\0\0 application/msword + +#------------------------------------------------------------------------------ # Java 0 short 0xcafe @@ -1530,21 +1594,6 @@ 0 string \<Maker application/x-frame #------------------------------------------------------------------------------ -# html: file(1) magic for HTML (HyperText Markup Language) docs -# -# from Daniel Quinlan <quinlan(a)yggdrasil.com> -# -0 string \<HEAD text/html -0 string \<head text/html -0 string \<TITLE text/html -0 string \<title text/html -0 string \<html text/html -0 string \<HTML text/html -0 string \<!-- text/html -0 string \<h1 text/html -0 string \<H1 text/html - -#------------------------------------------------------------------------------ # images: file(1) magic for image formats (see also "c-lang" for XPM bitmaps) # # originally from jef(a)helios.ee.lbl.gov (Jef Poskanzer), @@ -1630,34 +1679,6 @@ 0 string ;ELC\023\000\000\000 application/x-elc #------------------------------------------------------------------------------ -# mail.news: file(1) magic for mail and news -# -# There are tests to ascmagic.c to cope with mail and news. -0 string Relay-Version: message/rfc822 -0 string #!\ rnews message/rfc822 -0 string N#!\ rnews message/rfc822 -0 string Forward\ to message/rfc822 -0 string Pipe\ to message/rfc822 -0 string Return-Path: message/rfc822 -0 string Received: message/rfc822 -0 string Path: message/news -0 string Xref: message/news -0 string From: message/rfc822 -0 string Article message/news -#------------------------------------------------------------------------------ -# msword: file(1) magic for MS Word files -# -# Contributor claims: -# Reversed-engineered MS Word magic numbers -# - -0 string \376\067\0\043 application/msword -#0 string \320\317\021\340\241\261 application/msword -0 string \333\245-\0\0\0 application/msword - - - -#------------------------------------------------------------------------------ # printer: file(1) magic for printer-formatted files # @@ -1668,10 +1689,6 @@ # Jason's support for EPSF <jmaggard(a)timesdispatch.com> 47 string EPSF image/eps -# Acrobat -# (due to clamen(a)cs.cmu.edu) -0 string %PDF- application/pdf - #------------------------------------------------------------------------------ # sc: file(1) magic for "sc" spreadsheet # @@ -1832,9 +1849,6 @@ 2 string -lh >6 string - application/x-lha -# ZIP archiver -0 string PK application/x-zip - # POSIX tar archives 257 string ustar\0 application/x-tar 257 string ustar\040\040\0 application/x-gtar @@ -1855,3 +1869,4 @@ 0 leshort 0xea60 application/x-arj # RAR archiver (Greg Roelofs, newt(a)uchicago.edu) 0 string Rar! application/x-rar + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/Makefile.PL new/File-MMagic-1.27/Makefile.PL --- old/File-MMagic-1.22/Makefile.PL 1999-10-27 11:44:08.000000000 +0200 +++ new/File-MMagic-1.27/Makefile.PL 2006-05-23 07:55:27.000000000 +0200 @@ -1,6 +1,6 @@ # File::MMagic Makefile.PL # -# $Id: Makefile.PL,v 1.3 1999/10/27 09:44:08 knok Exp $ +# $Id: Makefile.PL 192 2006-01-04 07:57:15Z knok $ use ExtUtils::MakeMaker; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/README.en new/File-MMagic-1.27/README.en --- old/File-MMagic-1.22/README.en 2001-08-08 03:48:02.000000000 +0200 +++ new/File-MMagic-1.27/README.en 2006-05-23 07:55:27.000000000 +0200 @@ -1,6 +1,8 @@ File::MMagic -Copyright(C) 1999-2001 NOKUBI Takatsugu <knok(a)daionet.gr.jp> +Copyright(C) 1999-2006 + NOKUBI Takatsugu <knok(a)daionet.gr.jp> + Yukio USUDA <usu(a)namazu.org> 1. Abstract @@ -23,14 +25,6 @@ See COPYING file. -5. Notice +5. See also -If you want to use the module under mod_perl environment, you'll need -to divide the module into module part and magic entry file part, and use -the magic file explicitly. -Built-in magic entry does not work correctly under mod_perl. - -Ex. - -my $magic = File::MMagic::new('/etc/mime-magic'); - # /etc/mime-magic is separated file from MMagic.pm +http://www.namazu.org/trac-namazu/trac.cgi/wiki/File-MMagic.en diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/README.ja new/File-MMagic-1.27/README.ja --- old/File-MMagic-1.22/README.ja 2001-08-08 03:48:53.000000000 +0200 +++ new/File-MMagic-1.27/README.ja 2006-05-23 07:55:27.000000000 +0200 @@ -1,6 +1,8 @@ File::MMagic -Copyright(C) 1999-2001 NOKUBI Takatsugu <knok(a)daionet.gr.jp> +Copyright(C) 1999-2006 + NOKUBI Takatsugu <knok(a)daionet.gr.jp> + Yukio USUDA <usu(a)namazu.org> 1. $B$O$8$a$K(B @@ -43,13 +45,6 @@ The Apache HTTP server project <http://www.apache.org/> -5. $BCm0UE@(B - -$B$3$N%b%8%e!<%k$r(B mod_perl $B$GMxMQ$9$k$H$-$O!"(BMMagic.pm $B$+$i(B magic entry $BItJ,(B -$B$rH4$-=P$7!"$=$l$r(B magic file $B$H$7$FM[$K;XDj$9$k$h$&$K$7$F2<$5$$!#(B -$B%b%8%e!<%k$KAH$_9~$^$l$F$$$k(B magic entry $B$O(B mod_perl $B$G$O@5$7$/F0:n$7$^$;$s!#(B - -$BNc(B: +5. $B;2>H(B -my $magic = File::MMagic::new('/etc/mime-magic'); - # /etc/mime-magic is separated file from MMagic.pm +http://www.namazu.org/trac-namazu/trac.cgi/wiki/File-MMagic diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/contrib/Build.PL new/File-MMagic-1.27/contrib/Build.PL --- old/File-MMagic-1.22/contrib/Build.PL 1970-01-01 01:00:00.000000000 +0100 +++ new/File-MMagic-1.27/contrib/Build.PL 2006-05-23 07:55:28.000000000 +0200 @@ -0,0 +1,12 @@ +use Module::Build; + +my $build = Module::Build->new + ( + module_name => 'File::MMagic', + dist_version_from => 'MMagic.pm', + license => 'open_source', + requires => {'perl' => '5.005'}, + pm_files => {'MMagic.pm' => 'lib/File/MMagic.pm'}, + ); + +$build->create_build_script; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/t/01-selfcheck.t new/File-MMagic-1.27/t/01-selfcheck.t --- old/File-MMagic-1.22/t/01-selfcheck.t 2003-11-21 03:25:52.000000000 +0100 +++ new/File-MMagic-1.27/t/01-selfcheck.t 2006-05-23 07:55:28.000000000 +0200 @@ -1,5 +1,5 @@ # perl-test -# $Id: 01-selfcheck.t,v 1.2 2003/11/21 02:25:52 knok Exp $ +# $Id: 01-selfcheck.t 192 2006-01-04 07:57:15Z knok $ use strict; use Test; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/t/02-extmagic.t new/File-MMagic-1.27/t/02-extmagic.t --- old/File-MMagic-1.22/t/02-extmagic.t 2003-11-21 03:25:52.000000000 +0100 +++ new/File-MMagic-1.27/t/02-extmagic.t 2006-05-23 07:55:28.000000000 +0200 @@ -1,5 +1,5 @@ # perl-test -# $Id: 02-extmagic.t,v 1.3 2003/11/21 02:25:52 knok Exp $ +# $Id: 02-extmagic.t 192 2006-01-04 07:57:15Z knok $ use strict; use Test; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/t/03-typecheck.t new/File-MMagic-1.27/t/03-typecheck.t --- old/File-MMagic-1.22/t/03-typecheck.t 2003-11-21 03:25:52.000000000 +0100 +++ new/File-MMagic-1.27/t/03-typecheck.t 2006-05-23 07:55:28.000000000 +0200 @@ -1,5 +1,5 @@ # perl-test -# $Id: 03-typecheck.t,v 1.1 2003/11/21 02:25:52 knok Exp $ +# $Id: 03-typecheck.t 192 2006-01-04 07:57:15Z knok $ use strict; use Test; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/t/04-string-mod.t new/File-MMagic-1.27/t/04-string-mod.t --- old/File-MMagic-1.22/t/04-string-mod.t 2004-03-15 09:23:15.000000000 +0100 +++ new/File-MMagic-1.27/t/04-string-mod.t 2006-05-23 07:55:28.000000000 +0200 @@ -1,5 +1,5 @@ # perl-test -# $Id: 04-string-mod.t,v 1.1 2004/03/15 08:23:15 knok Exp $ +# $Id: 04-string-mod.t 192 2006-01-04 07:57:15Z knok $ use strict; use Test; @@ -14,6 +14,6 @@ my $m1 = File::MMagic->new($dir . 'test-magic'); my $ret = $m1->checktype_filename($dir . 'test.html'); ok($ret eq 'text/html'); -my $m2 = new File::MMagic; +my $m2 = File::MMagic->new(); $ret = $m2->checktype_filename($dir . 'test.html'); ok($ret eq 'text/html'); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/File-MMagic-1.22/t/test-magic new/File-MMagic-1.27/t/test-magic --- old/File-MMagic-1.22/t/test-magic 1970-01-01 01:00:00.000000000 +0100 +++ new/File-MMagic-1.27/t/test-magic 2006-05-23 07:55:28.000000000 +0200 @@ -0,0 +1 @@ +0 string/cB \<!DOCTYPE\ html text/html ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-input
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package xorg-x11-driver-input checked in at Tue Dec 19 17:22:02 CET 2006. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-12-05 11:32:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-12-17 14:35:53.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Dec 17 11:52:10 CET 2006 - sndirsch(a)suse.de + +- updated evdev driver to release 1.1.5 + * Makefile.am: make ChangeLog hook safer +- updated aiptek sources to release 1.2 (X.Org Bug #5061) + +------------------------------------------------------------------- Old: ---- xf86-input-evdev-1.1.4.tar.bz2 New: ---- xf86-input-aiptek-1.2.tar.gz xf86-input-evdev-1.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.beXBw9/_old 2006-12-19 17:21:32.000000000 +0100 +++ /var/tmp/diff_new_pack.beXBw9/_new 2006-12-19 17:21:32.000000000 +0100 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 19 +Release: 25 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -30,7 +30,7 @@ Source6: xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2 Source7: xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2 Source8: xf86-input-elographics-1.1.0.tar.bz2 -Source9: xf86-input-evdev-1.1.4.tar.bz2 +Source9: xf86-input-evdev-1.1.5.tar.bz2 Source10: xf86-input-fpit-X11R7.1-1.1.0.tar.bz2 Source11: xf86-input-hyperpen-X11R7.1-1.1.0.tar.bz2 Source12: xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2 @@ -49,6 +49,7 @@ Source25: xf86-input-ur98-X11R7.1-1.1.0.tar.bz2 Source26: xf86-input-vmmouse-X11R7.1-12.4.0.tar.bz2 Source27: xf86-input-void-X11R7.1-1.1.0.tar.bz2 +Source28: xf86-input-aiptek-1.2.tar.gz Patch1: xf86-input-magictouch.diff Patch2: xf86-input-jamstudio.diff Patch3: p_mouse_misc.diff @@ -82,6 +83,9 @@ pushd xf86-input-evdev-* %patch5 -p0 popd +pushd xf86-input-aiptek-*/src +tar xzf $RPM_SOURCE_DIR/xf86-input-aiptek-1.2.tar.gz +popd %build %ifarch %ix86 x86_64 @@ -118,6 +122,10 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-input +* Sun Dec 17 2006 - sndirsch(a)suse.de +- updated evdev driver to release 1.1.5 + * Makefile.am: make ChangeLog hook safer +- updated aiptek sources to release 1.2 (X.Org Bug #5061) * Tue Dec 05 2006 - sndirsch(a)suse.de - updated evdev driver to release 1.1.4 * key: use os bell-ringing function. Use the OS bell-ringing ++++++ xf86-input-evdev-1.1.4.tar.bz2 -> xf86-input-evdev-1.1.5.tar.bz2 ++++++ ++++ 1875 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.4/ChangeLog new/xf86-input-evdev-1.1.5/ChangeLog --- old/xf86-input-evdev-1.1.4/ChangeLog 2006-11-02 02:44:06.000000000 +0100 +++ new/xf86-input-evdev-1.1.5/ChangeLog 2006-12-16 00:43:16.000000000 +0100 @@ -1,3 +1,16 @@ +commit e1fe72e7fe663a479a5be1b5e16ecbba52f511a8 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 01:42:18 2006 +0200 + + bump to 1.1.5 + +commit 9f3be57929048950ad0e03cfef44b5336c38aab3 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Dec 6 18:50:15 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + commit 5a5457e69c719980334cb662e5abcb77cd09bc7a Author: Daniel Stone <daniel(a)fooishbar.org> Date: Thu Nov 2 03:42:57 2006 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.4/Makefile.am new/xf86-input-evdev-1.1.5/Makefile.am --- old/xf86-input-evdev-1.1.4/Makefile.am 2006-11-02 02:42:11.000000000 +0100 +++ new/xf86-input-evdev-1.1.5/Makefile.am 2006-12-06 17:49:59.000000000 +0100 @@ -28,6 +28,6 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.4/config.h.in new/xf86-input-evdev-1.1.5/config.h.in --- old/xf86-input-evdev-1.1.4/config.h.in 2006-11-02 02:44:05.000000000 +0100 +++ new/xf86-input-evdev-1.1.5/config.h.in 2006-12-16 00:43:08.000000000 +0100 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-1.1.4/configure.ac new/xf86-input-evdev-1.1.5/configure.ac --- old/xf86-input-evdev-1.1.4/configure.ac 2006-11-02 02:42:33.000000000 +0100 +++ new/xf86-input-evdev-1.1.5/configure.ac 2006-12-16 00:42:12.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-evdev], - 1.1.4, + 1.1.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-input-evdev) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Tue Dec 19 17:22:01 CET 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-09 11:03:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-17 12:01:44.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Dec 17 11:59:46 CET 2006 - sndirsch(a)suse.de + +- updated mga driver to release 1.4.6 + * Makefile.am: fix ChangeLog hook + * Use the XORG_RELEASE_VERSION autoconf macro. + * More janitoring work. + * Removed a duplicated register definition. +- updated nv driver to release 1.2.2 + * Remove redundant XORG_RELEASE_VERSION + * Makefile.am: make ChangeLog hook safer +- updated rendition driver to release 4.1.3 + * Makefile.am: make ChangeLog hook safer + +------------------------------------------------------------------- Old: ---- xf86-video-mga-1.4.5.tar.bz2 xf86-video-nv-1.2.1.tar.bz2 xf86-video-rendition-4.1.2.tar.bz2 New: ---- xf86-video-mga-1.4.6.tar.bz2 xf86-video-nv-1.2.2.tar.bz2 xf86-video-rendition-4.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.eM7bZN/_old 2006-12-19 17:21:18.000000000 +0100 +++ /var/tmp/diff_new_pack.eM7bZN/_new 2006-12-19 17:21:18.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 34 +Release: 40 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -35,12 +35,12 @@ Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2 Source12: xf86-video-i810-1.7.3.tar.bz2 Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2 -Source14: xf86-video-mga-1.4.5.tar.bz2 +Source14: xf86-video-mga-1.4.6.tar.bz2 Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 Source16: xf86-video-newport-0.2.1.tar.bz2 Source17: xf86-video-nsc-2.8.2.tar.bz2 -Source18: xf86-video-nv-1.2.1.tar.bz2 -Source19: xf86-video-rendition-4.1.2.tar.bz2 +Source18: xf86-video-nv-1.2.2.tar.bz2 +Source19: xf86-video-rendition-4.1.3.tar.bz2 Source20: xf86-video-s3-0.5.0.tar.bz2 Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2 Source22: xf86-video-savage-2.1.2.tar.bz2 @@ -206,6 +206,17 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Sun Dec 17 2006 - sndirsch(a)suse.de +- updated mga driver to release 1.4.6 + * Makefile.am: fix ChangeLog hook + * Use the XORG_RELEASE_VERSION autoconf macro. + * More janitoring work. + * Removed a duplicated register definition. +- updated nv driver to release 1.2.2 + * Remove redundant XORG_RELEASE_VERSION + * Makefile.am: make ChangeLog hook safer +- updated rendition driver to release 4.1.3 + * Makefile.am: make ChangeLog hook safer * Sat Dec 09 2006 - sndirsch(a)suse.de - added optional "i810sdvo" driver for SDVO support ("modesetting-sdvo-stuffing" branch) ++++++ xf86-video-mga-1.4.5.tar.bz2 -> xf86-video-mga-1.4.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/ChangeLog new/xf86-video-mga-1.4.6/ChangeLog --- old/xf86-video-mga-1.4.5/ChangeLog 2006-11-30 19:00:05.000000000 +0100 +++ new/xf86-video-mga-1.4.6/ChangeLog 2006-12-16 00:46:00.000000000 +0100 @@ -1,3 +1,40 @@ +commit ede471a547a24e7f9688917fc3329a3d67fb2dc4 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 01:44:49 2006 +0200 + + bump to 1.4.6 + +commit 55d283a8c2347e809dadace3fb9a026bab6d57dd +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Dec 6 18:46:00 2006 +0200 + + Makefile.am: fix ChangeLog hook + Make ChangeLog hook safe for all situations I could think of, including + carrying the ChangeLog through for distcheck when objdir != srcdir. It's + significantly more ugly, but eh. + +commit fbbbb853041ae4af36eeffb24188b9a5513ba7d5 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Sat Dec 2 12:42:34 2006 +0100 + + Removed a duplicated register definition. + +commit 447aae84d07cab34987ab08ead9319e176ccd904 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Fri Dec 1 20:19:13 2006 +0100 + + More janitoring work. + + Moved the XPWRCTRL, XDISPCTRL and C2CTL register definitions + to mga_reg.h. + Cleaned up the DAC2 routing. + +commit 10b2202c254b71b8d0da987a225d5e78a030bca4 +Author: Tilman Sauerbeck <tilman(a)code-monkey.de> +Date: Fri Dec 1 19:10:55 2006 +0100 + + Use the XORG_RELEASE_VERSION autoconf macro. + commit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a Author: Daniel Stone <daniel(a)fooishbar.org> Date: Thu Nov 30 19:59:38 2006 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/Makefile.am new/xf86-video-mga-1.4.6/Makefile.am --- old/xf86-video-mga-1.4.5/Makefile.am 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/Makefile.am 2006-12-06 17:43:10.000000000 +0100 @@ -27,6 +27,6 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/Makefile.in new/xf86-video-mga-1.4.6/Makefile.in --- old/xf86-video-mga-1.4.5/Makefile.in 2006-11-30 18:59:57.000000000 +0100 +++ new/xf86-video-mga-1.4.6/Makefile.in 2006-12-16 00:45:48.000000000 +0100 @@ -711,7 +711,7 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/aclocal.m4 new/xf86-video-mga-1.4.6/aclocal.m4 --- old/xf86-video-mga-1.4.5/aclocal.m4 2006-11-30 18:59:48.000000000 +0100 +++ new/xf86-video-mga-1.4.6/aclocal.m4 2006-12-16 00:45:33.000000000 +0100 @@ -6584,7 +6584,7 @@ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.1 + [XORG_MACROS_version=1.1.3 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -7037,7 +7037,8 @@ # -------------------- # Adds --with/without-release-string and changes the PACKAGE and # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -7050,6 +7051,23 @@ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$.*/\1/p'`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$\.$[[^\.]]\+$.*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$\.$[[^\.]]\+$\.$[[^\.]]\+$.*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. @@ -7776,10 +7794,10 @@ AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@' + _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/config.h.in new/xf86-video-mga-1.4.6/config.h.in --- old/xf86-video-mga-1.4.5/config.h.in 2006-11-30 18:59:53.000000000 +0100 +++ new/xf86-video-mga-1.4.6/config.h.in 2006-12-16 00:46:00.000000000 +0100 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/configure new/xf86-video-mga-1.4.6/configure --- old/xf86-video-mga-1.4.5/configure 2006-11-30 18:59:53.000000000 +0100 +++ new/xf86-video-mga-1.4.6/configure 2006-12-16 00:45:43.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for xf86-video-mga 1.4.5. +# Generated by GNU Autoconf 2.60 for xf86-video-mga 1.4.6. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-mga' PACKAGE_TARNAME='xf86-video-mga' -PACKAGE_VERSION='1.4.5' -PACKAGE_STRING='xf86-video-mga 1.4.5' +PACKAGE_VERSION='1.4.6' +PACKAGE_STRING='xf86-video-mga 1.4.6' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1411,7 +1411,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-mga 1.4.5 to adapt to many kinds of systems. +\`configure' configures xf86-video-mga 1.4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1481,7 +1481,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-mga 1.4.5:";; + short | recursive ) echo "Configuration of xf86-video-mga 1.4.6:";; esac cat <<\_ACEOF @@ -1505,6 +1505,8 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-release-version=STRING + Use release version string in package name --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] @@ -1512,8 +1514,6 @@ --with-xorg-module-dir=DIR Default xorg module directory [default=$libdir/xorg/modules] - --with-release-version=STRING - Use release version string in package name Some influential environment variables: CC C compiler command @@ -1598,7 +1598,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-mga configure 1.4.5 +xf86-video-mga configure 1.4.6 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1612,7 +1612,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-mga $as_me 1.4.5, which was +It was created by xf86-video-mga $as_me 1.4.6, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1967,6 +1967,46 @@ + +# Check whether --with-release-version was given. +if test "${with_release_version+set}" = set; then + withval=$with_release_version; RELEASE_VERSION="$withval" +else + RELEASE_VERSION="" +fi + + if test "x$RELEASE_VERSION" != "x"; then + PACKAGE="$PACKAGE-$RELEASE_VERSION" + PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" + { echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 +echo "$as_me: Building with package name set to $PACKAGE" >&6;} + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$.*/\1/p'` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$\.$[^\.]\+$.*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$\.$[^\.]\+$\.$[^\.]\+$.*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + + + ac_config_headers="$ac_config_headers config.h" ac_aux_dir= @@ -2276,10 +2316,10 @@ AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@' + test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' @@ -2310,7 +2350,7 @@ # Define the identity of the package. PACKAGE='xf86-video-mga' - VERSION='1.4.5' + VERSION='1.4.6' cat >>confdefs.h <<_ACEOF @@ -4455,7 +4495,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4458 "configure"' > conftest.$ac_ext + echo '#line 4498 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7419,11 +7459,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7462: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7426: \$? = $ac_status" >&5 + echo "$as_me:7466: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7687,11 +7727,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7690: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7730: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7694: \$? = $ac_status" >&5 + echo "$as_me:7734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7791,11 +7831,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7834: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7798: \$? = $ac_status" >&5 + echo "$as_me:7838: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10232,7 +10272,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10235 "configure" +#line 10275 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10332,7 +10372,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10335 "configure" +#line 10375 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12700,11 +12740,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12703: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12743: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12707: \$? = $ac_status" >&5 + echo "$as_me:12747: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12804,11 +12844,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12807: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12847: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12811: \$? = $ac_status" >&5 + echo "$as_me:12851: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14365,11 +14405,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14368: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14372: \$? = $ac_status" >&5 + echo "$as_me:14412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14469,11 +14509,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14512: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14476: \$? = $ac_status" >&5 + echo "$as_me:14516: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16688,11 +16728,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16691: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16731: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16695: \$? = $ac_status" >&5 + echo "$as_me:16735: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16956,11 +16996,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16959: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16999: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16963: \$? = $ac_status" >&5 + echo "$as_me:17003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17060,11 +17100,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17063: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17103: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17067: \$? = $ac_status" >&5 + echo "$as_me:17107: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21965,6 +22005,29 @@ echo "$as_me: Building with package name set to $PACKAGE" >&6;} fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$.*/\1/p'` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$\.$[^\.]\+$.*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$\.$[^\.]\+$\.$[^\.]\+$.*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile util/Makefile" @@ -22407,7 +22470,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-mga $as_me 1.4.5, which was +This file was extended by xf86-video-mga $as_me 1.4.6, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22460,7 +22523,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-mga config.status 1.4.5 +xf86-video-mga config.status 1.4.6 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/configure.ac new/xf86-video-mga-1.4.6/configure.ac --- old/xf86-video-mga-1.4.5/configure.ac 2006-11-30 18:59:28.000000000 +0100 +++ new/xf86-video-mga-1.4.6/configure.ac 2006-12-16 00:44:09.000000000 +0100 @@ -24,10 +24,12 @@ # When the version number is modified here, also modify it in src/mga.h. AC_INIT([xf86-video-mga], - 1.4.5, + 1.4.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-mga) +XORG_RELEASE_VERSION + AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga.h new/xf86-video-mga-1.4.6/src/mga.h --- old/xf86-video-mga-1.4.5/src/mga.h 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga.h 2006-12-06 17:29:59.000000000 +0100 @@ -154,9 +154,6 @@ #define MGA_C_NAME MGA #define MGA_MODULE_DATA mgaModuleData #define MGA_DRIVER_NAME "mga" -#define MGA_MAJOR_VERSION 1 -#define MGA_MINOR_VERSION 4 -#define MGA_PATCHLEVEL 4 typedef struct { unsigned char ExtVga[6]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_dh.c new/xf86-video-mga-1.4.6/src/mga_dh.c --- old/xf86-video-mga-1.4.5/src/mga_dh.c 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_dh.c 2006-12-06 17:29:59.000000000 +0100 @@ -26,36 +26,6 @@ #define CLKSEL_MGA 0x0c #define PLLLOCK 0x40 -/* CRTC2 control field*/ -#define C2_EN_A 0 -#define C2_EN_M (1 << C2_EN_A) -#define C2_HIPRILVL_A 4 -#define C2_HIPRILVL_M (7 << C2_HIPRILVL_A) -#define C2_MAXHIPRI_A 8 -#define C2_MAXHIPRI_M (7 << C2_MAXHIPRI_A) - -#define C2CTL_PIXCLKSEL_SHIFT 1L -#define C2CTL_PIXCLKSEL_MASK (3L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSELH_SHIFT 14L -#define C2CTL_PIXCLKSELH_MASK (1L << C2CTL_PIXCLKSELH_SHIFT) -#define C2CTL_PIXCLKSEL_PCICLK 0L -#define C2CTL_PIXCLKSEL_VDOCLK (1L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSEL_PIXELPLL (2L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSEL_VIDEOPLL (3L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSEL_VDCLK (1L << C2CTL_PIXCLKSELH_SHIFT) - -#define C2CTL_PIXCLKSEL_CRISTAL (1L << C2CTL_PIXCLKSEL_SHIFT) | (1L << C2CTL_PIXCLKSELH_SHIFT) -#define C2CTL_PIXCLKSEL_SYSTEMPLL (2L << C2CTL_PIXCLKSEL_SHIFT) | (1L << C2CTL_PIXCLKSELH_SHIFT) - -#define C2CTL_PIXCLKDIS_SHIFT 3L -#define C2CTL_PIXCLKDIS_MASK (1L << C2CTL_PIXCLKDIS_SHIFT) -#define C2CTL_PIXCLKDIS_DISABLE (1L << C2CTL_PIXCLKDIS_SHIFT) - -#define C2CTL_CRTCDACSEL_SHIFT 20L -#define C2CTL_CRTCDACSEL_MASK (1L << C2CTL_CRTCDACSEL_SHIFT) -#define C2CTL_CRTCDACSEL_CRTC1 0 -#define C2CTL_CRTCDACSEL_CRTC2 (1L << C2CTL_CRTCDACSEL_SHIFT) - /* Misc field*/ #define IOADDSEL 0x01 #define RAMMAPEN 0x02 @@ -101,39 +71,6 @@ #define XSYNCCTRL_DAC2VSOFF_OFF (1 << XSYNCCTRL_DAC2VSOFF_SHIFT) #define XSYNCCTRL_DAC2VSOFF_ON 0 - -/* XDISPCTRL field */ -#define XDISPCTRL_DAC1OUTSEL_SHIFT 0L -#define XDISPCTRL_DAC1OUTSEL_MASK 1L -#define XDISPCTRL_DAC1OUTSEL_DIS 0L -#define XDISPCTRL_DAC1OUTSEL_EN 1L -#define XDISPCTRL_DAC2OUTSEL_SHIFT 2L -#define XDISPCTRL_DAC2OUTSEL_MASK (3L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_DAC2OUTSEL_DIS 0L -#define XDISPCTRL_DAC2OUTSEL_CRTC1 (1L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_DAC2OUTSEL_CRTC2 (2L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_DAC2OUTSEL_TVE (3L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_SHIFT 5L -#define XDISPCTRL_PANOUTSEL_MASK (3L << XDISPCTRL_PANOUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_DIS 0L -#define XDISPCTRL_PANOUTSEL_CRTC1 (1L << XDISPCTRL_PANOUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_CRTC2RGB (2L << XDISPCTRL_PANOUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_CRTC2656 (3L << XDISPCTRL_PANOUTSEL_SHIFT) - -/* XPWRCTRL field*/ -#define XPWRCTRL_DAC2PDN_SHIFT 0 -#define XPWRCTRL_DAC2PDN_MASK (1 << XPWRCTRL_DAC2PDN_SHIFT) -#define XPWRCTRL_VIDPLLPDN_SHIFT 1 -#define XPWRCTRL_VIDPLLPDN_MASK (1 << XPWRCTRL_VIDPLLPDN_SHIFT) -#define XPWRCTRL_PANPDN_SHIFT 2 -#define XPWRCTRL_PANPDN_MASK (1 << XPWRCTRL_PANPDN_SHIFT) -#define XPWRCTRL_RFIFOPDN_SHIFT 3 -#define XPWRCTRL_RFIFOPDN_MASK (1 << XPWRCTRL_RFIFOPDN_SHIFT) -#define XPWRCTRL_CFIFOPDN_SHIFT 4 -#define XPWRCTRL_CFIFOPDN_MASK (1 << XPWRCTRL_CFIFOPDN_SHIFT) - - - #define POS_HSYNC 0x00000004 #define POS_VSYNC 0x00000008 @@ -295,20 +232,23 @@ ulC2CTL = INREG( MGAREG_C2CTL); /*--- Disable Pixel clock oscillations On Crtc1 */ - OUTREG( MGAREG_C2CTL, ulC2CTL | C2CTL_PIXCLKDIS_MASK); + OUTREG( MGAREG_C2CTL, ulC2CTL | MGAREG_C2CTL_PIXCLKDIS_MASK); /*--- Have to wait minimum time (2 acces will be ok) */ (void) INREG( MGAREG_Status); (void) INREG( MGAREG_Status); - ulC2CTL &= ~(C2CTL_PIXCLKSEL_MASK | C2CTL_PIXCLKSELH_MASK); + ulC2CTL &= ~MGAREG_C2CTL_PIXCLKSEL_MASK; + ulC2CTL &= ~MGAREG_C2CTL_PIXCLKSELH_MASK; - ulC2CTL |= C2CTL_PIXCLKSEL_VIDEOPLL; + ulC2CTL |= MGAREG_C2CTL_PIXCLKSEL_VIDEOPLL; OUTREG( MGAREG_C2CTL, ulC2CTL); + /*--- Enable Pixel clock oscillations on CRTC2*/ - OUTREG( MGAREG_C2CTL, ulC2CTL & ~C2CTL_PIXCLKDIS_MASK); + ulC2CTL &= ~MGAREG_C2CTL_PIXCLKDIS_MASK; + OUTREG( MGAREG_C2CTL, ulC2CTL); /* We don't use MISC synch pol, must be 0*/ @@ -336,24 +276,21 @@ ulC2CTL = INREG(MGAREG_C2CTL); ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL); - ucXDispCtrl &= ~XDISPCTRL_DAC2OUTSEL_MASK; - ucXDispCtrl |= XDISPCTRL_DAC2OUTSEL_CRTC2; + ucXDispCtrl &= ~MGA1064_DISP_CTL_DAC2OUTSEL_MASK; if (!pMga->SecondOutput) { /* Route Crtc2 on Output1 */ - ucXDispCtrl &= ~XDISPCTRL_DAC2OUTSEL_MASK; - ucXDispCtrl |= XDISPCTRL_DAC2OUTSEL_CRTC1; - ulC2CTL |= C2CTL_CRTCDACSEL_CRTC2; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1; + ulC2CTL |= MGAREG_C2CTL_CRTCDACSEL_CRTC2; } else { /* Route Crtc2 on Output2*/ - ucXDispCtrl &= ~XDISPCTRL_DAC2OUTSEL_MASK; - ucXDispCtrl |= XDISPCTRL_DAC2OUTSEL_CRTC2; - ulC2CTL &= ~C2CTL_CRTCDACSEL_MASK; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC2; + ulC2CTL &= ~MGAREG_C2CTL_CRTCDACSEL_MASK; } /* Enable CRTC2*/ - ulC2CTL |= C2_EN_M; + ulC2CTL |= MGAREG_C2CTL_C2_EN; pReg->dac2[ MGA1064_DISP_CTL - 0x80] = ucXDispCtrl; @@ -377,15 +314,14 @@ ucByte &= ~(XSYNCCTRL_DAC2HSOFF_MASK | XSYNCCTRL_DAC2VSOFF_MASK); pReg->dac2[ MGA1064_SYNC_CTL - 0x80] = ucByte; - /* Powerup DAC2*/ - ucByte = inMGAdac( MGA1064_PWR_CTL); - pReg->dac2[ MGA1064_PWR_CTL - 0x80] = /* 0x0b; */ (ucByte | XPWRCTRL_DAC2PDN_MASK); - - - - /* Power up Fifo*/ - ucByte = inMGAdac( MGA1064_PWR_CTL); - pReg->dac2[ MGA1064_PWR_CTL - 0x80] = 0x1b; /* (ucByte | XPWRCTRL_CFIFOPDN_MASK) */; + /* Power up DAC2, Fifo. + * The TMDS is powered down here, which is likely wrong. + */ + pReg->dac2[MGA1064_PWR_CTL - 0x80] = + MGA1064_PWR_CTL_DAC2_EN | + MGA1064_PWR_CTL_VID_PLL_EN | + MGA1064_PWR_CTL_RFIFO_EN | + MGA1064_PWR_CTL_CFIFO_EN; #ifdef DEBUG diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_dri.c new/xf86-video-mga-1.4.6/src/mga_dri.c --- old/xf86-video-mga-1.4.5/src/mga_dri.c 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_dri.c 2006-12-06 17:29:59.000000000 +0100 @@ -987,9 +987,9 @@ ((pciConfigPtr)pMga->PciInfo->thisCard)->devnum, ((pciConfigPtr)pMga->PciInfo->thisCard)->funcnum ); } - pDRIInfo->ddxDriverMajorVersion = MGA_MAJOR_VERSION; - pDRIInfo->ddxDriverMinorVersion = MGA_MINOR_VERSION; - pDRIInfo->ddxDriverPatchVersion = MGA_PATCHLEVEL; + pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR; + pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR; + pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL; pDRIInfo->frameBufferPhysicalAddress = (void *) pMga->FbAddress; pDRIInfo->frameBufferSize = pMga->FbMapSize; pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_driver.c new/xf86-video-mga-1.4.6/src/mga_driver.c --- old/xf86-video-mga-1.4.5/src/mga_driver.c 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_driver.c 2006-12-06 17:29:59.000000000 +0100 @@ -440,7 +440,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - MGA_MAJOR_VERSION, MGA_MINOR_VERSION, MGA_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, @@ -2945,8 +2945,8 @@ */ CARD8 ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL); - ucXDispCtrl &= ~0x0c; /* dac2outsel mask */ - ucXDispCtrl |= 0x04; /* dac2 -> crtc1 */ + ucXDispCtrl &= ~MGA1064_DISP_CTL_DAC2OUTSEL_MASK; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1; outMGAdac(MGA1064_DISP_CTL, ucXDispCtrl); @@ -2954,9 +2954,13 @@ CARD8 ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL); CARD32 ulC2CTL = INREG(MGAREG_C2CTL); - ucXDispCtrl &= ~0x0c; /* dac2outsel mask */ - ucXDispCtrl |= 0x5; /* dac1outsel -> crtcdacsel, dac2 -> crtc1 */ - ulC2CTL &= ~0x00100000; /* crtcdacsel -> crtc1 */ + ucXDispCtrl &= ~MGA1064_DISP_CTL_DAC2OUTSEL_MASK; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC1OUTSEL_EN; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1; + + /* crtcdacsel -> crtc1 */ + ulC2CTL &= ~MGAREG_C2CTL_CRTCDACSEL_CRTC2; + ulC2CTL |= MGAREG_C2CTL_CRTCDACSEL_CRTC1; outMGAdac(MGA1064_DISP_CTL, ucXDispCtrl); OUTREG(MGAREG_C2CTL, ulC2CTL); @@ -2966,12 +2970,10 @@ /* Force to close second crtc */ CARD32 ulC2CTL = INREG(MGAREG_C2CTL); - ulC2CTL &= ~0x1; /* crtc2 disabled */ + ulC2CTL &= ~MGAREG_C2CTL_C2_EN; OUTREG(MGAREG_C2CTL, ulC2CTL); } - - return; } /* @@ -3692,8 +3694,6 @@ } -#define C2STARTADD0 0x3C28 - void MGAAdjustFrameCrtc2(int scrnIndex, int x, int y, int flags) { @@ -3723,7 +3723,7 @@ Base = (y * pLayout->displayWidth + x) * pLayout->bitsPerPixel >> 3; Base += pMga->DstOrg; Base &= 0x01ffffc0; - OUTREG(C2STARTADD0, Base); + OUTREG(MGAREG_C2STARTADD0, Base); ); } @@ -4079,8 +4079,8 @@ if (PowerManagementMode==DPMSModeOn) { /* Enable CRTC2 */ - val |= 0x1; - val &= ~(0x8); + val |= MGAREG_C2CTL_C2_EN; + val &= ~MGAREG_C2CTL_PIXCLKDIS_DISABLE; OUTREG(MGAREG_C2CTL, val); /* Restore normal MAVEN values */ if (pMga->Maven) { @@ -4108,8 +4108,8 @@ } else { /* Disable CRTC2 video */ - val |= 0x8; - val &= ~(0x1); + val |= MGAREG_C2CTL_PIXCLKDIS_DISABLE; + val &= ~MGAREG_C2CTL_C2_EN; OUTREG(MGAREG_C2CTL, val); /* Disable MAVEN display */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_merge.c new/xf86-video-mga-1.4.6/src/mga_merge.c --- old/xf86-video-mga-1.4.5/src/mga_merge.c 2006-11-30 18:59:07.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_merge.c 2006-12-06 17:29:59.000000000 +0100 @@ -955,7 +955,7 @@ /* power on Dac2 */ reg = inMGAdac(MGA1064_PWR_CTL); - reg |= 1; + reg |= MGA1064_PWR_CTL_DAC2_EN; outMGAdac(MGA1064_PWR_CTL, reg); } else { /* power off Dac1 */ @@ -965,7 +965,7 @@ /* power off Dac2 */ reg = inMGAdac(MGA1064_PWR_CTL); - reg &= ~1; + reg &= ~MGA1064_PWR_CTL_DAC2_EN; outMGAdac(MGA1064_PWR_CTL, reg); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_reg.h new/xf86-video-mga-1.4.6/src/mga_reg.h --- old/xf86-video-mga-1.4.5/src/mga_reg.h 2006-11-30 18:59:07.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_reg.h 2006-12-06 17:29:59.000000000 +0100 @@ -408,8 +408,29 @@ #define MGA1064_VID_PLL_N 0x8F #define MGA1064_DISP_CTL 0x8a +#define MGA1064_DISP_CTL_DAC1OUTSEL_MASK 0x01 +#define MGA1064_DISP_CTL_DAC1OUTSEL_DIS 0x00 +#define MGA1064_DISP_CTL_DAC1OUTSEL_EN 0x01 +#define MGA1064_DISP_CTL_DAC2OUTSEL_MASK (0x03 << 2) +#define MGA1064_DISP_CTL_DAC2OUTSEL_DIS 0x00 +#define MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1 (0x01 << 2) +#define MGA1064_DISP_CTL_DAC2OUTSEL_CRTC2 (0x02 << 2) +#define MGA1064_DISP_CTL_DAC2OUTSEL_TVE (0x03 << 2) +#define MGA1064_DISP_CTL_PANOUTSEL_MASK (0x03 << 5) +#define MGA1064_DISP_CTL_PANOUTSEL_DIS 0x00 +#define MGA1064_DISP_CTL_PANOUTSEL_CRTC1 (0x01 << 5) +#define MGA1064_DISP_CTL_PANOUTSEL_CRTC2RGB (0x02 << 5) +#define MGA1064_DISP_CTL_PANOUTSEL_CRTC2656 (0x03 << 5) + #define MGA1064_SYNC_CTL 0x8b + #define MGA1064_PWR_CTL 0xa0 +#define MGA1064_PWR_CTL_DAC2_EN (0x01 << 0) +#define MGA1064_PWR_CTL_VID_PLL_EN (0x01 << 1) +#define MGA1064_PWR_CTL_PANEL_EN (0x01 << 2) +#define MGA1064_PWR_CTL_RFIFO_EN (0x01 << 3) +#define MGA1064_PWR_CTL_CFIFO_EN (0x01 << 4) + #define MGA1064_PAN_CTL 0xa2 /* Using crtc2 */ @@ -424,6 +445,29 @@ #define MGAREG2_C2DATACTL 0x4c #define MGAREG_C2CTL 0x3c10 +#define MGAREG_C2CTL_C2_EN 0x01 + +#define MGAREG_C2_HIPRILVL_M (0x07 << 4) +#define MGAREG_C2_MAXHIPRI_M (0x07 << 8) + +#define MGAREG_C2CTL_PIXCLKSEL_MASK (0x03 << 1) +#define MGAREG_C2CTL_PIXCLKSELH_MASK (0x01 << 14) +#define MGAREG_C2CTL_PIXCLKSEL_PCICLK 0x00 +#define MGAREG_C2CTL_PIXCLKSEL_VDOCLK (0x01 << 1) +#define MGAREG_C2CTL_PIXCLKSEL_PIXELPLL (0x02 << 1) +#define MGAREG_C2CTL_PIXCLKSEL_VIDEOPLL (0x03 << 1) +#define MGAREG_C2CTL_PIXCLKSEL_VDCLK (0x01 << 14) + +#define MGAREG_C2CTL_PIXCLKSEL_CRISTAL (0x01 << 1) | (0x01 << 14) +#define MGAREG_C2CTL_PIXCLKSEL_SYSTEMPLL (0x02 << 1) | (0x01 << 14) + +#define MGAREG_C2CTL_PIXCLKDIS_MASK (0x01 << 3) +#define MGAREG_C2CTL_PIXCLKDIS_DISABLE (0x01 << 3) + +#define MGAREG_C2CTL_CRTCDACSEL_MASK (0x01 << 20) +#define MGAREG_C2CTL_CRTCDACSEL_CRTC1 0x00 +#define MGAREG_C2CTL_CRTCDACSEL_CRTC2 (0x01 << 20) + #define MGAREG_C2HPARAM 0x3c14 #define MGAREG_C2HSYNC 0x3c18 #define MGAREG_C2VPARAM 0x3c1c ++++++ xf86-video-nv-1.2.1.tar.bz2 -> xf86-video-nv-1.2.2.tar.bz2 ++++++ ++++ 2957 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.1/ChangeLog new/xf86-video-nv-1.2.2/ChangeLog --- old/xf86-video-nv-1.2.1/ChangeLog 2006-12-01 19:57:41.000000000 +0100 +++ new/xf86-video-nv-1.2.2/ChangeLog 2006-12-16 00:48:56.000000000 +0100 @@ -1,3 +1,22 @@ +commit 10c7c54888d1dd4198c79e852c57420e8d52ccc5 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 01:47:42 2006 +0200 + + bump to 1.2.2 + +commit 6d02bdb71bb34205955e76a99939a7be34c676c7 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Dec 6 18:48:37 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + +commit 33e10132a87409bdfa77d5eef9f7044cb9ce1ac9 +Author: Aaron Plattner <aplattner(a)nvidia.com> +Date: Mon Dec 4 12:52:55 2006 -0800 + + Remove redundant XORG_RELEASE_VERSION. + commit 2d4b4bb06029e60e5c7b96d94b31c8aadac91843 Author: Aaron Plattner <aplattner(a)nvidia.com> Date: Thu Nov 30 17:41:41 2006 -0800 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.1/Makefile.am new/xf86-video-nv-1.2.2/Makefile.am --- old/xf86-video-nv-1.2.1/Makefile.am 2006-06-30 03:38:19.000000000 +0200 +++ new/xf86-video-nv-1.2.2/Makefile.am 2006-12-06 17:48:19.000000000 +0100 @@ -23,8 +23,10 @@ EXTRA_DIST = README.NV1 ChangeLog -# Always regenerate the changelog CLEANFILES = ChangeLog -ChangeLog: FORCE - git-log > ChangeLog -FORCE: +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.1/configure.ac new/xf86-video-nv-1.2.2/configure.ac --- old/xf86-video-nv-1.2.1/configure.ac 2006-12-01 02:41:34.000000000 +0100 +++ new/xf86-video-nv-1.2.2/configure.ac 2006-12-16 00:47:37.000000000 +0100 @@ -22,12 +22,10 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-nv], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-nv) -XORG_RELEASE_VERSION - AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) ++++++ xf86-video-rendition-4.1.2.tar.bz2 -> xf86-video-rendition-4.1.3.tar.bz2 ++++++ ++++ 17468 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/ChangeLog new/xf86-video-rendition-4.1.3/ChangeLog --- old/xf86-video-rendition-4.1.2/ChangeLog 2006-11-05 19:02:34.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/ChangeLog 2006-12-16 00:55:42.000000000 +0100 @@ -1,3 +1,16 @@ +commit b3872c3317fe560d47a0a621d7a9bd6f81d3573a +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 01:54:57 2006 +0200 + + bump to 4.1.3 + +commit 397370ab1099ae1231c9ae709c91a0ad74c82f2b +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Dec 6 18:49:28 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + commit 59db4ddcaee381595e4a134de3cc5f6eb8de4fe8 Author: Matthieu Herrb <matthieu(a)deville.herrb.com> Date: Sun Nov 5 19:01:56 2006 +0100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/Makefile.am new/xf86-video-rendition-4.1.3/Makefile.am --- old/xf86-video-rendition-4.1.2/Makefile.am 2006-11-05 18:56:36.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/Makefile.am 2006-12-06 17:49:03.000000000 +0100 @@ -33,6 +33,6 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/config.h.in new/xf86-video-rendition-4.1.3/config.h.in --- old/xf86-video-rendition-4.1.2/config.h.in 2006-11-05 19:02:34.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/config.h.in 2006-12-16 00:55:31.000000000 +0100 @@ -56,6 +56,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/configure.ac new/xf86-video-rendition-4.1.3/configure.ac --- old/xf86-video-rendition-4.1.2/configure.ac 2006-11-05 19:00:37.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/configure.ac 2006-12-16 00:54:51.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-rendition], - 4.1.2, + 4.1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xf86-video-rendition) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Tue Dec 19 17:21:24 CET 2006. -------- --- xorg-x11/xorg-x11.changes 2006-12-16 06:06:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-12-17 11:43:27.000000000 +0100 @@ -1,0 +2,12 @@ +Sun Dec 17 11:41:26 CET 2006 - sndirsch(a)suse.de + +- updated beforelight to release 1.0.2 + * remove config.h from _SOURCES + * Makefile.am: make appdefaultdir respect DESTDIR +- updated fonttosfnt to release 1.0.3 + * Makefile.am: make ChangeLog hook safer + * Fix author address in manual page, update COPYING. +- updated xdm to release 1.1.3 + * Makefile.am: make ChangeLog hook safer + +------------------------------------------------------------------- Old: ---- beforelight-X11R7.0-1.0.1.tar.bz2 fonttosfnt-1.0.2.tar.bz2 xdm-1.1.2.tar.bz2 New: ---- beforelight-1.0.2.tar.bz2 beforelight.diff fonttosfnt-1.0.3.tar.bz2 xdm-1.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.Orsc1c/_old 2006-12-19 17:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.Orsc1c/_new 2006-12-19 17:18:00.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 34 +Release: 36 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -24,10 +24,10 @@ Summary: X.Org core and sample applications Source0: appres-X11R7.0-1.0.0.tar.bz2 Source1: bdftopcf-X11R7.0-1.0.0.tar.bz2 -Source2: beforelight-X11R7.0-1.0.1.tar.bz2 +Source2: beforelight-1.0.2.tar.bz2 Source3: bitmap-X11R7.1-1.0.2.tar.bz2 Source4: editres-1.0.2.tar.bz2 -Source5: fonttosfnt-1.0.2.tar.bz2 +Source5: fonttosfnt-1.0.3.tar.bz2 Source6: fslsfonts-X11R7.0-1.0.1.tar.bz2 Source7: fstobdf-X11R7.1-1.0.2.tar.bz2 Source8: iceauth-X11R7.0-1.0.1.tar.bz2 @@ -60,7 +60,7 @@ Source36: xcursorgen-X11R7.1-1.0.1.tar.bz2 Source37: xdbedizzy-1.0.2.tar.bz2 Source38: xditview-X11R7.0-1.0.1.tar.bz2 -Source39: xdm-1.1.2.tar.bz2 +Source39: xdm-1.1.3.tar.bz2 Source40: xdpyinfo-X11R7.0-1.0.1.tar.bz2 Source41: xdriinfo-X11R7.1-1.0.1.tar.bz2 Source42: xedit-X11R7.1-1.0.2.tar.bz2 @@ -140,6 +140,7 @@ Patch19: scripts.diff Patch20: xdm.diff Patch21: xvidtune.diff +Patch22: beforelight.diff %description This package contains the X.Org core and sample applications. @@ -222,6 +223,7 @@ %patch17 patch -d scripts-* -p0 -s < %PATCH19 patch -d xvidtune-* -p0 -s < %PATCH21 +patch -d beforelight-* -p0 -s < %PATCH22 %build @@ -235,7 +237,7 @@ #autoreconf -fi case $dir in xdm-*) option="--with-pam --with-xdmconfigdir=/etc/X11/xdm --with-xdmscriptdir=/etc/X11/xdm" ;; - xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*) + xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*|beforelight-*) option=""; autoreconf -fi ;; luit-*) option="--with-localealiasfile=/usr/share/X11/locale/locale.alias" ;; *) option="" ;; @@ -442,6 +444,15 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Sun Dec 17 2006 - sndirsch(a)suse.de +- updated beforelight to release 1.0.2 + * remove config.h from _SOURCES + * Makefile.am: make appdefaultdir respect DESTDIR +- updated fonttosfnt to release 1.0.3 + * Makefile.am: make ChangeLog hook safer + * Fix author address in manual page, update COPYING. +- updated xdm to release 1.1.3 + * Makefile.am: make ChangeLog hook safer * Sat Dec 16 2006 - sndirsch(a)suse.de - updated editres to release 1.0.2 * remove config.h from _SOURCES ++++++ beforelight-X11R7.0-1.0.1.tar.bz2 -> beforelight-1.0.2.tar.bz2 ++++++ ++++ 12500 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-X11R7.0-1.0.1/Makefile.am new/beforelight-1.0.2/Makefile.am --- old/beforelight-X11R7.0-1.0.1/Makefile.am 2005-12-07 17:17:57.000000000 +0100 +++ new/beforelight-1.0.2/Makefile.am 2006-12-15 23:16:57.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.15 2005/12/07 16:17:57 kem Exp $ +# $Id$ # # Copyright 2005 Red Hat, Inc. # @@ -26,15 +26,14 @@ beforelight_LDADD = $(BEFORELIGHT_LIBS) beforelight_SOURCES = \ - b4light.c \ - config.h + b4light.c appman_PRE = \ beforelight.man # App default files (*.ad) -appdefaultdir = @appdefaultdir@ +appdefaultdir = $(DESTDIR)@appdefaultdir@ EXTRA_DIST = \ Beforelight.ad @@ -51,7 +50,6 @@ CLEANFILES = $(APPDEFAULTFILES) - appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-X11R7.0-1.0.1/compile new/beforelight-1.0.2/compile --- old/beforelight-X11R7.0-1.0.1/compile 2005-12-21 08:20:08.000000000 +0100 +++ new/beforelight-1.0.2/compile 2006-12-15 22:27:37.000000000 +0100 @@ -1,8 +1,9 @@ #! /bin/sh - # Wrapper for compilers which do not understand `-c -o'. -# Copyright 1999, 2000 Free Software Foundation, Inc. +scriptversion=2005-05-14.22 + +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,83 +18,125 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -prog=$1 -shift +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to <bug-automake(a)gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; +esac ofile= cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we do something ugly here. - ofile=$2 - shift - case "$ofile" in - *.o | *.obj) - ;; - *) - args="$args -o $ofile" - ofile= - ;; - esac - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$prog" $args + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" fi # Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. # Note: use `[/.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 +trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. -"$prog" $args -status=$? +"$@" +ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" fi -rmdir $lockdir -exit $status +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-X11R7.0-1.0.1/config.h new/beforelight-1.0.2/config.h --- old/beforelight-X11R7.0-1.0.1/config.h 2005-12-21 08:20:10.000000000 +0100 +++ new/beforelight-1.0.2/config.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Name of package */ -#define PACKAGE "beforelight" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "beforelight" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "beforelight 1.0.1" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "beforelight" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.1" - -/* Version number of package */ -#define VERSION "1.0.1" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-X11R7.0-1.0.1/config.h.in new/beforelight-1.0.2/config.h.in --- old/beforelight-X11R7.0-1.0.1/config.h.in 2005-12-21 08:20:07.000000000 +0100 +++ new/beforelight-1.0.2/config.h.in 2006-12-15 23:13:47.000000000 +0100 @@ -18,5 +18,14 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Version number of package */ #undef VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-X11R7.0-1.0.1/configure.ac new/beforelight-1.0.2/configure.ac --- old/beforelight-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:42.000000000 +0100 +++ new/beforelight-1.0.2/configure.ac 2006-12-15 23:12:59.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(beforelight,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],beforelight) +AC_INIT(beforelight,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],beforelight) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-X11R7.0-1.0.1/missing new/beforelight-1.0.2/missing --- old/beforelight-X11R7.0-1.0.1/missing 2005-12-21 08:20:08.000000000 +0100 +++ new/beforelight-1.0.2/missing 2006-12-15 22:27:37.000000000 +0100 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2005-06-08.21 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -15,8 +19,8 @@ # 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., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -38,18 +42,24 @@ configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake(a)gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,14 +101,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,14 +185,9 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." @@ -185,7 +209,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,32 +281,30 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -323,8 +340,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +351,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: ++++++ beforelight.diff ++++++ --- Makefile.am.orig 2006-12-17 17:06:57.112745348 +0100 +++ Makefile.am 2006-12-17 17:07:25.897816333 +0100 @@ -33,7 +33,7 @@ # App default files (*.ad) -appdefaultdir = $(DESTDIR)@appdefaultdir@ +appdefaultdir = @appdefaultdir@ EXTRA_DIST = \ Beforelight.ad ++++++ fonttosfnt-1.0.2.tar.bz2 -> fonttosfnt-1.0.3.tar.bz2 ++++++ ++++ 7164 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fonttosfnt-1.0.2/COPYING new/fonttosfnt-1.0.3/COPYING --- old/fonttosfnt-1.0.2/COPYING 2006-10-12 00:13:40.000000000 +0200 +++ new/fonttosfnt-1.0.3/COPYING 2006-11-08 15:06:01.000000000 +0100 @@ -1,12 +1,19 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (c) 2002-2003 by Juliusz Chroboczek -Please submit updated COPYING files to the Xorg bugzilla: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: - -http://lists.freedesktop.org/mailman/listinfo/xorg +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fonttosfnt-1.0.2/ChangeLog new/fonttosfnt-1.0.3/ChangeLog --- old/fonttosfnt-1.0.2/ChangeLog 2006-10-13 23:30:19.000000000 +0200 +++ new/fonttosfnt-1.0.3/ChangeLog 2006-12-16 00:37:55.000000000 +0100 @@ -1,3 +1,28 @@ +commit 0c316fb4aadf26bea5784974cd484483d6322b5c +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 01:37:31 2006 +0200 + + bump to 1.0.3 + +commit 0eba2afb80bf17c0a2d2753ff92c1986211d92be +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Dec 6 19:01:27 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + +commit 8c2de974ec3df06a547906474ced5ffb4a07a6b5 +Author: Juliusz Chroboczek <jch(a)pps.jussieu.fr> +Date: Tue Oct 31 01:48:49 2006 +0100 + + Fix author address in manual page, update COPYING. + +commit e734cef9baff470a5e913f2e9ac7e0ce649ea7dc +Author: Adam Jackson <ajax(a)benzedrine.nwnk.net> +Date: Fri Oct 13 17:30:24 2006 -0400 + + Bump to 1.0.2 + commit 72caf26ad336b3de9af3e640f939ea2cd0caa42b Author: Adam Jackson <ajax(a)benzedrine.nwnk.net> Date: Thu Oct 12 20:56:01 2006 -0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fonttosfnt-1.0.2/Makefile.am new/fonttosfnt-1.0.3/Makefile.am --- old/fonttosfnt-1.0.2/Makefile.am 2006-10-13 02:55:11.000000000 +0200 +++ new/fonttosfnt-1.0.3/Makefile.am 2006-12-06 18:01:14.000000000 +0100 @@ -75,6 +75,6 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fonttosfnt-1.0.2/config.h.in new/fonttosfnt-1.0.3/config.h.in --- old/fonttosfnt-1.0.2/config.h.in 2006-10-13 23:30:19.000000000 +0200 +++ new/fonttosfnt-1.0.3/config.h.in 2006-12-16 00:37:51.000000000 +0100 @@ -18,5 +18,14 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Version number of package */ #undef VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fonttosfnt-1.0.2/configure.ac new/fonttosfnt-1.0.3/configure.ac --- old/fonttosfnt-1.0.2/configure.ac 2006-10-13 23:28:53.000000000 +0200 +++ new/fonttosfnt-1.0.3/configure.ac 2006-12-16 00:37:26.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(fonttosfnt,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fonttosfnt) +AC_INIT(fonttosfnt,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fonttosfnt) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fonttosfnt-1.0.2/fonttosfnt.man new/fonttosfnt-1.0.3/fonttosfnt.man --- old/fonttosfnt-1.0.2/fonttosfnt.man 2006-10-12 00:13:40.000000000 +0200 +++ new/fonttosfnt-1.0.3/fonttosfnt.man 2006-11-08 15:06:01.000000000 +0100 @@ -27,8 +27,8 @@ cell fonts (terminal fonts). .TP .B \-b -Write byte-aligned glyph data. By default, bit-aligned data is -written, which yields a smaller file size. +Write byte-aligned glyph data. By default, unaligned data is written, +which yields a smaller file size. .TP .B \-r Do not reencode fonts. By default, fonts are reencoded to Unicode @@ -69,10 +69,9 @@ are dummy values. .SH SEE ALSO X(7), Xserver(1), Xft(3x). -.I Fonts in X. +.I Fonts in X11. .SH AUTHOR The version of .B Fonttosfnt -included in this X.Org Foundation release -was originally written by Juliusz Chroboczek <jch(a)xfree86.org> -for the XFree86 project. +included in this X.Org Foundation release was originally written by +Juliusz Chroboczek <jch(a)freedesktop.org> for the XFree86 project. ++++++ p_xauth.diff ++++++ --- /var/tmp/diff_new_pack.Orsc1c/_old 2006-12-19 17:18:03.000000000 +0100 +++ /var/tmp/diff_new_pack.Orsc1c/_new 2006-12-19 17:18:03.000000000 +0100 @@ -174,7 +174,7 @@ extern int auth_finalize ( void ); extern int process_command ( char *inputfilename, int lineno, int argc, char **argv ); --- programs/xdm/auth.c.orig 2005-11-09 10:41:27.000000000 +0100 -+++ xdm-1.1.2/auth.c 2005-11-11 11:33:00.000000000 +0100 ++++ xdm-1.1.3/auth.c 2005-11-11 11:33:00.000000000 +0100 @@ -680,7 +680,7 @@ } ++++++ xdm-1.1.2.tar.bz2 -> xdm-1.1.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/ChangeLog new/xdm-1.1.3/ChangeLog --- old/xdm-1.1.2/ChangeLog 2006-11-30 18:53:19.000000000 +0100 +++ new/xdm-1.1.3/ChangeLog 2006-12-16 00:40:25.000000000 +0100 @@ -1,3 +1,16 @@ +commit 0128497fac0794d947fa44b433550fe064905d8d +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 01:38:30 2006 +0200 + + xdm 1.1.3 + +commit 3bc9148509a058647a9c43d0e2668c94ac579884 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Wed Dec 6 19:01:52 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + commit 75a8fce621adecd50db129c839a578df630137db Author: Daniel Stone <daniel(a)fooishbar.org> Date: Thu Nov 30 19:49:31 2006 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/Makefile.am new/xdm-1.1.3/Makefile.am --- old/xdm-1.1.2/Makefile.am 2006-11-08 15:36:58.000000000 +0100 +++ new/xdm-1.1.3/Makefile.am 2006-12-06 18:01:40.000000000 +0100 @@ -179,7 +179,7 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/Makefile.in new/xdm-1.1.3/Makefile.in --- old/xdm-1.1.2/Makefile.in 2006-11-30 18:50:24.000000000 +0100 +++ new/xdm-1.1.3/Makefile.in 2006-12-16 00:39:07.000000000 +0100 @@ -1632,7 +1632,7 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/aclocal.m4 new/xdm-1.1.3/aclocal.m4 --- old/xdm-1.1.2/aclocal.m4 2006-11-30 18:50:09.000000000 +0100 +++ new/xdm-1.1.3/aclocal.m4 2006-12-16 00:38:58.000000000 +0100 @@ -6650,7 +6650,7 @@ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.1 + [XORG_MACROS_version=1.1.3 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -7054,7 +7054,8 @@ # -------------------- # Adds --with/without-release-string and changes the PACKAGE and # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -7067,6 +7068,23 @@ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$.*/\1/p'`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$\.$[[^\.]]\+$.*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^$[[^\.]]\+$\.$[[^\.]]\+$\.$[[^\.]]\+$.*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ @@ -7908,10 +7926,10 @@ AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@' + _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/config.h.in new/xdm-1.1.3/config.h.in --- old/xdm-1.1.2/config.h.in 2006-11-30 18:50:18.000000000 +0100 +++ new/xdm-1.1.3/config.h.in 2006-12-16 00:39:04.000000000 +0100 @@ -135,6 +135,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/configure new/xdm-1.1.3/configure --- old/xdm-1.1.2/configure 2006-11-30 18:50:18.000000000 +0100 +++ new/xdm-1.1.3/configure 2006-12-16 00:39:04.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for xdm 1.1.2. +# Generated by GNU Autoconf 2.60 for xdm 1.1.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='xdm' PACKAGE_TARNAME='xdm' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='xdm 1.1.2' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='xdm 1.1.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -1494,7 +1494,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xdm 1.1.2 to adapt to many kinds of systems. +\`configure' configures xdm 1.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1564,7 +1564,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xdm 1.1.2:";; + short | recursive ) echo "Configuration of xdm 1.1.3:";; esac cat <<\_ACEOF @@ -1745,7 +1745,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xdm configure 1.1.2 +xdm configure 1.1.3 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1759,7 +1759,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xdm $as_me 1.1.2, which was +It was created by xdm $as_me 1.1.3, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2418,10 +2418,10 @@ AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@' + test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' @@ -2452,7 +2452,7 @@ # Define the identity of the package. PACKAGE='xdm' - VERSION='1.1.2' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -25797,6 +25797,29 @@ echo "$as_me: Building with package name set to $PACKAGE" >&6;} fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$.*/\1/p'` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$\.$[^\.]\+$.*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^$[^\.]\+$\.$[^\.]\+$\.$[^\.]\+$.*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + ac_config_files="$ac_config_files Makefile config/Makefile greeter/Makefile" @@ -26274,7 +26297,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xdm $as_me 1.1.2, which was +This file was extended by xdm $as_me 1.1.3, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26327,7 +26350,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xdm config.status 1.1.2 +xdm config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/configure.ac new/xdm-1.1.3/configure.ac --- old/xdm-1.1.2/configure.ac 2006-11-30 18:49:23.000000000 +0100 +++ new/xdm-1.1.3/configure.ac 2006-12-16 00:38:24.000000000 +0100 @@ -24,7 +24,7 @@ dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $ AC_PREREQ([2.57]) -AC_INIT(xdm,[1.1.2],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm) +AC_INIT(xdm,[1.1.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rdesktop
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package rdesktop checked in at Tue Dec 19 17:20:22 CET 2006. -------- --- rdesktop/rdesktop.changes 2006-11-06 20:32:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/rdesktop/rdesktop.changes 2006-12-19 10:51:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 19 10:49:52 CET 2006 - mc(a)suse.de + +- fix "comparison with string literal" [#228709] + +------------------------------------------------------------------- New: ---- rdesktop-1.5.0-fix-printer-strcmp.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdesktop.spec ++++++ --- /var/tmp/diff_new_pack.LLRXng/_old 2006-12-19 17:17:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LLRXng/_new 2006-12-19 17:17:30.000000000 +0100 @@ -13,15 +13,16 @@ Name: rdesktop BuildRequires: openssl-devel xorg-x11-devel URL: http://www.rdesktop.org/ -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/Other Autoreqprov: on Version: 1.5.0 -Release: 14 +Release: 25 Summary: a Remote Desktop Protocol client Source: %{name}-%{version}.tar.bz2 Patch0: rdesktop-1.4.0-lib64.dif Patch1: rdesktop-1.5.0-fs-fix-1.dif +Patch2: rdesktop-1.5.0-fix-printer-strcmp.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,6 +41,7 @@ %setup %patch0 %patch1 +%patch2 %build %{suse_update_config} @@ -69,6 +71,8 @@ %{_mandir}/man1/rdesktop.1.gz %changelog -n rdesktop +* Tue Dec 19 2006 - mc(a)suse.de +- fix "comparison with string literal" [#228709] * Mon Nov 06 2006 - schwab(a)suse.de - Don't strip binaries. * Tue Sep 19 2006 - mc(a)suse.de ++++++ rdesktop-1.5.0-fix-printer-strcmp.dif ++++++ --- printer.c +++ printer.c 2006/12/19 09:38:51 @@ -110,7 +110,7 @@ pprinter_data = (PRINTER *) g_rdpdr_device[device_id].pdevice_data; /* default printer name use default printer queue as well in unix */ - if (pprinter_data->printer == "mydeskjet") + if (strcmp(pprinter_data->printer, "mydeskjet") == 0) { pprinter_data->printer_fp = popen("lpr", "w"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xinetd
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package xinetd checked in at Tue Dec 19 17:18:09 CET 2006. -------- --- xinetd/xinetd.changes 2006-02-06 12:47:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/xinetd/xinetd.changes 2006-12-19 15:14:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 19 15:13:26 CET 2006 - prusnak(a)suse.cz + +- added "discard" to service files (and modified ipv6-ipv4-fallback.patch) [#222777] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinetd.spec ++++++ --- /var/tmp/diff_new_pack.N0D7LT/_old 2006-12-19 17:17:54.000000000 +0100 +++ /var/tmp/diff_new_pack.N0D7LT/_new 2006-12-19 17:17:54.000000000 +0100 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -19,7 +19,7 @@ Requires: logrotate Autoreqprov: on Version: 2.3.14 -Release: 3 +Release: 34 URL: http://www.xinetd.org/ Summary: An 'inetd' with Expanded Functionality Source0: %{name}-%{version}.tar.bz2 @@ -112,6 +112,8 @@ %config(noreplace) /etc/xinetd.conf %changelog -n xinetd +* Tue Dec 19 2006 - prusnak(a)suse.cz +- added "discard" to service files (and modified ipv6-ipv4-fallback.patch) [#222777] * Mon Feb 06 2006 - mmarek(a)suse.cz - fixed logrotate file rotating rotated files [#120068, #147899] @@ -205,8 +207,8 @@ - added %%insserv_prereq and %%fillup_prereq to PreReq [#18018] * Fri Aug 09 2002 - nadvornik(a)suse.cz - updated to 2.3.6 -- merged ipv6 and ipv4 support -- uses ipv4 by default, ipv6 can be configured per service + - merged ipv6 and ipv4 support + - uses ipv4 by default, ipv6 can be configured per service - removed obsolete patch xinetd-2.3.2-ipv4.dif * Sat Jul 27 2002 - adrian(a)suse.de - do not source rc.config ++++++ xinetd-2.3.14-ipv6-ipv4-fallback.patch ++++++ --- /var/tmp/diff_new_pack.N0D7LT/_old 2006-12-19 17:17:54.000000000 +0100 +++ /var/tmp/diff_new_pack.N0D7LT/_new 2006-12-19 17:17:54.000000000 +0100 @@ -78,6 +78,22 @@ port = 13 + FLAGS = IPv6 IPv4 } +--- etc/xinetd.d/discard ++++ etc/xinetd.d/discard +@@ -10,4 +10,5 @@ + user = root + wait = no + disable = yes ++ FLAGS = IPv6 IPv4 + } +--- etc/xinetd.d/discard-udp ++++ etc/xinetd.d/discard-udp +@@ -11,4 +11,5 @@ + wait = yes + disable = yes + port = 9 ++ FLAGS = IPv6 IPv4 + } --- etc/xinetd.d/echo +++ etc/xinetd.d/echo @@ -10,4 +10,5 @@ ++++++ xinetd-service_files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/xinetd.d/discard new/etc/xinetd.d/discard --- old/etc/xinetd.d/discard 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/xinetd.d/discard 2006-12-19 15:06:35.000000000 +0100 @@ -0,0 +1,13 @@ +# default: off +# description: A discard server. This is the tcp version. + +service discard +{ + type = INTERNAL + id = discard-stream + socket_type = stream + protocol = tcp + user = root + wait = no + disable = yes +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/xinetd.d/discard-udp new/etc/xinetd.d/discard-udp --- old/etc/xinetd.d/discard-udp 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/xinetd.d/discard-udp 2006-12-19 15:12:12.000000000 +0100 @@ -0,0 +1,14 @@ +# default: off +# description: A discard server. This is the udp version. + +service discard +{ + type = INTERNAL UNLISTED + id = discard-dgram + socket_type = dgram + protocol = udp + user = root + wait = yes + disable = yes + port = 9 +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scarse
by root＠suse.de 19 Dec '06

19 Dec '06

Hello community, here is the log from the commit of package scarse checked in at Tue Dec 19 17:17:53 CET 2006. -------- --- scarse/scarse.changes 2006-05-24 22:01:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/scarse/scarse.changes 2006-12-19 11:00:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 19 11:00:28 CET 2006 - meissner(a)suse.de + +- fixed build. + +------------------------------------------------------------------- New: ---- scarse-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scarse.spec ++++++ --- /var/tmp/diff_new_pack.1HFeLf/_old 2006-12-19 17:17:38.000000000 +0100 +++ /var/tmp/diff_new_pack.1HFeLf/_new 2006-12-19 17:17:38.000000000 +0100 @@ -13,25 +13,26 @@ Name: scarse BuildRequires: libtiff-devel Version: 0.4.alpha -Release: 14 +Release: 35 %define _version 0.4 %define __version 0.4-alpha URL: http://www.scarse.org/ Group: Productivity/Graphics/Other -License: GPL, BSD +License: BSD License and BSD-like, GNU General Public License (GPL) Summary: Scanner CAlibration ReaSonably Easy Source: %{name}-%{_version}-src.tar.bz2 Patch: scarse-0.4-alpha-gcc4.patch Patch1: scarse-icclib-fix.patch Patch2: scarse-0.4-alpha-integer.patch Patch3: scarse-strip.patch +Patch4: scarse-fix.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Scarse is a free color calibration and management software package. It lets you build and use ICC profiles. Custom profiles can be generated -from variety of calibration targets. +from a variety of calibration targets. @@ -45,6 +46,7 @@ %patch1 %patch2 %patch3 +%patch4 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -69,6 +71,8 @@ /usr/share/scarse %changelog -n scarse +* Tue Dec 19 2006 - meissner(a)suse.de +- fixed build. * Wed May 24 2006 - schwab(a)suse.de - Don't strip binaries. * Fri Jan 27 2006 - mls(a)suse.de ++++++ scarse-fix.patch ++++++ --- scarse-0.4-alpha/src/ipb.c.xx 2006-12-19 10:54:15.000000000 +0100 +++ scarse-0.4-alpha/src/ipb.c 2006-12-19 10:56:19.000000000 +0100 @@ -1154,7 +1154,8 @@ char *s = strchr(optarg, ':'); if (!s) usage(); - x = strtod(++s, &s); + s++; + x = strtod(s, &s); if (*s != ',') usage(); y = strtod(++s, NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0