SOURCES: tuxpaint-Makefile.patch, tuxpaint-locale_names.patch, tuxpaint-vfo...

arvenil arvenil at pld-linux.org
Wed Sep 3 18:22:35 CEST 2008 

Author: arvenil                      Date: Wed Sep  3 16:22:35 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.9.20

---- Files affected:
SOURCES:
   tuxpaint-Makefile.patch (1.4 -> 1.5) , tuxpaint-locale_names.patch (1.8 -> 1.9) , tuxpaint-vfolders.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/tuxpaint-Makefile.patch
diff -u SOURCES/tuxpaint-Makefile.patch:1.4 SOURCES/tuxpaint-Makefile.patch:1.5
--- SOURCES/tuxpaint-Makefile.patch:1.4	Mon Oct 23 23:10:15 2006
+++ SOURCES/tuxpaint-Makefile.patch	Wed Sep  3 18:22:29 2008
@@ -1,20 +1,20 @@
---- tuxpaint-0.9.16/Makefile~	2006-10-19 09:41:49.000000000 +0200
-+++ tuxpaint-0.9.16/Makefile	2006-10-23 21:50:10.000000000 +0200
-@@ -18,7 +18,7 @@
- 
- # Where to install things:
- 
--PREFIX=/usr/local
-+PREFIX=$(_prefix)
+--- tuxpaint-0.9.20/Makefile	2008-07-01 00:16:48.000000000 +0000
++++ tuxpaint-0.9.20/Makefile	2008-09-03 14:54:34.000000000 +0000
+@@ -91,7 +91,7 @@
+ osx_PREFIX:=/usr/local
+ beos_PREFIX:=/boot/apps/Games/TuxPaint
+ linux_PREFIX:=/usr/local
+-PREFIX:=$($(OS)_PREFIX)
++PREFIX:=$(_prefix)
  
  
  # Root directory to place files when creating packages.
-@@ -64,7 +64,7 @@
- X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps
- GNOME_PREFIX=`gnome-config --prefix 2> /dev/null`
- KDE_PREFIX=`kde-config --install apps --expandvars 2> /dev/null`
--KDE_ICON_PREFIX=`kde-config --install icon --expandvars 2> /dev/null`
-+#KDE_ICON_PREFIX=`kde-config --install icon --expandvars 2> /dev/null`
- 
+@@ -139,7 +139,7 @@
+ X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
+ GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
+ KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
+-KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
++#KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
  
- # Locale files
+ # Maemo flag
+ MAEMOFLAG:=

