1 diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg gpe-go-0.05/build/Makefile.dpkg_ipkg
2 --- ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.dpkg_ipkg 2003-11-09 20:28:40.000000000 +0000
3 +++ gpe-go-0.05/build/Makefile.dpkg_ipkg 2004-09-18 17:09:01.000000000 +0100
5 LIBGPEWIDGET_PC = libgpewidget
8 +ifeq ($(IN_LIBGPEWIDGET),)
9 GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
10 GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
13 GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
14 GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
16 STANDARD_CFLAGS = -MD -Wall
19 -STANDARD_CFLAGS += -O2 -g
20 -STANDARD_LDFLAGS = -g
24 -STANDARD_CFLAGS += -Os -fomit-frame-pointer
25 +CFLAGS += -Os -fomit-frame-pointer
28 dist: check-source clean dist-prep
29 rm -rf ../$(PACKAGE)-$(VERSION)
30 mkdir ../$(PACKAGE)-$(VERSION)
31 - ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.d" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
32 + ( 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 -)
33 ( cd ../$(PACKAGE)-$(VERSION); mkdir build; cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ ; sed 's:^CVSBUILD.*:CVSBUILD = no:' < Makefile > Makefile.new; mv Makefile.new Makefile )
34 ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
35 rm -rf ../$(PACKAGE)-$(VERSION)
38 install: install-program install-mo
41 + rm -rf familiar/dist familiar/dist.list
46 - @if ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi
47 + @if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi
49 ipkg: check-source ipkg-prep clean
52 $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
53 rm -rf familiar/dist.list
54 ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
56 if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
57 md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
58 + rm -rf familiar/dist familiar/dist.list
65 sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
68 + $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
69 diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation gpe-go-0.05/build/Makefile.translation
70 --- ../gpe-go-0.05-r0/gpe-go-0.05/build/Makefile.translation 2003-11-09 20:28:40.000000000 +0000
71 +++ gpe-go-0.05/build/Makefile.translation 2004-09-18 17:09:01.000000000 +0100
73 # use ipkg-build or ipkg-deb-build
74 IPKG_BUILD := ipkg-build
76 -TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint/
77 +TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
82 ( 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 )
83 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
86 +clean: clean-po clean-dist-translation
92 MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
98 transdist := familiar/dist-translation
99 -templates := ../build/familiar
100 +templates := $(BUILD)/familiar
101 ipkglist := translation-ipkgs.txt
103 +clean-dist-translation:
104 + rm -rf $(transdist) $(ipkglist)
106 real-translation-package: all-mo
107 rm -rf $(transdist) $(ipkglist)
108 for LINGUA in $(LINGUAS); do \
110 install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
111 sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
112 install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
113 - chown -R root.root $(transdist)/$$i; \
114 - $(IPKG_BUILD) $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
115 + $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
119 diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c gpe-go-0.05/gpe-go.c
120 --- ../gpe-go-0.05-r0/gpe-go-0.05/gpe-go.c 2003-11-09 19:38:50.000000000 +0000
121 +++ gpe-go-0.05/gpe-go.c 2004-09-18 17:04:24.000000000 +0100
126 -#include "gpe/init.h"
127 -#include "gpe/pixmaps.h"
128 -#include "gpe/errorbox.h"
129 -#include "gpe/question.h"
130 -#include "gpe/popup_menu.h"
131 -#include "gpe/picturebutton.h"
132 +#include <gpe/init.h>
133 +#include <gpe/pixmaps.h>
134 +#include <gpe/errorbox.h>
135 +#include <gpe/question.h>
136 +#include <gpe/popup_menu.h>
137 +#include <gpe/picturebutton.h>
141 diff -urNd ../gpe-go-0.05-r0/gpe-go-0.05/Makefile gpe-go-0.05/Makefile
142 --- ../gpe-go-0.05-r0/gpe-go-0.05/Makefile 2003-11-09 20:28:40.000000000 +0000
143 +++ gpe-go-0.05/Makefile 2004-09-18 17:11:06.000000000 +0100
163 LINGUAS = cs de pl ro sv nl fr pt ru
167 PIXMAPS = board white.png black.png
169 -GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
170 -GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
171 +GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
172 +GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0`
174 -CPPFLAGS = $(GTKCFLAGS) -D_GNU_SOURCE
176 -CFLAGS += -O2 -g -DDEBUG=yes
178 +PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS)
179 +PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
180 +PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GTKLDFLAGS) $(GPELIBS)
182 +ifeq ($(CVSBUILD),yes)
185 -CFLAGS += -Os -fomit-frame-pointer
188 -CFLAGS += -Wall -I../../base/libgpewidget
189 -CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
192 -LDFLAGS += -L../../base/libgpewidget -lgpewidget
196 OBJS = $(patsubst %,%.o,$(MEMBERS))
197 -DEPS = $(patsubst %,%.d,$(MEMBERS))
198 SOURCES = $(patsubst %,%.c,$(MEMBERS))
199 +DEPS = $(patsubst %,%.d,$(MEMBERS))
201 ifdef DESKTOP #environement variable to set if you want extra code included.
202 -CPPFLAGS += -DDESKTOP
203 +PACKAGE_CPPFLAGS += -DDESKTOP
209 - $(CC) -o $@ $^ $(GTKLDFLAGS) $(LDFLAGS)
210 + $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
212 install-program: $(PACKAGE).desktop all
213 - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
214 - strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
215 + install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
216 install -d $(DESTDIR)$(PREFIX)/share/pixmaps
217 install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/
218 install -d $(DESTDIR)$(PREFIX)/share/applications
220 find . -name "*~" -exec rm -f {} \;
223 -#--include GPE generic Makefiles
224 -ifeq ($(CVSBUILD),yes)
225 -BUILD = ../../base/build
230 include $(BUILD)/Makefile.dpkg_ipkg
231 include $(BUILD)/Makefile.translation