gpe-gallery: svn version is the new default; convert to SRCREV

remove 0.97

5 files changed, 5 insertions, 276 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 83a3e224e9..379d105939 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -66,9 +66,10 @@ SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "10302"
+SRCREV_pn-gpe-conf ?= "9798"
 SRCREV_pn-gpe-contacts ?= "9312"
+SRCREV_pn-gpe-gallery ?= "9376"
 SRCREV_pn-gpe-sketchbook ?= "9547"
-SRCREV_pn-gpe-conf ?= "9798"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
@@ -247,7 +248,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "39188"
+EFL_SRCREV ?= "39263"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/packages/gpe-gallery/files/makefile-fix.patch b/packages/gpe-gallery/files/makefile-fix.patch
deleted file mode 100644
index ae4583573e..0000000000
--- a/packages/gpe-gallery/files/makefile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/Makefile	2006-07-26 11:02:47.000000000 +0200
-+++ gpe-gallery-0.97/Makefile	2006-07-26 11:05:07.584411000 +0200
-@@ -28,7 +28,7 @@
- 	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
- 
- install-program: all
--	install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
-+	install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
- 	install -D -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
- 	install -D -m 644 $(PACKAGE).applications $(DESTDIR)/$(PREFIX)/share/application-registry/$(PACKAGE).applications
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/packages/gpe-gallery/files/svn-build.patch b/packages/gpe-gallery/files/svn-build.patch
deleted file mode 100644
index 5b6edf4893..0000000000
--- a/packages/gpe-gallery/files/svn-build.patch
+++ /dev/null
@@ -1,240 +0,0 @@
---- gpe-gallery.orig/Makefile   2007-04-07 13:34:54.581405005 +0300
-+++ gpe-gallery/Makefile        2007-04-07 13:35:03.589918369 +0300
-@@ -1,7 +1,7 @@
- PREFIX = /usr/local
- PACKAGE = gpe-gallery
- DEBUG = no
--CVSBUILD = yes
-+CVSBUILD = no
- VERSION = 0.97
-
- MEMBERS = main image_tools
-diff -Naur gpe-gallery.orig/build/Makefile.dpkg_ipkg gpe-gallery/build/Makefile.dpkg_ipkg
---- gpe-gallery.orig/build/Makefile.dpkg_ipkg	1970-01-01 02:00:00.000000000 +0200
-+++ gpe-gallery/build/Makefile.dpkg_ipkg	2007-02-10 17:21:40.154584782 +0200
-@@ -0,0 +1,114 @@
-+## Please read the README in this directory to see how to use this
-+## Makefile snippet
-+
-+# Let's use whatever clean target the specific app provides
-+
-+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
-+
-+# URL to source tarball
-+SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz
-+
-+# can change this to e.g. /var/tmp/deb
-+DEB_PATH = ../deb
-+
-+ifeq ($(CVSBUILD),yes)
-+LIBGPEWIDGET_PC = libgpewidget-uninstalled
-+PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
-+else
-+LIBGPEWIDGET_PC = libgpewidget
-+endif
-+
-+ifeq ($(IN_LIBGPEWIDGET),)
-+GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
-+GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
-+endif
-+
-+GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
-+GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
-+
-+STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
-+STANDARD_CFLAGS = -MD -Wall
-+
-+ifeq ($(DEBUG),yes)
-+CFLAGS += -O2 -g
-+LDFLAGS = -g
-+else
-+CFLAGS += -Os -fomit-frame-pointer
-+endif
-+
-+dist: check-source clean dist-prep
-+	rm -rf ../$(PACKAGE)-$(VERSION)
-+	mkdir ../$(PACKAGE)-$(VERSION)
-+	( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
-+	( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile )
-+	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
-+	rm -rf ../$(PACKAGE)-$(VERSION)
-+	$(MAKE) printinfo
-+
-+dist-upload: dist
-+	scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/
-+
-+dist-prep:
-+ipkg-prep:
-+install-mo:
-+# empty, can be filled in Makefile.translation
-+
-+install: install-program install-mo
-+
-+clean-dist:
-+	rm -rf familiar/dist familiar/dist.list
-+
-+clean: clean-dist
-+
-+check-source:
-+	@if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
-+
-+ipkg: check-source ipkg-prep clean
-+	rm -rf familiar/dist
-+	mkdir -p familiar/dist/CONTROL
-+	sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
-+	if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
-+	if test -e familiar/preinst;   then install familiar/preinst   familiar/dist/CONTROL; fi
-+	if test -e familiar/postinst;  then install familiar/postinst  familiar/dist/CONTROL; fi
-+	if test -e familiar/prerm;     then install familiar/prerm     familiar/dist/CONTROL; fi
-+	if test -e familiar/postrm;    then install familiar/postrm    familiar/dist/CONTROL; fi
-+	$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
-+	rm -rf familiar/dist.list
-+	ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
-+	if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
-+	md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
-+	rm -rf familiar/dist familiar/dist.list
-+	$(MAKE) printinfo
-+
-+dpkg: dist
-+	mkdir -p $(DEB_PATH)
-+	( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
-+	mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
-+	for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
-+
-+CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
-+printinfo:
-+	@printf '-------------------------------------------------------------------------------\n'
-+	@printf "If this becomes a package release, please add a CVS tag.\n"
-+	@printf "You can use 'make tag' for that, it will execute\n"
-+	@printf "   cvs tag %s\n" $(CVSTAG)
-+	@printf "Please upload a tarball (created with 'make dist') to\n"
-+	@printf "   ftp://ftp.handhelds.org/pub/projects/gpe/\n"
-+	@printf "   (handhelds.org:~ftp/pub/projects/gpe/source)\n"
-+	@printf "You can use 'make dist-upload' to do that.\n"
-+	@printf "You are currently known as USER %s.\n" $(USER)
-+	@printf '-------------------------------------------------------------------------------\n'
-+
-+tag: check-source
-+	cvs tag $(CVSTAG)
-+
-+retag: check-source
-+	cvs tag -F $(CVSTAG)
-+
-+source: tag dist-upload
-+
-+%.pc: %.pc.in
-+	sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
-+
-+.c.o:;
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
-diff -Naur gpe-gallery.orig/build/Makefile.translation gpe-gallery/build/Makefile.translation
---- gpe-gallery.orig/build/Makefile.translation	1970-01-01 02:00:00.000000000 +0200
-+++ gpe-gallery/build/Makefile.translation	2007-02-10 17:21:46.170927636 +0200
-@@ -0,0 +1,107 @@
-+.SUFFIXES: .mo .po .pot .po8
-+
-+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
-+
-+# use ipkg-build or ipkg-deb-build
-+IPKG_BUILD := ipkg-build
-+
-+TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
-+
-+ifeq ($(DIR_PO),)
-+DIR_PO := po
-+endif
-+
-+ifeq ($(BINPACKAGE),)
-+BINPACKAGE := $(PACKAGE)
-+endif
-+
-+mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS))
-+po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
-+
-+ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present)
-+desktop-files += $(PACKAGE).desktop
-+endif
-+
-+ifneq ($(EXTRA_DESKTOPS),)
-+desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS))
-+endif
-+
-+all-mo: $(mo-files)
-+
-+all-desktop: $(desktop-files)
-+
-+install-mo: all-mo
-+	if [ "$(ENABLE_NLS)" != "no" ]; then \
-+		if [ "x$(LINGUAS)" != "x" ]; then \
-+			for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
-+		fi; \
-+	fi;
-+
-+.po8.mo:;
-+	if [ "$(ENABLE_NLS)" != "no" ]; then \
-+		msgfmt -o $@ $<; \
-+	fi;
-+
-+.po.po8:;
-+	CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@
-+
-+update-po: $(po-files) extract-po
-+
-+dist-prep: update-po freshen-po
-+# empty
-+
-+ifeq ($(CVSBUILD),yes)
-+ipkg-prep: freshen-po
-+# empty
-+endif
-+
-+extract-po:
-+	mkdir -p $(DIR_PO)
-+	( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
-+	if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
-+
-+clean: clean-po clean-dist-translation
-+
-+clean-po:
-+	rm -rf $(DIR_PO)/*.mo
-+	for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done
-+
-+%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
-+	intltool-merge -u -d $(DIR_PO) $< $@
-+
-+freshen-po:
-+	rm -rf tmp-po
-+	mkdir tmp-po
-+	cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done
-+	for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done
-+	rm -rf tmp-po
-+
-+# ------------------------------------------------------------------------
-+
-+MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
-+
-+ifndef BUILD
-+BUILD = ../build
-+endif
-+
-+transdist := familiar/dist-translation
-+templates := $(BUILD)/familiar
-+ipkglist  := translation-ipkgs.txt
-+
-+clean-dist-translation:
-+	rm -rf $(transdist) $(ipkglist)
-+
-+real-translation-package: all-mo
-+	rm -rf $(transdist) $(ipkglist)
-+	for LINGUA in $(LINGUAS); do \
-+		i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \
-+		mkdir -p $(transdist)/$$i/CONTROL; \
-+		mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \
-+		install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
-+		sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
-+		install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
-+		$(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
-+	done
-+
-+translation-ipkg:
-+	make PREFIX=/usr real-translation-package
diff --git a/packages/gpe-gallery/gpe-gallery_0.97.bb b/packages/gpe-gallery/gpe-gallery_0.97.bb
deleted file mode 100644
index 4b4cfaebb8..0000000000
--- a/packages/gpe-gallery/gpe-gallery_0.97.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
-SRC_URI += "file://makefile-fix.patch;patch=1"
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-
-FILES_${PN} += "${datadir}/gpe/pixmaps"
-FILES_${PN} += "${datadir}/application-registry"
-
-DESCRIPTION = "GPE image viewer application"
-export CVSBUILD = "no"
-
diff --git a/packages/gpe-gallery/gpe-gallery_svn.bb b/packages/gpe-gallery/gpe-gallery_svn.bb
index 863dfe5f93..ea1d23a5be 100644
--- a/packages/gpe-gallery/gpe-gallery_svn.bb
+++ b/packages/gpe-gallery/gpe-gallery_svn.bb
@@ -2,18 +2,13 @@ DESCRIPTION = "GPE image viewer application"
 SECTION = "gpe"
 LICENSE = "GPL"
 DEPENDS = "libgpewidget"
-PV = "0.97+svn-${SRCDATE}"
+PV = "0.97+svnr${SRCREV}"
 
 inherit autotools 
 export CVSBUILD = "no"
 
-SRC_URI += "${GPE_EXTRA_SVN} \
-	    file://svn-build.patch;patch=1"
-
+SRC_URI = "${GPE_EXTRA_SVN}"
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += "${datadir}/gpe/pixmaps"
 FILES_${PN} += "${datadir}/application-registry"
-
-
-DEFAULT_PREFERENCE = "-1"