--- ./tests/testprint4.c Sat Nov 24 21:28:32 2001 +++ ../gnome-print-0.36/./tests/testprint4.c Fri Jun 21 12:07:45 2002 @@ -384,7 +384,7 @@ p2b[5] = PMH; buf = g_new (guchar, PMW * PMH * bpp); -#warning I disabled this code casue it was throwing an error at me +/* #warning I disabled this code casue it was throwing an error at me */ #if 0 memset (buf, 0xff, PMW * PMH * bpp); #endif --- ./profiles/PostscriptOptimized.profile Sat Nov 4 17:11:12 2000 +++ ../gnome-print-0.36/./profiles/PostscriptOptimized.profile Thu Jun 27 18:25:29 2002 @@ -1,7 +1,7 @@ [Generic Postscript] name=Generic Postscript name[pl]=Standardowy PostScript -output=command,lpr +output=command,lp comment=Optimized comment[pl]=Wersja zoptymalizowana location= --- ./libgpa/gpa-settings.c Sun Mar 11 23:48:39 2001 +++ ../gnome-print-0.36/./libgpa/gpa-settings.c Wed Jun 26 11:54:59 2002 @@ -49,6 +49,10 @@ #include "gpa-backend-private.h" #include "gpa-values.h" +#ifndef DEFAULT_SPOOLER +# define DEFAULT_SPOOLER "lpr" +#endif + /* FIXME : this should go somewhere else. Is there a function that does * this already ? @@ -220,7 +224,7 @@ settings = gpa_settings_new (); settings->name = g_strdup (_("Default Settings")); - settings->command = g_strdup ("lpr"); + settings->command = g_strdup (DEFAULT_SPOOLER); settings->printer = printer; settings->selected_options = gpa_settings_paths_copy (model->default_settings); settings->values = gpa_values_copy_list (model->default_values); --- ./libgnomeprint/Makefile.am Tue Jan 22 16:08:56 2002 +++ ../gnome-print-0.36/./libgnomeprint/Makefile.am Fri Jun 21 12:14:39 2002 @@ -21,7 +21,7 @@ -version-info $(GNOMEPRINT_CURRENT):$(GNOMEPRINT_REVISION):$(GNOMEPRINT_AGE) libgnomeprint_la_LIBADD = \ - $(LIBGNOMEPRINT_LIBS) + $(LIBGNOMEPRINT_LIBS) $(INTLLIBS) CPPFLAGS = @CPPFLAGS@ \ --- ./libgnomeprint/Makefile.in Sun Jun 2 12:44:54 2002 +++ ../gnome-print-0.36/./libgnomeprint/Makefile.in Fri Jun 21 12:14:44 2002 @@ -179,7 +179,7 @@ libgnomeprint_la_LIBADD = \ - $(LIBGNOMEPRINT_LIBS) + $(LIBGNOMEPRINT_LIBS) $(INTLLIBS) CPPFLAGS = @CPPFLAGS@ \ --- ./libgnomeprint/gnome-printer-profile.c Tue Jan 22 16:44:55 2002 +++ ../gnome-print-0.36/./libgnomeprint/gnome-printer-profile.c Fri Jun 28 09:58:12 2002 @@ -127,8 +127,8 @@ */ if (!strcmp (a->driver, "gnome-print-ps2") && !strcmp (b->driver, "gnome-print-ps2")) { - if (!strcmp (a->output, "command,lpr")) return -1; - if (!strcmp (b->output, "command,lpr")) return 1; + if (!strcmp (a->output, "command,lp")) return -1; + if (!strcmp (b->output, "command,lp")) return 1; if (!strcmp (a->output, "file,output.ps")) return -1; if (!strcmp (b->output, "file,output.ps")) return 1; return strcmp (a->output, b->output); --- ./libgnomeprint/gnome-printer-dialog.c Tue Jan 22 22:00:41 2002 +++ ../gnome-print-0.36/./libgnomeprint/gnome-printer-dialog.c Thu Jun 27 21:13:46 2002 @@ -29,6 +29,10 @@ #include +#ifndef DEFAULT_SPOOLER +# define DEFAULT_SPOOLER "lpr" +#endif + struct _GnomePrinterWidget { GtkFrame frame; @@ -299,8 +303,8 @@ gtk_table_attach (GTK_TABLE (t), r2, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2); gtk_signal_connect (GTK_OBJECT (r2), "clicked", GTK_SIGNAL_FUNC (gnome_printer_widget_b_cb), gpw); - gpw->entry_command = gtk_entry_new (); - gtk_entry_set_text (GTK_ENTRY (gpw->entry_command), "lpr"); + gpw->entry_command = gtk_entry_new (); + gtk_entry_set_text (GTK_ENTRY (gpw->entry_command), DEFAULT_SPOOLER); gtk_table_attach (GTK_TABLE (t), gpw->entry_command, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, --- ./ltmain.sh Sun Jun 2 12:44:16 2002 +++ ../gnome-print-0.36/./ltmain.sh Sat Jun 22 15:20:25 2002 @@ -61,7 +61,7 @@ default_mode= help="Try \`$progname --help' for more information." magic="%%%MAGIC variable%%%" -mkdir="mkdir" +mkdir="mkdir -p" mv="mv -f" rm="rm -f"