SOURCES: xsane-datadir.patch, xsane-pl.po-update.patch, xsane-DEST...

aredridel aredridel at pld-linux.org
Tue Jul 18 00:17:24 CEST 2006 

Author: aredridel                    Date: Mon Jul 17 22:17:24 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 0.991

---- Files affected:
SOURCES:
   xsane-datadir.patch (1.3 -> 1.4) , xsane-pl.po-update.patch (1.1 -> 1.2) , xsane-DESTDIR.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/xsane-datadir.patch
diff -u SOURCES/xsane-datadir.patch:1.3 SOURCES/xsane-datadir.patch:1.4
--- SOURCES/xsane-datadir.patch:1.3	Tue Dec 27 00:09:11 2005
+++ SOURCES/xsane-datadir.patch	Tue Jul 18 00:17:18 2006
@@ -1,5 +1,6 @@
---- xsane-0.92/doc/Makefile.in.orig	2004-04-25 16:45:34.000000000 +0200
-+++ xsane-0.92/doc/Makefile.in	2004-04-25 16:49:06.745070680 +0200
+diff -ur xsane-0.991-o/doc/Makefile.in xsane-0.991/doc/Makefile.in
+--- xsane-0.991-o/doc/Makefile.in	2006-01-01 06:08:11.000000000 -0700
++++ xsane-0.991/doc/Makefile.in	2006-07-17 15:52:17.000000000 -0600
 @@ -21,7 +21,7 @@
  oldincludedir = /usr/include
  configdir = ${sysconfdir}/sane.d
@@ -7,7 +8,7 @@
 -xsanedocdir = ${datadir}/sane/xsane/doc
 +xsanedocdir = ${datadir}/xsane/doc
  
- MKDIR = $(top_srcdir)/mkinstalldirs
+ MKINSTALLDIRS = @MKINSTALLDIRS@
  INSTALL = @INSTALL@
 @@ -42,7 +42,7 @@
  
@@ -18,82 +19,17 @@
  	    -e 's|@CONFIGDIR@|$(configdir)|g' \
  	    -e 's|@LIBDIR@|$(libdir)|g' \
  	    -e 's|@BINDIR@|$(bindir)|g' \
---- xsane-0.92/src/Makefile.in.orig	2004-04-25 16:45:34.000000000 +0200
-+++ xsane-0.92/src/Makefile.in	2004-04-25 16:51:29.344392288 +0200
-@@ -22,7 +22,7 @@
+diff -ur xsane-0.991-o/src/Makefile.in xsane-0.991/src/Makefile.in
+--- xsane-0.991-o/src/Makefile.in	2006-01-06 16:22:47.000000000 -0700
++++ xsane-0.991/src/Makefile.in	2006-07-17 15:52:17.000000000 -0600
+@@ -21,8 +21,8 @@
+ includedir = @includedir@
  oldincludedir = /usr/include
  configdir = ${sysconfdir}/sane.d
- sanedatadir = ${datadir}/sane
+-sanedatadir = ${datadir}/sane
 -xsanedocdir = ${datadir}/sane/xsane/doc
++sanedatadir = ${datadir}
 +xsanedocdir = ${datadir}/xsane/doc
  
  MKINSTALLDIRS = @MKINSTALLDIRS@
  INSTALL = @INSTALL@
