SOURCES: gpm-DESTDIR.patch, gpm-dont_display_stupid_error_messages.patch, g...

adamg adamg at pld-linux.org
Thu Jun 19 13:36:50 CEST 2008 

Author: adamg                        Date: Thu Jun 19 11:36:50 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.20.5

---- Files affected:
SOURCES:
   gpm-DESTDIR.patch (1.9 -> 1.10) , gpm-dont_display_stupid_error_messages.patch (1.3 -> 1.4) , gpm-gawk.patch (1.2 -> 1.3) , gpm-info.patch (1.7 -> 1.8) , gpm-nodebug.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/gpm-DESTDIR.patch
diff -u SOURCES/gpm-DESTDIR.patch:1.9 SOURCES/gpm-DESTDIR.patch:1.10
--- SOURCES/gpm-DESTDIR.patch:1.9	Fri Jan 31 15:03:48 2003
+++ SOURCES/gpm-DESTDIR.patch	Thu Jun 19 13:36:43 2008
@@ -1,112 +1,13 @@
-diff -Nur gpm-1.20.1.orig/Makefile.in gpm-1.20.1/Makefile.in
---- gpm-1.20.1.orig/Makefile.in	Tue Dec 24 23:57:16 2002
-+++ gpm-1.20.1/Makefile.in	Fri Jan 31 14:33:45 2003
-@@ -50,9 +50,9 @@
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) $(STRIP)' install
- 
- installdirs:
--	$(MKDIR) $(libdir) $(bindir) $(sbindir) $(includedir) $(sysconfdir); \
-+	$(MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(includedir) $(DESTDIR)$(sysconfdir); \
- 	if test "x at ELISP@" != "x" ; then \
--		$(MKDIR) $(lispdir) ; \
-+		$(MKDIR) $(DESTDIR)$(lispdir) ; \
- 	fi
- 
- ### GENERIC
-diff -Nur gpm-1.20.1.orig/Makefile.include.in gpm-1.20.1/Makefile.include.in
---- gpm-1.20.1.orig/Makefile.include.in	Tue Dec 24 23:57:16 2002
-+++ gpm-1.20.1/Makefile.include.in	Fri Jan 31 14:34:04 2003
-@@ -46,7 +46,7 @@
- TEX               = @TEX@
- TEXINDEX          = @TEXINDEX@
- DVIPS             = @DVIPS@
--MAKEINFO          = @MAKEINFO@ --no-split
-+MAKEINFO          = @MAKEINFO@
- TEXI2HTML         = texi2html -monolithic
- STRIP             = -s
- 
-diff -Nur gpm-1.20.1.orig/contrib/Makefile.in gpm-1.20.1/contrib/Makefile.in
---- gpm-1.20.1.orig/contrib/Makefile.in	Tue Dec 24 23:57:16 2002
-+++ gpm-1.20.1/contrib/Makefile.in	Fri Jan 31 14:30:12 2003
-@@ -13,7 +13,7 @@
- 
- install: all
- 	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
--		$(INSTALL_DATA) $(srcdir)/$$i $(lispdir)/`basename $$i` ;\
-+		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(lispdir)/`basename $$i` ;\
- 	done; fi
- 
- %.elc: %.el
-diff -Nur gpm-1.20.1.orig/doc/Makefile.in gpm-1.20.1/doc/Makefile.in
---- gpm-1.20.1.orig/doc/Makefile.in	Tue Dec 24 23:57:16 2002
-+++ gpm-1.20.1/doc/Makefile.in	Fri Jan 31 14:29:48 2003
-@@ -112,29 +112,15 @@
- # install & uninstall
- 
- installdirs:	
--	$(MKDIR) $(man1dir) $(man7dir) $(man8dir) $(infodir)	
-+	$(MKDIR) $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(infodir)	
- 
- install:	all installdirs
--	$(INSTALL_DATA) -m 644 mev.1          $(man1dir)
--	$(INSTALL_DATA) -m 644 mouse-test.1   $(man1dir)
--	$(INSTALL_DATA) -m 644 gpm-root.1     $(man1dir)
--	$(INSTALL_DATA) -m 644 gpm-types.7    $(man7dir)
--	$(INSTALL_DATA) -m 644 gpm.8          $(man8dir)
--	$(INSTALL_DATA) -m 644 $(srcdir)/gpm.info       $(infodir)
--	# Use install-info if available
--	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	  if [ -f $(infodir)/dir ] ; then \
--		install-info --dir-file=$(infodir)/dir $(infodir)/gpm.info; \
--	  fi; \
--	fi
--	#itz Sat Dec 26 23:21:05 PST 1998
--	#i keep all my infopages compressed and i'm tired to do it by
--	#hand, so check if there are any compressed pages and do this
--	#one too
--	-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
--		&& gzip -f $(infodir)/gpm.info
--	# Hmm.... shouldn't man pages be compressed too?
--   # maybe they should, but at least at my system they are not.
-+	$(INSTALL_DATA) -m 644 mev.1          $(DESTDIR)$(man1dir)
-+	$(INSTALL_DATA) -m 644 mouse-test.1   $(DESTDIR)$(man1dir)
-+	$(INSTALL_DATA) -m 644 gpm-root.1     $(DESTDIR)$(man1dir)
-+	$(INSTALL_DATA) -m 644 gpm-types.7    $(DESTDIR)$(man7dir)
-+	$(INSTALL_DATA) -m 644 gpm.8          $(DESTDIR)$(man8dir)
-+	$(INSTALL_DATA) -m 644 $(srcdir)/gpm.info       $(DESTDIR)$(infodir)
- 
- # This potentially leaves around cached manpages,
- # e.g. /var/cache/man/cat1/mev.1.gz.  Deleting these is not our job,
-diff -Nur gpm-1.20.1.orig/src/Makefile.in gpm-1.20.1/src/Makefile.in
---- gpm-1.20.1.orig/src/Makefile.in	Tue Dec 24 23:57:16 2002
-+++ gpm-1.20.1/src/Makefile.in	Fri Jan 31 14:33:02 2003
-@@ -91,15 +91,15 @@
- installdirs:
- 
- install:	check 
--	$(INSTALL_PROGRAM) gpm $(sbindir)/gpm
--	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a
--	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
-+	$(INSTALL_PROGRAM) gpm $(DESTDIR)$(sbindir)/gpm
-+	$(INSTALL_DATA) -m 644 lib/libgpm.a $(DESTDIR)$(libdir)/libgpm.a
-+	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(DESTDIR)$(includedir)/gpm.h
- 	# POSIX requires the range of a for loop be nonempty and Bash
- 	# 2.x goes along; unfortunately that means an additional
- 	# headache in cases like this
+--- gpm-1.20.5.orig/src/Makefile.in	2008-06-19 11:05:56.876688999 +0200
++++ gpm-1.20.5/src/Makefile.in	2008-06-19 12:39:06.242379899 +0200
+@@ -113,9 +113,7 @@
  	if test "x at SHLIB@" != "x" ; then \
--		$(INSTALL_DATA) -m 644 lib/libgpm.so. at abi_full@ $(libdir)/libgpm.so. at abi_full@ ;\
--		cd $(libdir) && $(LN_S) -f libgpm.so. at abi_full@ libgpm.so ;\
-+		$(INSTALL_DATA) -m 644 lib/libgpm.so. at abi_full@ $(DESTDIR)$(libdir)/libgpm.so. at abi_full@ ;\
-+		cd $(DESTDIR)$(libdir) && $(LN_S) -f libgpm.so. at abi_full@ libgpm.so ;\
-       echo "WARNING: We installed a lib, you should now call ldconfig" ; \
-       echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so. at abi_full@" ;\
-       echo "Or to update everything just type ldconfig"; \
-@@ -107,7 +107,7 @@
- 
-    # prog/
- 	for i in $(PROG); do \
--		$(INSTALL_PROGRAM) $$i $(bindir)/`echo $$i | sed 's,prog/,,'` ;\
-+		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/`echo $$i | sed 's,prog/,,'` ;\
- 	done
- 
- install-strip:
+ 		$(INSTALL_DATA) -m 644 lib/libgpm.so. at abi_full@ $(libdir)/libgpm.so. at abi_full@	;	\
+ 		cd $(libdir) && $(LN_S) -f libgpm.so. at abi_full@ libgpm.so. at abi_lev@ 					;	\
+-      echo "WARNING: We installed a lib, you should now call ldconfig" 						; 	\
+-      echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so. at abi_full@" 								;	\
+-      echo "Or to update everything just type ldconfig"											;	\
++		cd $(libdir) && $(LN_S) -f libgsm.so. at abi_full@ libgsm.so ; \
+ 	fi
+ #			The unversioned files seems to be not needed -> correct me, if I am wrong.
+ #			&& $(LN_S) -f libgpm.so. at abi_lev@  libgpm.so 											;	\

================================================================
Index: SOURCES/gpm-dont_display_stupid_error_messages.patch
diff -u SOURCES/gpm-dont_display_stupid_error_messages.patch:1.3 SOURCES/gpm-dont_display_stupid_error_messages.patch:1.4
--- SOURCES/gpm-dont_display_stupid_error_messages.patch:1.3	Fri Jan 31 15:03:48 2003
+++ SOURCES/gpm-dont_display_stupid_error_messages.patch	Thu Jun 19 13:36:44 2008
@@ -1,20 +1,13 @@
 --- gpm-1.20.1/src/lib/liblow.c~	Sun Oct  6 10:36:25 2002
 +++ gpm-1.20.1/src/lib/liblow.c	Sun Oct  6 10:36:25 2002
-@@ -258,7 +258,7 @@
-          /* do we really need this check ? */
-          if(strncmp(tty,option.consolename,strlen(option.consolename)-1)
-             || !isdigit(tty[strlen(option.consolename)-1])) {
--            gpm_report(GPM_PR_ERR,"strncmp/isdigit/option.consolename failed");
-+           /* gpm_report(GPM_PR_ERR,"strncmp/isdigit/option.consolename failed"); */
-             goto err;
-          }
-           
-@@ -367,7 +367,7 @@
+@@ -367,8 +367,8 @@
  
    /*....................................... Error: free all memory */
     err:
--   gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
-+  /* gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! "); */
-    do {
+-   if (gpm_is_disabled < 2) /* be quiet if no gpmctl socket found */
+-      gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
++   /* if (gpm_is_disabled < 2)
++      gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");*/
+    while(gpm_stack) {
        new=gpm_stack->next;
        free(gpm_stack);

================================================================
Index: SOURCES/gpm-gawk.patch
diff -u SOURCES/gpm-gawk.patch:1.2 SOURCES/gpm-gawk.patch:1.3
--- SOURCES/gpm-gawk.patch:1.2	Tue Mar 12 00:28:08 2002
+++ SOURCES/gpm-gawk.patch	Thu Jun 19 13:36:44 2008
@@ -8,7 +8,8 @@
 +	$(srcdir)/mktxt $< > $@
  
  # MAN (-)
- $(MANPAGES): doc.gpm $(srcdir)/manpager
+ $(MANPAGES): gpm.man
+ gpm.man: doc.gpm $(srcdir)/manpager
 -	$(AWK) -f $(srcdir)/manpager doc.gpm
 +	$(srcdir)/manpager doc.gpm
  	for i in gpm-root.1 gpm-types.7 gpm.8 mev.1 mouse-test.1; do \

================================================================
Index: SOURCES/gpm-info.patch
diff -u SOURCES/gpm-info.patch:1.7 SOURCES/gpm-info.patch:1.8
--- SOURCES/gpm-info.patch:1.7	Thu Oct 11 18:19:42 2001
+++ SOURCES/gpm-info.patch	Thu Jun 19 13:36:44 2008
@@ -1,15 +1,12 @@
 diff -Nru gpm-1.19.6/doc/doc.gpm gpm-1.17.9.new/doc/doc.gpm
 --- gpm-1.19.6/doc/doc.gpm.in	Fri Aug  6 07:35:33 1999
 +++ gpm-1.19.6.new/doc/doc.gpm.in	Wed Sep  1 04:36:32 1999
-@@ -34,9 +34,9 @@
+@@ -34,7 +34,7 @@
  
  @ifinfo
  @format
 - at dircategory Miscellaneous
 + at dircategory Miscellaneous:
  @direntry
--* Gpm: (gpm).   A server wich hands mouse events to non-X programs.
-+* Gpm: (gpm).				Text-mode mouse library and srv daemon
+ * Gpm: (gpm).   Text-mode (non-X) mouse library and server daemon.
  @end direntry
- @end format
- @end ifinfo

================================================================
Index: SOURCES/gpm-nodebug.patch
diff -u SOURCES/gpm-nodebug.patch:1.2 SOURCES/gpm-nodebug.patch:1.3
--- SOURCES/gpm-nodebug.patch:1.2	Fri Jan 31 15:03:48 2003
+++ SOURCES/gpm-nodebug.patch	Thu Jun 19 13:36:45 2008
@@ -1,18 +1,21 @@
 --- gpm-1.20.1/src/lib/report-lib.c.orig	Sat Feb 23 16:42:23 2002
 +++ gpm-1.20.1/src/lib/report-lib.c	Fri May  3 20:16:02 2002
-@@ -30,10 +30,10 @@
-    va_start(ap,text);
+@@ -36,13 +36,13 @@
  
     switch(stat) {
--      case GPM_STAT_INFO : string = GPM_TEXT_INFO ; break;
-+      case GPM_STAT_INFO : string = GPM_TEXT_INFO ; return;
-       case GPM_STAT_WARN : string = GPM_TEXT_WARN ; break;
-       case GPM_STAT_ERR  : string = GPM_TEXT_ERR  ; break;
--      case GPM_STAT_DEBUG: string = GPM_TEXT_DEBUG; break;
-+      case GPM_STAT_DEBUG: string = GPM_TEXT_DEBUG; return;
-       case GPM_STAT_OOPS : string = GPM_TEXT_OOPS; break;
+       case GPM_STAT_INFO : string = GPM_TEXT_INFO ;
+-                           log_level = LOG_INFO; break;
++                           log_level = LOG_INFO; return;
+       case GPM_STAT_WARN : string = GPM_TEXT_WARN ;
+                            log_level = LOG_WARNING; break;
+       case GPM_STAT_ERR  : string = GPM_TEXT_ERR  ;
+                            log_level = LOG_ERR; break;
+       case GPM_STAT_DEBUG: string = GPM_TEXT_DEBUG;
+-                           log_level = LOG_DEBUG; break;
++                           log_level = LOG_DEBUG; return;
+       case GPM_STAT_OOPS : string = GPM_TEXT_OOPS;
+                            log_level = LOG_CRIT; break;
     }
-    fprintf(stderr,"%s[%s(%d)]:\n",string,file,line);
 --- gpm-1.20.0/src/report.c.orig	Sat Feb 23 16:42:23 2002
 +++ gpm-1.20.0/src/report.c	Fri May  3 20:12:51 2002
 @@ -130,6 +130,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gpm-DESTDIR.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gpm-dont_display_stupid_error_messages.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gpm-gawk.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gpm-info.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gpm-nodebug.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list