================================================================
Index: SOURCES/tuxpaint-locale_names.patch
diff -u SOURCES/tuxpaint-locale_names.patch:1.8 SOURCES/tuxpaint-locale_names.patch:1.9
--- SOURCES/tuxpaint-locale_names.patch:1.8	Tue Apr 15 12:47:24 2008
+++ SOURCES/tuxpaint-locale_names.patch	Wed Sep  3 18:22:29 2008
@@ -1,157 +1,34 @@
---- tuxpaint-0.9.18/Makefile-i18n~	2007-11-10 01:43:28.000000000 +0100
-+++ tuxpaint-0.9.18/Makefile-i18n	2007-12-07 00:31:24.000000000 +0100
-@@ -74,7 +74,7 @@
- 	-rm $(LOCALE_PREFIX)/nr/LC_MESSAGES/tuxpaint.mo
- 	-rm $(LOCALE_PREFIX)/oj/LC_MESSAGES/tuxpaint.mo
- 	-rm $(LOCALE_PREFIX)/pl/LC_MESSAGES/tuxpaint.mo
--	-rm $(LOCALE_PREFIX)/pt_PT/LC_MESSAGES/tuxpaint.mo
-+	-rm $(LOCALE_PREFIX)/pt/LC_MESSAGES/tuxpaint.mo
- 	-rm $(LOCALE_PREFIX)/pt_BR/LC_MESSAGES/tuxpaint.mo
- 	-rm $(LOCALE_PREFIX)/ro/LC_MESSAGES/tuxpaint.mo
- 	-rm $(LOCALE_PREFIX)/ru/LC_MESSAGES/tuxpaint.mo
-@@ -348,10 +348,10 @@
- 	@cp trans/pl.mo $(LOCALE_PREFIX)/pl/LC_MESSAGES/tuxpaint.mo
- 	@chmod 644 $(LOCALE_PREFIX)/pl/LC_MESSAGES/tuxpaint.mo
- 	@#
--	@echo "   pt_PT ...Portuguese (Portugal)..."
--	@install -d $(LOCALE_PREFIX)/pt_PT/LC_MESSAGES
--	@cp trans/pt_pt.mo $(LOCALE_PREFIX)/pt_PT/LC_MESSAGES/tuxpaint.mo
--	@chmod 644 $(LOCALE_PREFIX)/pt_PT/LC_MESSAGES/tuxpaint.mo
-+	@echo "   pt ...Portuguese (Portugal)..."
-+	@install -d $(LOCALE_PREFIX)/pt/LC_MESSAGES
-+	@cp trans/pt_pt.mo $(LOCALE_PREFIX)/pt/LC_MESSAGES/tuxpaint.mo
-+	@chmod 644 $(LOCALE_PREFIX)/pt/LC_MESSAGES/tuxpaint.mo
- 	@#
- 	@echo "   ro_RO ...Romanian..."
- 	@install -d $(LOCALE_PREFIX)/ro/LC_MESSAGES
-@@ -780,7 +780,7 @@
- 	@msgfmt -o trans/pl.mo src/po/pl.po
- 
- trans/pt_pt.mo:	src/po/pt_pt.po
--	@echo "   pt_PT ...Portuguese..."
-+	@echo "   pt ...Portuguese..."
- 	@msgfmt -o trans/pt_pt.mo src/po/pt_pt.po
- 
- trans/pt_br.mo:	src/po/pt_br.po
---- tuxpaint-0.9.18/src/tuxpaint.desktop~	2007-12-07 00:25:18.000000000 +0100
-+++ tuxpaint-0.9.18/src/tuxpaint.desktop	2007-12-07 00:48:59.000000000 +0100
-@@ -12,13 +12,13 @@
- Name[da]=Tux maling
- Name[de]=Tux Paint
- Name[el]=Tux Paint
--Name[en_au]=Tux Paint
--Name[en_ca]=Tux Paint
--Name[en_gb]=Tux Paint
--Name[en_za]=Tux Paint
-+Name[en_AU]=Tux Paint
-+Name[en_CA]=Tux Paint
-+Name[en_GB]=Tux Paint
-+Name[en_ZA]=Tux Paint
- Name[eo]=Tux-Desegnilo
- Name[es]=Tux Paint
--Name[es_mx]=Tux Paint
-+Name[es_MX]=Tux Paint
- Name[et]=Joonistame koos Tuksiga!
- Name[eu]=Tux Paint
- Name[fi]=Tux Paint
-@@ -41,8 +41,8 @@
- Name[nn]=Tux Paint
- Name[nr]=ITux Pende
+--- tuxpaint-0.9.20/src/tuxpaint.desktop	2008-06-27 20:15:41.000000000 +0000
++++ tuxpaint-0.9.20/src/tuxpaint.desktop	2008-09-03 15:15:22.000000000 +0000
+@@ -49,7 +49,7 @@
+ Name[oc]=Tux Paint
  Name[pl]=Tux Paint
--Name[pt_br]=Tux Paint
--Name[pt_pt]=Tux Paint
-+Name[pt_BR]=Tux Paint
+ Name[pt_BR]=Tux Paint
+-Name[pt_PT]=Tux Paint
 +Name[pt]=Tux Paint
  Name[ru]=Рисуй вместе с Tux!
- Name[sk]=Tux Paint
+ Name[sk]=Kreslenie s Tuxom
  Name[sl]=Tux Paint