-@@ -60,19 +60,19 @@
- all: $(PROGRAMS)
- 
- install: $(PROGRAMS)
--	$(MKINSTALLDIRS) $(bindir) $(sbindir) $(datadir) $(sanedatadir) $(xsanedocdir) $(sanedatadir)/xsane
-+	$(MKINSTALLDIRS) $(bindir) $(sbindir) $(datadir) $(xsanedocdir)
- 	@for program in $(BINPROGS); do \
- 	  $(INSTALL_PROGRAM) $${program} $(bindir)/$${program}; \
- 	done
--	$(INSTALL_DATA) $(srcdir)/xsane-style.rc $(sanedatadir)/xsane/xsane-style.rc
--	$(INSTALL_DATA) $(srcdir)/xsane-startimage.pnm $(sanedatadir)/xsane/xsane-startimage.pnm
--	$(INSTALL_DATA) $(srcdir)/xsane-calibration.pnm $(sanedatadir)/xsane/xsane-calibration.pnm
--	$(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(sanedatadir)/xsane/xsane-logo.xpm
--	$(INSTALL_DATA) $(srcdir)/xsane-gpl.txt $(sanedatadir)/xsane/xsane-gpl.txt
--	$(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(sanedatadir)/xsane/xsane-eula.txt
-+	$(INSTALL_DATA) $(srcdir)/xsane-style.rc $(datadir)/xsane/xsane-style.rc
-+	$(INSTALL_DATA) $(srcdir)/xsane-startimage.pnm $(datadir)/xsane/xsane-startimage.pnm
-+	$(INSTALL_DATA) $(srcdir)/xsane-calibration.pnm $(datadir)/xsane/xsane-calibration.pnm
-+	$(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(datadir)/xsane/xsane-logo.xpm
-+	$(INSTALL_DATA) $(srcdir)/xsane-gpl.txt $(datadir)/xsane/xsane-gpl.txt
-+	$(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(datadir)/xsane/xsane-eula.txt
- 	@for logo in *-logo.xpm; do \
--	  echo installing $(sanedatadir)/xsane/$${logo}; \
--	  $(INSTALL_DATA) $(srcdir)/$${logo} $(sanedatadir)/xsane/$${logo}; \
-+	  echo installing $(datadir)/xsane/$${logo}; \
-+	  $(INSTALL_DATA) $(srcdir)/$${logo} $(datadir)/xsane/$${logo}; \
- 	done 
- 
- uninstall:
-@@ -80,17 +80,17 @@
- 	  echo uninstalling $(bindir)/$${program}...; \
- 	  rm -f $(bindir)/$${program}; \
- 	done
--	echo uninstalling $(sanedatadir)/xsane/xsane-style.rc...
--	rm -f $(sanedatadir)/xsane/xsane-style.rc
--	echo uninstalling $(sanedatadir)/xsane/xsane-startimage.pnm...
--	rm -f $(sanedatadir)/xsane/xsane-startimage.pnm
--	echo uninstalling $(sanedatadir)/xsane/xsane-calibration.pnm...
--	rm -f $(sanedatadir)/xsane/xsane-calibration.pnm
--	echo uninstalling $(sanedatadir)/xsane/xsane-logo.xpm...
--	rm -f $(sanedatadir)/xsane/xsane-logo.xpm
-+	echo uninstalling $(datadir)/xsane/xsane-style.rc...
-+	rm -f $(datadir)/xsane/xsane-style.rc
-+	echo uninstalling $(datadir)/xsane/xsane-startimage.pnm...
-+	rm -f $(datadir)/xsane/xsane-startimage.pnm
-+	echo uninstalling $(datadir)/xsane/xsane-calibration.pnm...
-+	rm -f $(datadir)/xsane/xsane-calibration.pnm
-+	echo uninstalling $(datadir)/xsane/xsane-logo.xpm...
-+	rm -f $(datadir)/xsane/xsane-logo.xpm
- 	@for logo in *-logo.xpm; do \
--	  echo uninstalling $(sanedatadir)/xsane/$${logo}; \
--	  rm -f $(sanedatadir)/xsane/$${logo}; \
-+	  echo uninstalling $(datadir)/xsane/$${logo}; \
-+	  rm -f $(datadir)/xsane/$${logo}; \
- 	done 
- 
- xsane: $(XSANE_OBJS) $(LIBLIB)
---- xsane-0.98b/src/Makefile.in.orig	2005-12-26 23:54:11.610557760 +0100
-+++ xsane-0.98b/src/Makefile.in	2005-12-26 23:59:46.214690200 +0100
-@@ -32,7 +32,7 @@
- CC = @CC@
- INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include @INCLUDES@
- DEFS = @DEFS@ -DLOCALEDIR=$(datadir)/locale -DSANELOCALEDIR=$(sane_prefix)/share/locale
--CPPFLAGS = @CPPFLAGS@ -DPATH_XSANE_DOC_DIR=$(xsanedocdir) -DPATH_SANE_DATA_DIR=$(sanedatadir)
-+CPPFLAGS = @CPPFLAGS@ -DPATH_XSANE_DOC_DIR=$(xsanedocdir) -DPATH_SANE_DATA_DIR=$(datadir)
- CFLAGS   = @CFLAGS@ @SANE_CFLAGS@ @GIMP_CFLAGS@ @GTK_CFLAGS@
- LDFLAGS  = @LDFLAGS@ @SANE_LDFLAGS@
- LIBS     = @SANE_LIBS@ @GIMP_LIBS@ @GTK_LIBS@ @INTLLIBS@ @LIBS@

================================================================
Index: SOURCES/xsane-pl.po-update.patch
diff -u SOURCES/xsane-pl.po-update.patch:1.1 SOURCES/xsane-pl.po-update.patch:1.2
--- SOURCES/xsane-pl.po-update.patch:1.1	Tue Dec 27 00:10:24 2005
+++ SOURCES/xsane-pl.po-update.patch	Tue Jul 18 00:17:18 2006
@@ -1,35 +1,20 @@
---- xsane-0.98b/po/pl.po.orig	2005-10-30 09:27:30.000000000 +0100
-+++ xsane-0.98b/po/pl.po	2005-12-27 00:02:38.976426424 +0100
-@@ -1,14 +1,15 @@
- # Polish translation for XSane.
- # Copyright (c) 2002-2003 Piotr Gogolewski
- # Piotr Gogolewski <docent at panoramix.net.pl>, 2003.
-+# Jerzy Szczudłowski <jerzy at jedwab.net.pl>, 2004.
- #
- msgid ""
+diff -ur xsane-0.991-o/po/pl.po xsane-0.991/po/pl.po
+--- xsane-0.991-o/po/pl.po	2006-01-10 11:21:13.000000000 -0700
++++ xsane-0.991/po/pl.po	2006-07-17 15:46:00.000000000 -0600
+@@ -8,9 +8,9 @@
  msgstr ""
--"Project-Id-Version: XSane 0.96\n"
-+"Project-Id-Version: XSane 0.98b\n"
- "POT-Creation-Date: 2005-10-23 00:20+0200\n"
--"PO-Revision-Date: 2004-10-21 00:52+0100\n"
--"Last-Translator: Jerzy Szczudłowski <jerzy at jedwab.net.pl>\n"
--"Language-Team: Polish <pl at li.org>\n"
+ "Project-Id-Version: pl\n"
+ "POT-Creation-Date: 2006-01-07 00:26+0100\n"
+-"PO-Revision-Date: 2005-12-22 01:26+0100\n"
+-"Last-Translator: Jerzy Szczudlowski <jerzy at jedwab.net.pl>\n"
+-"Language-Team: polski <pl at li.org>\n"
 +"PO-Revision-Date: 2005-12-27 00:01+0100\n"
 +"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
 +"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
-@@ -2258,7 +2259,7 @@
- 
- #. ERR_ZLIB
- msgid "ZLIB error or memory allocation problem"
--msgstr ""
-+msgstr "BĹ‚Ä
d ZLIB lub problem z przydzieleniem pamięci"
- 
- #. ERR_UNKNOWN_TYPE
- msgid "unknown type"
-@@ -2551,7 +2552,7 @@
+@@ -2632,7 +2632,7 @@
  
  #. XSANE_GIMP_MENU
  msgid "<Toolbox>/File/Acquire/XSane: "
@@ -38,7 +23,7 @@
  
  #. XSANE_GIMP_MENU_DIALOG_OLD
  msgid "<Toolbox>/Xtns/XSane/Device dialog..."
-@@ -2559,7 +2560,7 @@
+@@ -2640,7 +2640,7 @@
  
  #. XSANE_GIMP_MENU_OLD
  msgid "<Toolbox>/Xtns/XSane/"
@@ -47,3 +32,6 @@
  
  #. HELP_NO_DEVICES
  msgid ""
+Only in xsane-0.991/po: pl.po~
+Only in xsane-0.991/po: pl.po.orig
+Only in xsane-0.991/po: pl.po.rej
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/xsane-datadir.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/xsane-pl.po-update.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list