Synchronised line endinge with release branch

2 files changed, 117 insertions, 117 deletions

diff --git a/xorg-server/fonts.src/TTF/Makefile.am b/xorg-server/fonts.src/TTF/Makefile.am
index d8792cbb2..a36f565c4 100644
--- a/xorg-server/fonts.src/TTF/Makefile.am
+++ b/xorg-server/fonts.src/TTF/Makefile.am
@@ -1,69 +1,69 @@
-#  Copyright 2005 Red Hat, Inc.

-#

-#  Permission to use, copy, modify, distribute, and sell this software

-#  and its documentation for any purpose is hereby granted without

-#  fee, provided that the above copyright notice appear in all copies

-#  and that both that copyright notice and this permission notice

-#  appear in supporting documentation, and that the name of Red Hat

-#  not be used in advertising or publicity pertaining to distribution

-#  of the software without specific, written prior permission.  Red

-#  Hat makes no representations about the suitability of this software

-#  for any purpose.  It is provided "as is" without express or implied

-#  warranty.

-#

-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

-#  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

-#  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-#  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

-#  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-

-FONT_FILES = \

-	luximbi.ttf \

-	luximb.ttf \

-	luximri.ttf \

-	luximr.ttf \

-	luxirbi.ttf \

-	luxirb.ttf \

-	luxirri.ttf \

-	luxirr.ttf \

-	luxisbi.ttf \

-	luxisb.ttf \

-	luxisri.ttf \

-	luxisr.ttf

-

-fontdir = @FONTDIR@

-font_DATA = $(FONT_FILES)

-

-actualconfigdir = $(FC_CONFDIR)/conf.d

-availconfigdir = $(FC_CONFDIR)/conf.avail

-dist_availconfig_DATA = 42-luxi-mono.conf

-

-EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH

-

-MAINTAINERCLEANFILES = ChangeLog INSTALL

-

-install-data-hook:

-	@rm -f $(DESTDIR)$(fontdir)/fonts.scale

-	$(MKFONTSCALE) $(DESTDIR)$(fontdir)

-	@rm -f $(DESTDIR)$(fontdir)/font.dir

-	$(MKFONTDIR) $(DESTDIR)$(fontdir)

-	mkdir -p $(DESTDIR)$(actualconfigdir)

-	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)

-	ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)

-	@RUN_FCCACHE@

-

-distuninstallcheck:

-	@:

-

-

-.PHONY: ChangeLog INSTALL

-

-INSTALL:

-	$(INSTALL_CMD)

-

-ChangeLog:

-	$(CHANGELOG_CMD)

-

-dist-hook: ChangeLog INSTALL

+#  Copyright 2005 Red Hat, Inc.
+#
+#  Permission to use, copy, modify, distribute, and sell this software
+#  and its documentation for any purpose is hereby granted without
+#  fee, provided that the above copyright notice appear in all copies
+#  and that both that copyright notice and this permission notice
+#  appear in supporting documentation, and that the name of Red Hat
+#  not be used in advertising or publicity pertaining to distribution
+#  of the software without specific, written prior permission.  Red
+#  Hat makes no representations about the suitability of this software
+#  for any purpose.  It is provided "as is" without express or implied
+#  warranty.
+#
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+#  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+#  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+#  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+#  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+FONT_FILES = \
+	luximbi.ttf \
+	luximb.ttf \
+	luximri.ttf \
+	luximr.ttf \
+	luxirbi.ttf \
+	luxirb.ttf \
+	luxirri.ttf \
+	luxirr.ttf \
+	luxisbi.ttf \
+	luxisb.ttf \
+	luxisri.ttf \
+	luxisr.ttf
+
+fontdir = @FONTDIR@
+font_DATA = $(FONT_FILES)
+
+actualconfigdir = $(FC_CONFDIR)/conf.d
+availconfigdir = $(FC_CONFDIR)/conf.avail
+dist_availconfig_DATA = 42-luxi-mono.conf
+
+EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+install-data-hook:
+	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
+	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
+	@rm -f $(DESTDIR)$(fontdir)/font.dir
+	$(MKFONTDIR) $(DESTDIR)$(fontdir)
+	mkdir -p $(DESTDIR)$(actualconfigdir)
+	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)
+	ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)
+	@RUN_FCCACHE@
+
+distuninstallcheck:
+	@:
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/xorg-server/fonts.src/TTF/configure.ac b/xorg-server/fonts.src/TTF/configure.ac
index 4f2aae872..4d834f871 100644
--- a/xorg-server/fonts.src/TTF/configure.ac
+++ b/xorg-server/fonts.src/TTF/configure.ac
@@ -1,48 +1,48 @@
-dnl  Copyright 2005 Red Hat, Inc.

-dnl

-dnl  Permission to use, copy, modify, distribute, and sell this software

-dnl  and its documentation for any purpose is hereby granted without

-dnl  fee, provided that the above copyright notice appear in all copies

-dnl  and that both that copyright notice and this permission notice

-dnl  appear in supporting documentation, and that the name of Red Hat

-dnl  not be used in advertising or publicity pertaining to distribution

-dnl  of the software without specific, written prior permission.  Red

-dnl  Hat makes no representations about the suitability of this software

-dnl  for any purpose.  It is provided "as is" without express or implied

-dnl  warranty.

-dnl

-dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

-dnl  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

-dnl  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

-dnl  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

-dnl  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-dnl

-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ([2.57])

-AC_INIT([font-bh-ttf], [1.0.3],

-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],

-        [font-bh-ttf])

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-

-# Require xorg-macros: XORG_DEFAULT_OPTIONS

-m4_ifndef([XORG_MACROS_VERSION],

-	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.3)

-XORG_DEFAULT_OPTIONS

-

-AC_PROG_INSTALL

-

-# Require X.Org's font util macros 1.2 or later

-m4_ifndef([XORG_FONT_MACROS_VERSION],

-	  [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])])

-XORG_FONT_MACROS_VERSION(1.2)

-

-XORG_FONTDIR([TTF])

-XORG_FONT_SCALED_UTILS

-XORG_FONT_FC_CONFDIR

-

-AC_OUTPUT([Makefile])

+dnl  Copyright 2005 Red Hat, Inc.
+dnl
+dnl  Permission to use, copy, modify, distribute, and sell this software
+dnl  and its documentation for any purpose is hereby granted without
+dnl  fee, provided that the above copyright notice appear in all copies
+dnl  and that both that copyright notice and this permission notice
+dnl  appear in supporting documentation, and that the name of Red Hat
+dnl  not be used in advertising or publicity pertaining to distribution
+dnl  of the software without specific, written prior permission.  Red
+dnl  Hat makes no representations about the suitability of this software
+dnl  for any purpose.  It is provided "as is" without express or implied
+dnl  warranty.
+dnl
+dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+dnl  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+dnl  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+dnl  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+dnl  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.57])
+AC_INIT([font-bh-ttf], [1.0.3],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+        [font-bh-ttf])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
+AC_PROG_INSTALL
+
+# Require X.Org's font util macros 1.2 or later
+m4_ifndef([XORG_FONT_MACROS_VERSION],
+	  [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.2)
+
+XORG_FONTDIR([TTF])
+XORG_FONT_SCALED_UTILS
+XORG_FONT_FC_CONFDIR
+
+AC_OUTPUT([Makefile])