Home | History | Annotate | Line # | Download | only in dist
ChangeLog revision 1.1.1.3
      1  1.1.1.3  mrg commit 2abf1e4cbff8b67f836dd4102dcc0a179d98a142
      2  1.1.1.3  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
      3  1.1.1.3  mrg Date:   Sat Nov 6 08:59:31 2010 -0700
      4  1.1.1.3  mrg 
      5  1.1.1.3  mrg     xvinfo 1.1.1
      6  1.1.1.3  mrg     
      7  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
      8  1.1.1.3  mrg 
      9  1.1.1.3  mrg commit 3d447fb4fd0f75e3dbaa7c1c9d3eb565fdfc1214
     10  1.1.1.3  mrg Author: Jesse Adkins <jesserayadkins (a] gmail.com>
     11  1.1.1.3  mrg Date:   Tue Sep 28 13:29:50 2010 -0700
     12  1.1.1.3  mrg 
     13  1.1.1.3  mrg     Purge cvs tags.
     14  1.1.1.3  mrg     
     15  1.1.1.3  mrg     Signed-off-by: Jesse Adkins <jesserayadkins (a] gmail.com>
     16  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     17  1.1.1.3  mrg 
     18  1.1.1.3  mrg commit 6961d77007443b63a014362805bd93c20d853ab7
     19  1.1.1.3  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     20  1.1.1.3  mrg Date:   Sun Sep 26 18:26:41 2010 -0700
     21  1.1.1.3  mrg 
     22  1.1.1.3  mrg     config: Remove unnecessary calls from configure.ac
     23  1.1.1.3  mrg     
     24  1.1.1.3  mrg     AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
     25  1.1.1.3  mrg     PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
     26  1.1.1.3  mrg     
     27  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     28  1.1.1.3  mrg 
     29  1.1.1.3  mrg commit a69ea17324a94d667fc1661b70f2a365b75f3c6b
     30  1.1.1.3  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     31  1.1.1.3  mrg Date:   Sun Sep 26 18:25:57 2010 -0700
     32  1.1.1.3  mrg 
     33  1.1.1.3  mrg     config: upgrade to util-macros 1.8 for additional man page support
     34  1.1.1.3  mrg     
     35  1.1.1.3  mrg     Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
     36  1.1.1.3  mrg     The value of MAN_SUBST is the same for all X.Org packages.
     37  1.1.1.3  mrg     
     38  1.1.1.3  mrg     Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
     39  1.1.1.3  mrg     Enables use of platform appropriate version of sed.
     40  1.1.1.3  mrg     
     41  1.1.1.3  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
     42  1.1.1.3  mrg 
     43  1.1.1.3  mrg commit 8c8a1727709dab613f97548ee374f3ffc8946653
     44  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     45  1.1.1.3  mrg Date:   Tue Jul 20 18:45:18 2010 -0400
     46  1.1.1.3  mrg 
     47  1.1.1.3  mrg     config: update AC_PREREQ statement to 2.60
     48  1.1.1.3  mrg     
     49  1.1.1.3  mrg     Unrelated to the previous patches, the new value simply reflects
     50  1.1.1.3  mrg     the reality that the minimum level for autoconf to configure
     51  1.1.1.3  mrg     all x.org modules is 2.60 dated June 2006.
     52  1.1.1.3  mrg     
     53  1.1.1.3  mrg     ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
     54  1.1.1.3  mrg     
     55  1.1.1.3  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
     56  1.1.1.3  mrg 
     57  1.1.1.3  mrg commit 0bd2b71d9ce58a2661db584a6c6a03aec06e701c
     58  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     59  1.1.1.3  mrg Date:   Thu Nov 26 09:19:55 2009 -0500
     60  1.1.1.3  mrg 
     61  1.1.1.3  mrg     Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
     62  1.1.1.3  mrg     
     63  1.1.1.3  mrg     Now that the INSTALL file is generated.
     64  1.1.1.3  mrg     Allows running make maintainer-clean.
     65  1.1.1.3  mrg 
     66  1.1.1.3  mrg commit 6d33f774fdead950a8561598b84a10ddb970f20c
     67  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     68  1.1.1.3  mrg Date:   Wed Oct 28 14:09:09 2009 -0400
     69  1.1.1.3  mrg 
     70  1.1.1.3  mrg     INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
     71  1.1.1.3  mrg     
     72  1.1.1.3  mrg     Add missing INSTALL file. Use standard GNU file on building tarball
     73  1.1.1.3  mrg     README may have been updated
     74  1.1.1.3  mrg     Remove AUTHORS file as it is empty and no content available yet.
     75  1.1.1.3  mrg     Remove NEWS file as it is empty and no content available yet.
     76  1.1.1.3  mrg 
     77  1.1.1.3  mrg commit fd408b06820004bf0cc090844ec28764f090339b
     78  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     79  1.1.1.3  mrg Date:   Mon Oct 26 22:08:39 2009 -0400
     80  1.1.1.3  mrg 
     81  1.1.1.3  mrg     Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
     82  1.1.1.3  mrg     
     83  1.1.1.3  mrg     ChangeLog filename is known to Automake and requires no further
     84  1.1.1.3  mrg     coding in the makefile.
     85  1.1.1.3  mrg 
     86  1.1.1.3  mrg commit a5311e7cf9744cc84e2c0b55ab67850bb5907532
     87  1.1.1.3  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
     88  1.1.1.3  mrg Date:   Thu Oct 22 12:34:16 2009 -0400
     89  1.1.1.3  mrg 
     90  1.1.1.3  mrg     .gitignore: use common defaults with custom section # 24239
     91  1.1.1.3  mrg     
     92  1.1.1.3  mrg     Using common defaults will reduce errors and maintenance.
     93  1.1.1.3  mrg     Only the very small or inexistent custom section need periodic maintenance
     94  1.1.1.3  mrg     when the structure of the component changes. Do not edit defaults.
     95  1.1.1.3  mrg 
     96  1.1.1.3  mrg commit 8e37a3ede56ab5f5769e279ab180781880837ad4
     97  1.1.1.3  mrg Author: Jeremy Huddleston <jeremyhu (a] freedesktop.org>
     98  1.1.1.3  mrg Date:   Wed Oct 21 12:47:22 2009 -0700
     99  1.1.1.3  mrg 
    100  1.1.1.3  mrg     This is not a GNU project, so declare it foreign.
    101  1.1.1.3  mrg     
    102  1.1.1.3  mrg     On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
    103  1.1.1.3  mrg     > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
    104  1.1.1.3  mrg     > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
    105  1.1.1.3  mrg     > > was quite annoying to work around since 'autoreconf -fvi' replaces
    106  1.1.1.3  mrg     > > it and git wants to commit it.  Should these files even be in git?
    107  1.1.1.3  mrg     > > Can I nuke them for the betterment of humanity and since they get
    108  1.1.1.3  mrg     > > created by autoreconf anyways?
    109  1.1.1.3  mrg     >
    110  1.1.1.3  mrg     > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
    111  1.1.1.3  mrg     
    112  1.1.1.3  mrg     As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
    113  1.1.1.3  mrg     AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
    114  1.1.1.3  mrg     of the INSTALL file. It is also part of the 24206 solution.
    115  1.1.1.3  mrg     
    116  1.1.1.3  mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] freedesktop.org>
    117  1.1.1.3  mrg 
    118  1.1.1.2  mrg commit 32827c5b0928d61de0ab397beb8123ac0c4e1649
    119  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    120  1.1.1.2  mrg Date:   Fri Oct 16 19:46:04 2009 -0700
    121  1.1.1.2  mrg 
    122  1.1.1.2  mrg     xvinfo 1.1.0
    123  1.1.1.2  mrg     
    124  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    125  1.1.1.2  mrg 
    126  1.1.1.2  mrg commit 5f575d39fd0a246eb1842af8989b6b8fa6eebc36
    127  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    128  1.1.1.2  mrg Date:   Fri Oct 16 19:45:06 2009 -0700
    129  1.1.1.2  mrg 
    130  1.1.1.2  mrg     Add XFree86 generic copyright/license notice to COPYING
    131  1.1.1.2  mrg     
    132  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    133  1.1.1.2  mrg 
    134  1.1.1.2  mrg commit 232bd12671f129df0fbcd84e750cbd7a397612bd
    135  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    136  1.1.1.2  mrg Date:   Fri Oct 16 19:42:32 2009 -0700
    137  1.1.1.2  mrg 
    138  1.1.1.2  mrg     Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    139  1.1.1.2  mrg     
    140  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    141  1.1.1.2  mrg 
    142  1.1.1.2  mrg commit 82012961e5cee55a2dde8254325642f46b6449e2
    143  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    144  1.1.1.2  mrg Date:   Thu Oct 1 14:54:32 2009 -0700
    145  1.1.1.2  mrg 
    146  1.1.1.2  mrg     Add README with pointers to mailing lists, bugzilla, & git
    147  1.1.1.2  mrg     
    148  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    149  1.1.1.2  mrg 
    150  1.1.1.2  mrg commit 83ee7c6d98f4368df1f214aad6878dddc95f6c62
    151  1.1.1.2  mrg Author: Arthur HUILLET <arthur.huillet (a] free.fr>
    152  1.1.1.2  mrg Date:   Thu Jan 10 11:18:32 2008 +0100
    153  1.1.1.2  mrg 
    154  1.1.1.2  mrg     added -short option
    155  1.1.1.2  mrg 
    156  1.1.1.2  mrg commit 228dccc301ae10a1c17bb1cc91efcd5cef69db4f
    157  1.1.1.2  mrg Author: Paulo Cesar Pereira de Andrade <pcpa (a] mandriva.com.br>
    158  1.1.1.2  mrg Date:   Mon Jan 26 19:32:20 2009 -0200
    159  1.1.1.2  mrg 
    160  1.1.1.2  mrg     Correct make distcheck.
    161  1.1.1.2  mrg 
    162      1.1  mrg commit 8773a750f5489b4a8f577f87873066486e9d85a8
    163      1.1  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    164      1.1  mrg Date:   Thu Aug 16 16:26:16 2007 -0700
    165      1.1  mrg 
    166      1.1  mrg     Version bump: 1.0.2
    167      1.1  mrg 
    168      1.1  mrg commit ff49870534195814d4d5f0979f0273ad6ff4337e
    169      1.1  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    170      1.1  mrg Date:   Thu Aug 16 16:23:32 2007 -0700
    171      1.1  mrg 
    172      1.1  mrg     Replace static ChangeLog with dist-hook to generate from git log
    173      1.1  mrg 
    174      1.1  mrg commit a73b56466eba086b2eb6513b1674e6d7251b4a19
    175      1.1  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    176      1.1  mrg Date:   Thu Aug 16 16:21:30 2007 -0700
    177      1.1  mrg 
    178      1.1  mrg     Change xvinfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier
    179      1.1  mrg     
    180      1.1  mrg     Makefile.am:27: compiling `xvinfo.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
    181      1.1  mrg 
    182      1.1  mrg commit f237d5c415352c28c9dae1453aa3308532d42bb9
    183      1.1  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    184      1.1  mrg Date:   Thu May 24 18:06:34 2007 -0700
    185      1.1  mrg 
    186      1.1  mrg     Fix typo in man page (accesible)
    187      1.1  mrg 
    188      1.1  mrg commit a32fb538f49e8a7a23aef2a844d05f1cd3cc907a
    189      1.1  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    190      1.1  mrg Date:   Thu May 24 18:05:52 2007 -0700
    191      1.1  mrg 
    192      1.1  mrg     X.Org bug #10616: Add all the X info commands to See Also in man page
    193      1.1  mrg     
    194      1.1  mrg     X.Org Bugzilla #10616: <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
    195      1.1  mrg     Reported upstream from
    196      1.1  mrg     Debian bug #350313 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350313>
    197      1.1  mrg 
    198      1.1  mrg commit 29190804b219bf3e6289426a832b32ad2f4c53a4
    199      1.1  mrg Author: Michel Dnzer <michel (a] tungstengraphics.com>
    200      1.1  mrg Date:   Mon Jan 15 17:14:56 2007 +0100
    201      1.1  mrg 
    202      1.1  mrg     Fix FourCC name output on big endian platforms.
    203      1.1  mrg     
    204      1.1  mrg     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9665 .
    205      1.1  mrg 
    206      1.1  mrg commit 69758559c5ddb85bbf6501ea8e58c0896c7c1f11
    207      1.1  mrg Author: Michel Dnzer <michel (a] tungstengraphics.com>
    208      1.1  mrg Date:   Mon Jan 15 17:13:51 2007 +0100
    209      1.1  mrg 
    210      1.1  mrg     Make git ignore object files and Emacs style backup files.
    211      1.1  mrg 
    212      1.1  mrg commit f4363bef8760521d07a2b90d81dd85d19192bcf2
    213      1.1  mrg Author: Michel Dnzer <michel (a] tungstengraphics.com>
    214      1.1  mrg Date:   Mon Jan 15 17:12:57 2007 +0100
    215      1.1  mrg 
    216      1.1  mrg     Rename .cvsignore to .gitignore.
    217      1.1  mrg 
    218      1.1  mrg commit 9f0d4a66bbe6e11957e98d23b4baa8c76d8803b2
    219      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    220      1.1  mrg Date:   Wed Dec 21 02:29:54 2005 +0000
    221      1.1  mrg 
    222      1.1  mrg     Update package version for X11R7 release.
    223      1.1  mrg 
    224      1.1  mrg commit c2c5737fd62b06f0bbaf4ef58dfe4846bfbaf48b
    225      1.1  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    226      1.1  mrg Date:   Mon Dec 19 16:22:47 2005 +0000
    227      1.1  mrg 
    228      1.1  mrg     Stub COPYING files
    229      1.1  mrg 
    230      1.1  mrg commit cff129a50807c98e96b2c226be344ddbfb333c12
    231      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    232      1.1  mrg Date:   Thu Dec 15 00:24:12 2005 +0000
    233      1.1  mrg 
    234      1.1  mrg     Update package version number for final X11R7 release candidate.
    235      1.1  mrg 
    236      1.1  mrg commit dbb5b18240e906a9744e4133b3b76b0aa6ecb615
    237      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    238      1.1  mrg Date:   Tue Dec 6 22:48:26 2005 +0000
    239      1.1  mrg 
    240      1.1  mrg     Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
    241      1.1  mrg 
    242      1.1  mrg commit 997a79f1dd547c98a62e59865d41b52618023d54
    243      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    244      1.1  mrg Date:   Sat Dec 3 05:49:28 2005 +0000
    245      1.1  mrg 
    246      1.1  mrg     Update package version number for X11R7 RC3 release.
    247      1.1  mrg 
    248      1.1  mrg commit 1afcbdd5cbb3591ce86821d8f35e6132d45f93b6
    249      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    250      1.1  mrg Date:   Mon Nov 28 22:01:48 2005 +0000
    251      1.1  mrg 
    252      1.1  mrg     Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
    253      1.1  mrg         update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
    254      1.1  mrg 
    255      1.1  mrg commit 58bb86147def38e04034527352448759442fad2a
    256      1.1  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    257      1.1  mrg Date:   Mon Nov 21 10:35:09 2005 +0000
    258      1.1  mrg 
    259      1.1  mrg     Another pass at .cvsignores for apps.
    260      1.1  mrg 
    261      1.1  mrg commit 2f4d193fd9cd9120ad503c57cefd27d64c08c6d2
    262      1.1  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    263      1.1  mrg Date:   Sun Nov 20 22:08:56 2005 +0000
    264      1.1  mrg 
    265      1.1  mrg     Add/improve .cvsignore files for apps.
    266      1.1  mrg 
    267      1.1  mrg commit 6b03012da46f60873ff217d1c2173c28466484cf
    268      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    269      1.1  mrg Date:   Wed Oct 19 02:47:58 2005 +0000
    270      1.1  mrg 
    271      1.1  mrg     Update package version number for RC1 release.
    272      1.1  mrg 
    273      1.1  mrg commit 5b9c4ff0ef0a25c946b0bbf76a775eb7fba26837
    274      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    275      1.1  mrg Date:   Mon Oct 17 23:56:25 2005 +0000
    276      1.1  mrg 
    277      1.1  mrg     Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
    278      1.1  mrg         work better with BSD make
    279      1.1  mrg 
    280      1.1  mrg commit d3dc9ca7fed17500cda7382a0d3a8d389be221f9
    281      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    282      1.1  mrg Date:   Fri Oct 14 00:25:48 2005 +0000
    283      1.1  mrg 
    284      1.1  mrg     Use sed to fill in variables in man page
    285      1.1  mrg 
    286      1.1  mrg commit f28d1be9fffa0e097e1ec9aaa3d01e1fe6d0b110
    287      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    288      1.1  mrg Date:   Mon Aug 1 20:25:33 2005 +0000
    289      1.1  mrg 
    290      1.1  mrg     Install man pages to section 1 instead of section m (Patch from Donnie
    291      1.1  mrg         Berkholz)
    292      1.1  mrg 
    293      1.1  mrg commit 80b9cf38d93c5eafcec8e3309b24af33550af781
    294      1.1  mrg Author: Kevin E Martin <kem (a] kem.org>
    295      1.1  mrg Date:   Fri Jul 29 21:22:38 2005 +0000
    296      1.1  mrg 
    297      1.1  mrg     Various changes preparing packages for RC0:
    298      1.1  mrg     - Verify and update package version numbers as needed
    299      1.1  mrg     - Implement versioning scheme
    300      1.1  mrg     - Change bug address to point to bugzilla bug entry form
    301      1.1  mrg     - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
    302      1.1  mrg         reenable it)
    303      1.1  mrg     - Fix makedepend to use pkgconfig and pass distcheck
    304      1.1  mrg     - Update build script to build macros first
    305      1.1  mrg     - Update modular Xorg version
    306      1.1  mrg 
    307      1.1  mrg commit 00de3c1da23b030d5ad6818c8af7f4e9a968a60e
    308      1.1  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    309      1.1  mrg Date:   Wed Jul 20 19:32:05 2005 +0000
    310      1.1  mrg 
    311      1.1  mrg     Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
    312      1.1  mrg         configure cache, you cache it, and the cached value is probably wrong.
    313      1.1  mrg 
    314      1.1  mrg commit d5c7c5891a774190d3a1fbf1727bfb8238be0f23
    315      1.1  mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    316      1.1  mrg Date:   Fri Jul 1 20:09:10 2005 +0000
    317      1.1  mrg 
    318      1.1  mrg     xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove
    319      1.1  mrg         whitespace after backslash modularizeapp.sh: s/destkop/desktop/
    320      1.1  mrg         modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and
    321      1.1  mrg         Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h
    322      1.1  mrg     Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo
    323      1.1  mrg 
    324      1.1  mrg commit 9b58b06d9963e6443cc38360c8372505c00f80e4
    325      1.1  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    326      1.1  mrg Date:   Mon Mar 28 23:09:19 2005 +0000
    327      1.1  mrg 
    328      1.1  mrg     Change hardcoded "1" to __appmansuffix__ and remove initial blank line that
    329      1.1  mrg         confused Solaris nroff.
    330      1.1  mrg 
    331      1.1  mrg commit 561c02747003f89647f58e27a32e8400acb48d81
    332      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    333      1.1  mrg Date:   Fri Apr 23 19:55:08 2004 +0000
    334      1.1  mrg 
    335      1.1  mrg     Merging XORG-CURRENT into trunk
    336      1.1  mrg 
    337      1.1  mrg commit 94757d460c1a12cf5d44e8e83ef85a13e1df0928
    338      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    339      1.1  mrg Date:   Sun Mar 14 08:35:52 2004 +0000
    340      1.1  mrg 
    341      1.1  mrg     Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
    342      1.1  mrg 
    343      1.1  mrg commit 5d766d612426d3241340ac641da5e590d666824c
    344      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    345      1.1  mrg Date:   Wed Mar 3 12:13:20 2004 +0000
    346      1.1  mrg 
    347      1.1  mrg     Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
    348      1.1  mrg 
    349      1.1  mrg commit 0a8913b2b88dedaae37e1048dc61cdfb8d27f597
    350      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    351      1.1  mrg Date:   Thu Feb 26 13:36:32 2004 +0000
    352      1.1  mrg 
    353      1.1  mrg     readding XFree86's cvs IDs
    354      1.1  mrg 
    355      1.1  mrg commit 358083c5fbad044e7a49f283d6f8da6992b30ef3
    356      1.1  mrg Author: Egbert Eich <eich (a] suse.de>
    357      1.1  mrg Date:   Thu Feb 26 09:24:18 2004 +0000
    358      1.1  mrg 
    359      1.1  mrg     Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
    360      1.1  mrg 
    361      1.1  mrg commit 3bc549dfadb99c7a9e9a9f839ceb8cb21bf75694
    362      1.1  mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    363      1.1  mrg Date:   Fri Nov 14 16:49:24 2003 +0000
    364      1.1  mrg 
    365      1.1  mrg     XFree86 4.3.0.1
    366      1.1  mrg 
    367      1.1  mrg commit e241e6962865de1523cca316cbfcab52ac58c60a
    368      1.1  mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    369      1.1  mrg Date:   Fri Nov 14 16:49:24 2003 +0000
    370      1.1  mrg 
    371      1.1  mrg     Initial revision
    372