r7116 - in packages/trunk/sdlbasic/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Tue May 20 07:16:08 UTC 2008
Author: miriam
Date: 2008-05-20 07:16:07 +0000 (Tue, 20 May 2008)
New Revision: 7116
Removed:
packages/trunk/sdlbasic/debian/patches/i18n.patch
Modified:
packages/trunk/sdlbasic/debian/control
packages/trunk/sdlbasic/debian/patches/makefiles.patch
packages/trunk/sdlbasic/debian/patches/series
Log:
Added missing dependencies
Fixed patches
Modified: packages/trunk/sdlbasic/debian/control
===================================================================
--- packages/trunk/sdlbasic/debian/control 2008-05-19 22:26:53 UTC (rev 7115)
+++ packages/trunk/sdlbasic/debian/control 2008-05-20 07:16:07 UTC (rev 7116)
@@ -9,7 +9,9 @@
libsdl-ttf2.0-dev,
libsdl-net1.2-dev,
libsdl-image1.2-dev,
- libsmpeg-dev
+ libsmpeg-dev,
+ libgtk2.0-dev,
+ libglib2.0-dev
Standards-Version: 3.7.3
Homepage: http://sdlbasic.sourceforge.net
DM-Upload-Allowed: yes
Deleted: packages/trunk/sdlbasic/debian/patches/i18n.patch
===================================================================
--- packages/trunk/sdlbasic/debian/patches/i18n.patch 2008-05-19 22:26:53 UTC (rev 7115)
+++ packages/trunk/sdlbasic/debian/patches/i18n.patch 2008-05-20 07:16:07 UTC (rev 7116)
@@ -1,119 +0,0 @@
-# Copyright (C) 2008 by Miriam Ruiz <little_miry at yahoo.es>
-# Distributed under the same license as the program. See debian/copyright.
-
-Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/SciTEGTK.cxx
-===================================================================
---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBasic/gtk/SciTEGTK.cxx 2008-04-04 15:33:00.000000000 +0000
-+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/SciTEGTK.cxx 2008-04-04 15:53:16.000000000 +0000
-@@ -35,6 +35,34 @@
- #include "SciTEBase.h"
- #include "SciTEKeys.h"
-
-+#ifdef USE_GETTEXT
-+
-+#include "i18n.h"
-+
-+#include <libintl.h>
-+#include <locale.h>
-+
-+GetTextInit::GetTextInit()
-+{
-+ if (!IsInit)
-+ {
-+ IsInit = true;
-+ setlocale (LC_MESSAGES, "");
-+ setlocale (LC_CTYPE, "");
-+ setlocale (LC_COLLATE, "");
-+ textdomain (PO_NAME);
-+#ifdef PO_DIR
-+ bindtextdomain (PO_NAME, PO_DIR);
-+#else
-+ bindtextdomain (PO_NAME, NULL);
-+#endif
-+ }
-+}
-+
-+bool GetTextInit::IsInit = false;
-+
-+#endif
-+
- #ifndef NO_EXTENSIONS
- #include "MultiplexExtension.h"
-
-Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/makefile.locales
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/makefile.locales 2008-04-04 15:57:34.000000000 +0000
-@@ -0,0 +1,42 @@
-+# Copyright (C) by Miriam Ruiz <little_miry at yahoo.es>, 2008
-+
-+PROGRAM=sdlbasic
-+CFLAGS=-Wall -Werror -ansi -pedantic
-+LOCALEDIR=.
-+DEFS=-DUSE_GETTEXT -DPO_NAME="\"$(PROGRAM)\"" -DPO_DIR="\"$(LOCALEDIR)\""
-+
-+all: $(PROGRAM).pot build-locales
-+
-+clean: clean-locales
-+ rm -f *.o *.mo test test.pot
-+
-+%.pot:
-+ xgettext -k -k_ -o $@ $+ --from-code=iso-8859-1
-+
-+$(PROGRAM).pot: main.cpp
-+
-+build-locales:
-+ @if ls *.po 2>/dev/null ; then \
-+ for f in *.po; do \
-+ i=`basename $$f .po` ; \
-+ echo Building Language \"$$i\" ; \
-+ msgfmt $$f -o $$i.mo ; \
-+ done \
-+ fi
-+ if ls *.mo 2>/dev/null ; then \
-+ for f in *.mo; do \
-+ i=`basename $$f .mo` ; \
-+ echo Installing Language \"$$i\" ; \
-+ mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES ; \
-+ mv $$f $(LOCALEDIR)/$$i/LC_MESSAGES/test.mo ; \
-+ done \
-+ fi
-+
-+clean-locales:
-+ @if ls *.po 2>/dev/null ; then \
-+ for f in *.po; do \
-+ i=`basename $$f .po` ; \
-+ echo Deleting Language \"$$i\" ; \
-+ rm -rf $$i ; \
-+ done \
-+ fi
-Index: sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/src/SciTE.h
-===================================================================
---- sdlbasic-0.0.20070714.orig/src/sdlBasic/src/sdlBasic/src/SciTE.h 2008-04-04 15:32:15.000000000 +0000
-+++ sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/src/SciTE.h 2008-04-04 15:54:38.000000000 +0000
-@@ -254,4 +254,25 @@
- #define IDR_GO 112
- #define IDR_STOPEXECUTE 113
-
-+#ifdef USE_GETTEXT
-+
-+#include <libintl.h>
-+#define _(String) gettext (String)
-+
-+class GetTextInit
-+{
-+ protected:
-+ static bool IsInit;
-+ public:
-+ GetTextInit();
-+};
-+
-+static GetTextInit gettext_init;
-+
-+#else
-+
-+#define _(String) String
-+
-+#endif
-+
- #endif
Modified: packages/trunk/sdlbasic/debian/patches/makefiles.patch
===================================================================
--- packages/trunk/sdlbasic/debian/patches/makefiles.patch 2008-05-19 22:26:53 UTC (rev 7115)
+++ packages/trunk/sdlbasic/debian/patches/makefiles.patch 2008-05-20 07:16:07 UTC (rev 7116)
@@ -75,135 +75,3 @@
clean:
$(RM) *.o
-Index: sdlbasic-0.0.20070714/home/miriam/sb/sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile
-===================================================================
---- sdlbasic-0.0.20070714.orig/home/miriam/sb/sdlbasic-0.0.20070714/src/sdlBasic/src/sdlBasic/gtk/makefile 2008-04-04 14:51:31.000000000 +0000
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,127 +0,0 @@
--# Make file for SciTE on Linux or compatible OS
--# Copyright 1998-2002 by Neil Hodgson <neilh at scintilla.org>
--# The License.txt file describes the conditions under which this software may be distributed.
--# This makefile assumes GCC 2.95.2 is used and changes will be needed to use other compilers.
--# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
--
--.SUFFIXES: .cxx .o .h .a .c
--CC = g++
--AR = ar
--
--
--# If explicit setting of GTK1 or GTK2 then use that else look for
--# pkg-config which is an OK indication that GTK2 is available
--ifndef GTK1
--ifndef GTK2
--ifneq (,$(findstring /,$(shell whereis pkg-config)))
--GTK2=1
--else
--GTK1=1
--endif
--endif
--endif
--
--# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
--# "h at h@" is printed here when gnome-config unavailable. Seems harmless.
--ifdef GTK2
--CONFIGFLAGS=pkg-config --cflags gtk+-2.0
--CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0
--CONFIGTHREADS=
--gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
--else
--CONFIGFLAGS=gtk-config --cflags
--CONFIGLIB=gtk-config --libs
--CONFIGTHREADS=glib-config --libs gthread
--gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
--endif
--ifndef prefix
-- prefix=/opt/sdlBasic
--endif
--datadir=$(prefix)/share
--pixmapdir=$(datadir)/pixmaps
--bindir=$(prefix)/bin
--SYSCONF_PATH=$(prefix)/share/sdlBasic
--DOC_PATH=$(prefix)/share/doc/sdlBasic
--PLUGINS_PATH=$(prefix)/share/sdlBasic/plugins
--
--INSTALL=install -o root -g root
--
--PROG = ../../../bin/sdlBasic
--
--all: $(PROG)
-- strip $(PROG)
--
--vpath %.h ../src ../scintilla/include
--vpath %.cxx ../src
--
--#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings
--INCLUDEDIRS=-I ../scintilla/include -I ../src
--CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS)
--
--ifdef DEBUG
--CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
--else
--CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
--endif
--
--
--CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
--
--
--ifeq ($(shell uname), Darwin)
--CXXFLAGS:=$(CXXFLAGS) -Dunix
--endif
--
--.cxx.o:
-- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $< -o $@
--
--clean:
-- rm -f *.o $(PROG)
--
--deps:
-- $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
--
--# make should be run in ../../scintilla/gtk to compile all the lexers.
--COMPLIB=../scintilla/gtk/scintilla.a
--
--$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
--MultiplexExtension.o SciTEProps.o Utf8_16.o \
-- $(COMPLIB) $(LUA_OBJS)
-- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
--
--# Automatically generate header dependencies with "make deps"
--include deps.mak
--
--# The two last install commands will fail if Gnome is not installed or is not at $(prefix).
--# This is OK - just means no SciTE in the Gnome Applications menu
--# Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
--install:
-- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-- $(INSTALL) -m 755 -d $(DESTDIR)$(SYSCONF_PATH)
-- $(INSTALL) -m 755 -d $(DESTDIR)$(DOC_PATH)
-- $(INSTALL) -m 755 -d $(DESTDIR)$(PLUGINS_PATH)
--
-- $(INSTALL) -m 755 $(PROG) $(DESTDIR)$$(bindir)
--
-- for files in ../../../share/sdlBasic/*.properties ../../../share/sdlBasic/*.api; \
-- do \
-- $(INSTALL) -m 644 $$files "$(DESTDIR)$(SYSCONF_PATH)"; \
-- done
--
--#for files in ..../share/doc/sdlBasic/*.html ../doc/SciTEIco.png ../doc/PrintHi.png; \
--#do \
--#$(INSTALL) -m 644 $$files $(DESTDIR)$$(DOC_PATH); \
--#done
--
-- for files in ../../../share/sdlBasic/plugins/*.sdlbas; \
-- do \
-- $(INSTALL) -m 644 $$files "$(DESTDIR)$(PLUGINS_PATH)"; \
-- done
--
--uninstall:
-- #rm -f $(DESTDIR)$(bindir)/SciTE
-- #rm -rf $(DESTDIR)$(SYSCONF_PATH)
--#ifdef gnomeprefix
-- #rm -f $(DESTDIR)$(datadir)/gnome/apps/Applications/SciTE.desktop
-- #rm -f $(DESTDIR)$(pixmapdir)/Sci48M.png
--#endif
Modified: packages/trunk/sdlbasic/debian/patches/series
===================================================================
--- packages/trunk/sdlbasic/debian/patches/series 2008-05-19 22:26:53 UTC (rev 7115)
+++ packages/trunk/sdlbasic/debian/patches/series 2008-05-20 07:16:07 UTC (rev 7116)
@@ -1,3 +1,2 @@
-
makefiles.patch
fonts.patch
More information about the Pkg-games-commits
mailing list