-@@ -60,8 +60,8 @@
- Name[wa]=Tux Paint
- Name[wo]=Tux Paint
- Name[xh]=Ipeyinti yeTux
--Name[zh_cn]=Tux Paint
--Name[zh_tw]=企鵝小畫家
-+Name[zh_CN]=Tux Paint
-+Name[zh_TW]=企鵝小畫家
- Name[zw]=Tux Paint
- Type=Application
- Exec=tuxpaint
-@@ -78,13 +78,13 @@
- GenericName[da]=Tegne program
- GenericName[de]=Malprogramm
- GenericName[el]=Πρόγραμμα ζωγραφικής
--GenericName[en_au]=Drawing program
--GenericName[en_ca]=Drawing program
--GenericName[en_gb]=Drawing program
--GenericName[en_za]=Drawing program
-+GenericName[en_AU]=Drawing program
-+GenericName[en_CA]=Drawing program
-+GenericName[en_GB]=Drawing program
-+GenericName[en_ZA]=Drawing program
- GenericName[eo]=Desegnoprogramo
- GenericName[es]=Programa de dibujo
--GenericName[es_mx]=Programa de dibujo
-+GenericName[es_MX]=Programa de dibujo
- GenericName[et]=Joonistusprogramm
- GenericName[eu]=Marrazketa programa
- GenericName[fi]=Piirto-ohjelma
-@@ -108,8 +108,8 @@
- GenericName[nn]=Teikneprogram
- GenericName[nr]=Iphrogremu youkudweba
+@@ -125,7 +125,7 @@
+ GenericName[oc]=Logicial de dessenh
  GenericName[pl]=Program do rysowania
--GenericName[pt_br]=Programa de desenho
--GenericName[pt_pt]=Programa de desenho
-+GenericName[pt_BR]=Programa de desenho
+ GenericName[pt_BR]=Programa de desenho
+-GenericName[pt_PT]=Programa de desenho
 +GenericName[pt]=Programa de desenho
  GenericName[ru]=Программа для рисования
  GenericName[sk]=Kresliaci program
  GenericName[sl]=Risarski program
-@@ -127,8 +127,8 @@
- GenericName[wa]=Programe di dessinaedje
- GenericName[wo]=Lëlu natal
- GenericName[xh]=Inkqubo yokuzoba
--GenericName[zh_cn]=绘图程序
--GenericName[zh_tw]=畫圖程式
-+GenericName[zh_CN]=绘图程序
-+GenericName[zh_TW]=畫圖程式
- GenericName[zw]=Diif program paar keé men Dibuj
- Comment=A drawing program for children.
- Comment[af]='n Tekenprogram vir kinders.
-@@ -141,13 +141,13 @@
- Comment[da]=Et tegneprogram for børn.
- Comment[de]=Ein Malprogramm für Kinder.
- Comment[el]=Ένα πρόγραμμα ζωγραφικής για παιδιά.
--Comment[en_au]=A drawing program for children.
--Comment[en_ca]=A drawing program for children.
--Comment[en_gb]=A drawing program for children.
--Comment[en_za]=A drawing program for children.
-+Comment[en_au]=A drawing program for children.
-+Comment[en_ca]=A drawing program for children.
-+Comment[en_GB]=A drawing program for children.
-+Comment[en_ZA]=A drawing program for children.
- Comment[eo]=Desegnoprogramo por infanoj
- Comment[es]=Un programa de dibujo para niños.
--Comment[es_mx]=Un programa de dibujo para niños.
-+Comment[es_MX]=Un programa de dibujo para niños.
- Comment[et]=Joonistusprogramm lastele.
- Comment[eu]=Umeentzako marrazketa programa
- Comment[fi]=Piirto-ohjelma pienille lapsille.
-@@ -171,8 +171,8 @@
- Comment[nn]=Eit teikneprogram for dei yngste.
+@@ -195,7 +195,7 @@
  Comment[nr]=Iphrogremu yokudweba yabantwana.
  Comment[pl]=Program do rysowania dla dzieci.
--Comment[pt_br]=Um programa de desenho para crianças.
--Comment[pt_pt]=Um programa de desenho para crianças.
-+Comment[pt_BR]=Um programa de desenho para crianças.
+ Comment[pt_BR]=Um programa de desenho para crianças.
+-Comment[pt_PT]=Um programa de desenho para crianças.
 +Comment[pt]=Um programa de desenho para crianças.
  Comment[ru]=Детская программа для рисования.
  Comment[sk]=Kresliaci program pre deti.
  Comment[sl]=Risarski program za otroke
