--- ./doc/gphoto2.1	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./doc/gphoto2.1	Wed Feb 19 17:10:05 2003
@@ -275,7 +275,7 @@
 .SH "SEE ALSO"
 
 .PP
-, The gPhoto2 Manual, \fIgphoto2-cli.txt\fR, \fIhttp://www.gphoto.org/\fR, \fIhttp://www.gphoto.org/gphoto2/cli.html\fR 
+The gPhoto2 Manual, \fIgphoto2-cli.txt\fR, \fIhttp://www.gphoto.org/\fR, \fIhttp://www.gphoto.org/gphoto2/cli.html\fR 
 
 .SH "EXAMPLES"
 
--- ./gphoto2/main.c	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./gphoto2/main.c	Wed Feb 19 16:44:21 2003
@@ -1075,7 +1075,7 @@
 
 	columns = getenv ("COLUMNS");
 	if (columns && atoi (columns))
-		p.cols = atoi (columns);
+		p.cols = atoi (columns) - 1;
 }
 
 static void
@@ -1467,10 +1467,10 @@
 #ifdef HAVE_POPT
 	CallbackParams params;
 	poptContext ctx;
-	const struct poptOption options[] = {
+	struct poptOption options[] = {
 		POPT_AUTOHELP
 		{NULL, '\0', POPT_ARG_CALLBACK,
-		 (void *) &cb_arg, 0, (char *) &params, NULL},
+		 (void *) &cb_arg, 0, NULL, NULL},
 		{"debug", '\0', POPT_ARG_NONE, NULL, ARG_DEBUG,
 		 N_("Turn on debugging"), NULL},
 		{"quiet", '\0', POPT_ARG_NONE, NULL, ARG_QUIET,
@@ -1592,6 +1592,9 @@
 
 	/* Prepare processing options. */
 #ifdef HAVE_POPT
+	/* Fixup the options */
+	options[1].descrip = (char *) &params;
+
 	ctx = poptGetContext (PACKAGE, argc, (const char **) argv, options, 0);
 	if (argc <= 1) {
 		poptPrintUsage (ctx, stdout, 0);
--- ./gphoto2/Makefile.am	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./gphoto2/Makefile.am	Wed Feb 19 16:44:21 2003
@@ -48,7 +48,7 @@
 	range.c range.h 	\
 	shell.c shell.h 
 
-gphoto2_LDFLAGS = -export-dynamic
+#gphoto2_LDFLAGS = -export-dynamic
 
 gphoto2_LDADD =								\
 	$(CDK_LIBS) $(AA_LIBS) $(JPEG_LIBS) $(PTHREAD_LIBS)		\
--- ./gphoto2/Makefile.in	Sun Dec  1 16:51:44 2002
+++ ../gphoto2-2.1.1/./gphoto2/Makefile.in	Wed Feb 19 16:56:20 2003
@@ -161,7 +161,7 @@
 	shell.c shell.h 
 
 
-gphoto2_LDFLAGS = -export-dynamic
+gphoto2_LDFLAGS = 
 
 gphoto2_LDADD = \
 	$(CDK_LIBS) $(AA_LIBS) $(JPEG_LIBS) $(PTHREAD_LIBS)		\
--- ./gphoto2/gp-params.c	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./gphoto2/gp-params.c	Wed Feb 19 16:44:21 2003
@@ -134,7 +134,7 @@
         time_t sec = 0;
 
         /* Guard against buggy camera drivers */
-        if (id >= MAX_PROGRESS_STATES || id < 0)
+        if (id >= MAX_PROGRESS_STATES /* || id < 0 <-- cannot happen! */)
                 return;
 
         /* How much time until completion? */
@@ -195,7 +195,7 @@
         unsigned int i;
 
         /* Guard against buggy camera drivers */
-        if (id >= MAX_PROGRESS_STATES || id < 0)
+        if (id >= MAX_PROGRESS_STATES /* || id < 0 <-- cannot happen! */)
                 return;
 
         /* Clear the progress bar. */
@@ -252,7 +252,7 @@
 
 	gp_camera_new (&p->camera);
 
-	p->cols = 80;
+	p->cols = 79;
 	p->flags = FOR_EACH_FLAGS_RECURSE;
 
 	/* Create a context. Report progress only if users will see it. */
--- ./gphoto2/shell.c	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./gphoto2/shell.c	Wed Feb 19 16:44:21 2003
@@ -607,7 +607,7 @@
 			printf ("%s\n", name);
 		else {
 			sprintf (buf, "%s/", name);
-			printf ("%-20s", buf);
+			printf ("%-19s", buf);
 			if (y++ % 4 == 0)
 				printf("\n");
 		}
@@ -624,7 +624,7 @@
 		if (p->quiet)
 			printf ("%s\n", name);
 		   else {
-			printf ("%-20s", name);
+			printf ("%-19s", name);
 			if (y++ % 4 == 0)
 				printf("\n");
 		}
--- ./gphoto2/options.c	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./gphoto2/options.c	Wed Feb 19 16:44:21 2003
@@ -200,7 +200,7 @@
 
 	/* Make this 79 characters long. Some languages need the space. */
 	printf (_("Short/long options (& argument)        Description\n"
-		  "--------------------------------------------------------------------------------\n"));
+		  "-------------------------------------------------------------------------------\n"));
 	/* Run through option and print them out */
 	while (x < glob_option_count) {
 		/* maybe sort these by short option? can't be an in-place sort.
@@ -229,6 +229,6 @@
 	}
 
 	/* Make this 79 characters long. Some languages need the space. */
-	printf (_("--------------------------------------------------------------------------------\n"
-		  "[Use double-quotes around arguments]        [Picture numbers begin with one (1)]\n"));
+	printf (_("-------------------------------------------------------------------------------\n"
+		  "[Use double-quotes around arguments]       [Picture numbers begin with one (1)]\n"));
 }
--- ./gphoto2/actions.c	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./gphoto2/actions.c	Wed Feb 19 16:44:21 2003
@@ -352,7 +352,7 @@
                 e = content->entries[i];
                 printf ("%-20.20s", exif_tag_get_name (e->tag));
                 printf ("|");
-                printf ("%-59.59s", exif_entry_get_value (e));
+                printf ("%-58.58s", exif_entry_get_value (e));
                 printf ("\n");
         }
 }
@@ -365,7 +365,7 @@
         for (i = 0; i < 20; i++)
                 printf ("-");
         printf ("+");
-        for (i = 0; i < 59; i++)
+        for (i = 0; i < 58; i++)
                 printf ("-");
         printf ("\n"); 
 }
@@ -399,7 +399,7 @@
         print_hline ();
         printf ("%-20.20s", _("Tag"));
         printf ("|");
-        printf ("%-59.59s", _("Value"));
+        printf ("%-58.58s", _("Value"));
         printf ("\n");
         print_hline ();
 #ifdef HAVE_EXIF_0_5_4
--- ./gphoto2/version.h	Sun Dec  1 16:51:33 2002
+++ ../gphoto2-2.1.1/./gphoto2/version.h	Wed Feb 19 16:44:21 2003
@@ -31,7 +31,7 @@
 
 extern const module_version module_versions[];
 
-#endif __VERSION_H__
+#endif /* __VERSION_H__ */
 
 /*
  * Local Variables: