[gnome-print] patch for stable branch

[Havoc Pennington <hp redhat com>]

Hi,

see changelog

There's also an automake 1.5 issue where VERSION gets defined for the
two cut-and-pasted copies of parseAFM.c. An #undef VERSION needs to go
in the file after the include statements.

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-print/ChangeLog,v
retrieving revision 1.189.2.47
diff -u -p -u -r1.189.2.47 ChangeLog
--- ChangeLog	2002/01/21 20:13:27	1.189.2.47
+++ ChangeLog	2002/01/22 00:30:35
@@ -1,3 +1,13 @@
+2002-01-21  Havoc Pennington  <hp@redhat.com>
+
+	* profiles/Makefile.am (EXTRA_DIST): remove funky trailing \ that
+	seemed to confuse automake
+
+	* configure.in: output macros/Makefile
+
+	* Makefile.am (SUBDIRS): macros goes in SUBDIRS - it's part of the
+	source code and needed if you patch makefiles.
+
 2002-01-21  Alexander Shopov  <al_shopov@web.bg>
 
 	* configure.in (ALL_LINGUAS): Added "bg".
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-print/Makefile.am,v
retrieving revision 1.51.2.2
diff -u -p -u -r1.51.2.2 Makefile.am
--- Makefile.am	2001/09/13 19:05:49	1.51.2.2
+++ Makefile.am	2002/01/22 00:30:35
@@ -8,7 +8,7 @@ else
 LIBGPA_DIR = 
 endif
 
-SUBDIRS = intl po $(LIBGPA_DIR) libgnomeprint afms profiles fonts tests  $(INSTALLER_DIR)
+SUBDIRS = intl po macros $(LIBGPA_DIR) libgnomeprint afms profiles fonts tests  $(INSTALLER_DIR)
 
 INCLUDES = 			\
 	$(GTK_CFLAGS)		\
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-print/configure.in,v
retrieving revision 1.117.2.29
diff -u -p -u -r1.117.2.29 configure.in
--- configure.in	2002/01/21 20:13:27	1.117.2.29
+++ configure.in	2002/01/22 00:30:35
@@ -302,6 +302,7 @@ afms/Makefile
 afms/adobe/Makefile
 fonts/Makefile
 tests/Makefile
-installer/Makefile],
+installer/Makefile
+macros/Makefile],
 [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 
Index: profiles/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-print/profiles/Makefile.am,v
retrieving revision 1.3.2.1
diff -u -p -u -r1.3.2.1 Makefile.am
--- profiles/Makefile.am	2001/02/22 19:23:26	1.3.2.1
+++ profiles/Makefile.am	2002/01/22 00:30:35
@@ -6,4 +6,4 @@ profiles_DATA = \
 	fax-g3.profile
 
 EXTRA_DIST = 			\
-	$(profiles_DATA)	\
+	$(profiles_DATA)