-@@ -205,3 +205,7 @@
+@@ -216,3 +216,4 @@
  Comment[zh_CN]=孩子的绘图程序。
  Comment[zh_TW]=適合兒童的畫圖程式
  Comment[zw]=Diif program paar keé men Dibuj paar biét biss
 +Categories=Education;Art;
-+# vi: set encoding=utf-8
-+
-+

================================================================
Index: SOURCES/tuxpaint-vfolders.patch
diff -u SOURCES/tuxpaint-vfolders.patch:1.6 SOURCES/tuxpaint-vfolders.patch:1.7
--- SOURCES/tuxpaint-vfolders.patch:1.6	Wed Mar  5 02:14:34 2008
+++ SOURCES/tuxpaint-vfolders.patch	Wed Sep  3 18:22:30 2008
@@ -1,14 +1,14 @@
---- tuxpaint-0.9.17/Makefile~	2007-07-03 08:44:39.000000000 +0200
-+++ tuxpaint-0.9.17/Makefile	2007-07-03 08:49:33.000000000 +0200
-@@ -441,14 +441,14 @@
- 
+--- tuxpaint-0.9.20/Makefile	2008-09-03 14:56:33.000000000 +0000
++++ tuxpaint-0.9.20/Makefile	2008-09-03 15:06:25.000000000 +0000
+@@ -511,14 +511,14 @@
+ .PHONY: uninstall
  uninstall:	uninstall-i18n
  	-if [ "x$(GNOME_PREFIX)" != "x" ]; then \
--	  rm $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+-	  rm $(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
 +	  rm $(GNOME_PREFIX)/share/gnome/apps/tuxpaint.desktop; \
  	  rm $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
  	else \
--	  rm /usr/share/gnome/apps/Graphics/tuxpaint.desktop; \
+-	  rm /usr/share/applications/tuxpaint.desktop; \
 +	  rm /usr/share/gnome/apps/tuxpaint.desktop; \
  	  rm /usr/share/pixmaps/tuxpaint.png; \
  	fi
@@ -18,29 +18,29 @@
  	fi
  	-rm $(ICON_PREFIX)/tuxpaint.png
  	-rm $(X11_ICON_PREFIX)/tuxpaint.xpm
-@@ -512,9 +512,9 @@
- 	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \
- 	 cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
- 	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
--	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \
--	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
--	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
-+	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/; \
-+	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/; \
-+	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/tuxpaint.desktop; \
+@@ -588,9 +588,9 @@
+ 	 install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
+ 	 cp data/images/icon.png $(DESTDIR)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+ 	 chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+-	 install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
+-	 cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
+-	 chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
++	 install -d $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/; \
++	 cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/; \
++	 chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/tuxpaint.desktop; \
  	fi
  
  
-@@ -549,9 +549,9 @@
+@@ -625,9 +625,9 @@
  	@echo
  	@echo "...Installing launcher icon into KDE..."
  	@if [ "x$(KDE_PREFIX)" != "x" ]; then \
--	  install -d $(PKG_ROOT)$(KDE_PREFIX)/Graphics; \
--	  cp src/tuxpaint.desktop $(PKG_ROOT)$(KDE_PREFIX)/Graphics/; \
--	  chmod 644 $(PKG_ROOT)$(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
-+	  install -d $(KDE_PREFIX); \
-+	  cp src/tuxpaint.desktop $(KDE_PREFIX); \
-+	  chmod 644 $(KDE_PREFIX)/tuxpaint.desktop; \
+-	  install -d $(DESTDIR)$(KDE_PREFIX)/Graphics; \
+-	  cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/Graphics/; \
+-	  chmod 644 $(DESTDIR)$(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
++	 install -d $(KDE_PREFIX); \
++	 cp src/tuxpaint.desktop $(KDE_PREFIX); \
++	 chmod 644 $(KDE_PREFIX)/tuxpaint.desktop; \
  	fi
  
- 
+ .PHONY: install-kde-icons
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tuxpaint-Makefile.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tuxpaint-locale_names.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tuxpaint-vfolders.patch?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list