[Tux4kids-commits] r983 - in tuxtype/people/holger: tuxtype/trunk/debian tuxtype/trunk/debian/patches tuxtype-data-nonfree/trunk/debian
Holger Levsen
holger at alioth.debian.org
Thu May 21 15:57:17 UTC 2009
Author: holger
Date: 2009-05-21 15:57:17 +0000 (Thu, 21 May 2009)
New Revision: 983
Removed:
tuxtype/people/holger/tuxtype/trunk/debian/patches/100-nynorsk-words.patch
tuxtype/people/holger/tuxtype/trunk/debian/patches/110-ttf-sil-andika.patch
tuxtype/people/holger/tuxtype/trunk/debian/patches/120_fix-null-pointer.patch
Modified:
tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/
tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/changelog
tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/control
tuxtype/people/holger/tuxtype/trunk/debian/
tuxtype/people/holger/tuxtype/trunk/debian/changelog
tuxtype/people/holger/tuxtype/trunk/debian/control
tuxtype/people/holger/tuxtype/trunk/debian/patches/130_fix_german_keyboard-lst.patch
tuxtype/people/holger/tuxtype/trunk/debian/patches/series
tuxtype/people/holger/tuxtype/trunk/debian/rules
tuxtype/people/holger/tuxtype/trunk/debian/tuxtype-data.install
Log:
release 1.7.4.dfsg1-1 and 1.7.4.dfsgnonfree1-1 finally
Property changes on: tuxtype/people/holger/tuxtype/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: tuxtype/people/holger/tuxtype/trunk/debian/changelog
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/changelog 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/changelog 2009-05-21 15:57:17 UTC (rev 983)
@@ -1,3 +1,23 @@
+tuxtype (1.7.4.dfsg1-1) unstable; urgency=low
+
+ * New upstream version (Closes: #528423) with lots of bug fixes and code
+ cleanups, GNU gettext is used for internationalization, added themes and
+ translations for multiple additional Indic languages, improved font
+ handling (Closes: #489924, #497112), thus removing
+ debian/patches/110-ttf-sil-andika.patch, a new graphical keyboard hint
+ system, rewritten phrase practice activity, fullscreen mode at native
+ resolution, a new GUI for editing wordlist implemented (Closes: #94986)
+ * Drop 100-nynorsk-words.patch as it has been adopted upstream
+ * Drop 120_fix-null-pointer.patch as it causes a FTBFS, upstream has been
+ notified.
+ * Add ttf-bengali-fonts, ttf-devanagari-fonts, ttf-gujarati-fonts,
+ ttf-kannada-fonts, ttf-oriya-fonts, ttf-punjabi-fonts, ttf-tamil-fonts,
+ ttf-telugu-fonts as suggested packages.
+ * Bump Standards-version to 3.8.1, no changes needed.
+ * Switch packaging to svn-buildpackage.
+
+ -- Holger Levsen <holger at debian.org> Thu, 21 May 2009 11:28:01 +0200
+
tuxtype (1.5.17.dfsg1-4) unstable; urgency=low
* Install .desktop file. (Closes: #509364)
Modified: tuxtype/people/holger/tuxtype/trunk/debian/control
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/control 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/control 2009-05-21 15:57:17 UTC (rev 983)
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Holger Levsen <holger at debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Build-Depends: debhelper (>=5.0.42), libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-pango-dev, quilt, automake
Homepage: http://tux4kids.alioth.debian.org
Vcs-Svn: svn://svn.debian.org/svn/tux4kids/tuxtype/
@@ -12,7 +12,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ttf-sil-andika (>=1.0.basic-1), tuxtype-data
Recommends: ttf-sil-doulos
-Suggests: tuxtype-data-nonfree, ttf-malayalam-fonts, ttf-devanagari-fonts
+Suggests: tuxtype-data-nonfree, ttf-bengali-fonts, ttf-devanagari-fonts, ttf-gujarati-fonts, ttf-kannada-fonts, ttf-oriya-fonts, ttf-punjabi-fonts, ttf-tamil-fonts, ttf-telugu-fonts
Description: Educational Typing Tutor Game Starring Tux
TuxTyping is an educational typing tutorial game starring
Tux, the Linux Penguin. The player guides Tux to eat fish
Deleted: tuxtype/people/holger/tuxtype/trunk/debian/patches/100-nynorsk-words.patch
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/patches/100-nynorsk-words.patch 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/patches/100-nynorsk-words.patch 2009-05-21 15:57:17 UTC (rev 983)
@@ -1,16 +0,0 @@
-Index: tuxtype-1.5.17.dfsg1/tuxtype/data/themes/nynorsk/words/Makefile.am
-===================================================================
---- tuxtype-1.5.17.dfsg1.orig/tuxtype/data/themes/nynorsk/words/Makefile.am 2008-06-17 17:32:52.000000000 +0000
-+++ tuxtype-1.5.17.dfsg1/tuxtype/data/themes/nynorsk/words/Makefile.am 2008-06-17 17:33:08.000000000 +0000
-@@ -1,9 +1,9 @@
- ## Makefile.am for tuxtype - data/themes/nynorsk/words:
- ## Process with Automake to create Makefile.in
-
--themes_nynorsk_images_wordsdir = $(pkgdatadir)/data/themes/nynorsk/images/words
-+themes_nynorsk_wordsdir = $(pkgdatadir)/data/themes/nynorsk/words
-
--dist_themes_nynorsk_images_words_DATA = 3boks.txt \
-+dist_themes_nynorsk_words_DATA = 3boks.txt \
- 4boks.txt \
- 5boks.txt \
- 6boks.txt \
Deleted: tuxtype/people/holger/tuxtype/trunk/debian/patches/110-ttf-sil-andika.patch
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/patches/110-ttf-sil-andika.patch 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/patches/110-ttf-sil-andika.patch 2009-05-21 15:57:17 UTC (rev 983)
@@ -1,83 +0,0 @@
-Index: tuxtype-1.5.17.dfsg1/Makefile.am
-===================================================================
---- tuxtype-1.5.17.dfsg1.orig/Makefile.am 2008-06-25 12:53:01.000000000 +0000
-+++ tuxtype-1.5.17.dfsg1/Makefile.am 2008-06-25 12:54:34.000000000 +0000
-@@ -66,7 +66,7 @@
- ## i.e. to make tarball to post for individual download - use 'make distcheck' for Debian.
- ## (thanks to Ralf Wildenhues <Ralf.Wildenhues at gmx.de> for automake help!)
- dist_with_fonts:
-- $(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) dist_fonts='AndikaDesRevG.ttf DoulosSILR.ttf lohit_hi.ttf Rachana_w01.ttf' dist
-+ $(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) dist_fonts='AndBasR.ttf DoulosSILR.ttf lohit_hi.ttf Rachana_w01.ttf' dist
-
- install-nsi-am: install-nsi-local
-
-@@ -78,4 +78,4 @@
- @$(NORMAL_CLEAN)
- if test -d $(NSI_INSTALL_DIR); then \
- rm -fr $(NSI_INSTALL_DIR); \
-- fi
-\ No newline at end of file
-+ fi
-Index: tuxtype-1.5.17.dfsg1/tuxtype/data/fonts/Makefile.am
-===================================================================
---- tuxtype-1.5.17.dfsg1.orig/tuxtype/data/fonts/Makefile.am 2008-06-25 12:53:01.000000000 +0000
-+++ tuxtype-1.5.17.dfsg1/tuxtype/data/fonts/Makefile.am 2008-06-25 12:54:25.000000000 +0000
-@@ -9,13 +9,13 @@
- ## included (depending if package build with "make dist" or "make dist_with_fonts"
- install-data-local:
- $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
-- -$(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
-+ -$(INSTALL_DATA) $(srcdir)/AndBasR.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
- -$(INSTALL_DATA) $(srcdir)/DoulosSILR.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
- -$(INSTALL_DATA) $(srcdir)/lohit_hi.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
- -$(INSTALL_DATA) $(srcdir)/Rachana_w01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
-
- uninstall-local:
-- -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/AndikaDesRevG.ttf
-+ -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/AndBasR.ttf
- -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/DoulosSILR.ttf
- -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/lohit_hi.ttf
- -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/Rachana_w01.ttf
-Index: tuxtype-1.5.17.dfsg1/tuxtype/docs/en/howtotheme.html
-===================================================================
---- tuxtype-1.5.17.dfsg1.orig/tuxtype/docs/en/howtotheme.html 2008-06-25 12:53:01.000000000 +0000
-+++ tuxtype-1.5.17.dfsg1/tuxtype/docs/en/howtotheme.html 2008-06-25 12:53:49.000000000 +0000
-@@ -39,7 +39,7 @@
- </td></tr></table></center>
- <br>
- <li>Fonts
--<p>Tux Typing currently uses three fonts (AndikaDesRevG.ttf, DoulosSILR.ttf, and Rachana_w01.ttf) to provide glyphs for the included themes. The default font is Andika, which has glyphs for English and other Western European languages. Doulos has wider coverage, and is included to support the Cyrillic characters needed for the Russian theme. Rachana provides glyphs for the Malayalam theme. If your theme works with the default Andika font, you do not need to specify anything. If one of the other fonts is needed, your theme directory needs to have a file "settings.txt" containing a line indicating your font selection, e.g.:
-+<p>Tux Typing currently uses three fonts (AndBasR.ttf, DoulosSILR.ttf, and Rachana_w01.ttf) to provide glyphs for the included themes. The default font is Andika, which has glyphs for English and other Western European languages. Doulos has wider coverage, and is included to support the Cyrillic characters needed for the Russian theme. Rachana provides glyphs for the Malayalam theme. If your theme works with the default Andika font, you do not need to specify anything. If one of the other fonts is needed, your theme directory needs to have a file "settings.txt" containing a line indicating your font selection, e.g.:
- <br>
- theme_font_name=Rachana_w01.ttf
- <br>
-Index: tuxtype-1.5.17.dfsg1/tuxtype/globals.h
-===================================================================
---- tuxtype-1.5.17.dfsg1.orig/tuxtype/globals.h 2008-06-25 12:53:01.000000000 +0000
-+++ tuxtype-1.5.17.dfsg1/tuxtype/globals.h 2008-06-25 12:54:05.000000000 +0000
-@@ -87,8 +87,8 @@
-
- /* Default values for game_option_type struct */
- /* They can be changed in the struct to other values at run-time */
--#define DEFAULT_MENU_FONT "AndikaDesRevG.ttf"
--#define DEFAULT_GAME_FONT "AndikaDesRevG.ttf"
-+#define DEFAULT_MENU_FONT "AndBasR.ttf"
-+#define DEFAULT_GAME_FONT "AndBasR.ttf"
- #define DEFAULT_USE_ENGLISH 1
- #define DEFAULT_FULLSCREEN 1
- #define DEFAULT_SYS_SOUND 1
-Index: tuxtype-1.5.17.dfsg1/tuxtype/loaders.c
-===================================================================
---- tuxtype-1.5.17.dfsg1.orig/tuxtype/loaders.c 2008-06-25 12:53:01.000000000 +0000
-+++ tuxtype-1.5.17.dfsg1/tuxtype/loaders.c 2008-06-25 12:53:40.000000000 +0000
-@@ -221,8 +221,8 @@
-
- /* HACK hard-coded for Debian (and current exact font names): */
-
-- if (strncmp(font_name, "AndikaDesRevG.ttf", FNLEN ) == 0)
-- sprintf(fn, "/usr/share/fonts/truetype/ttf-sil-andika/AndikaDesRevG.ttf");
-+ if (strncmp(font_name, "AndBasR.ttf", FNLEN ) == 0)
-+ sprintf(fn, "/usr/share/fonts/truetype/ttf-sil-andika/AndBasR.ttf");
- else if (strncmp(font_name, "DoulosSILR.ttf", FNLEN ) == 0)
- sprintf(fn, "/usr/share/fonts/truetype/ttf-sil-doulos/DoulosSILR.ttf");
- else if (strncmp(font_name, "lohit_hi.ttf", FNLEN ) == 0)
Deleted: tuxtype/people/holger/tuxtype/trunk/debian/patches/120_fix-null-pointer.patch
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/patches/120_fix-null-pointer.patch 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/patches/120_fix-null-pointer.patch 2009-05-21 15:57:17 UTC (rev 983)
@@ -1,153 +0,0 @@
-diff -Nurwd orig/tuxtype-1.5.17.dfsg1/tuxtype/funcs.h tuxtype-1.5.17.dfsg1/tuxtype/funcs.h
---- orig/tuxtype-1.5.17.dfsg1/tuxtype/funcs.h 2008-07-05 14:19:19.000000000 +0200
-+++ tuxtype-1.5.17.dfsg1/tuxtype/funcs.h 2008-07-05 14:19:30.000000000 +0200
-@@ -119,4 +119,5 @@
- /* In titlescreen.c: */
- void SwitchScreenMode(void);
- void TitleScreen(void);
-+void error_occured(void);
-
-diff -Nurwd orig/tuxtype-1.5.17.dfsg1/tuxtype/laser.c tuxtype-1.5.17.dfsg1/tuxtype/laser.c
---- orig/tuxtype-1.5.17.dfsg1/tuxtype/laser.c 2008-07-05 14:19:19.000000000 +0200
-+++ tuxtype-1.5.17.dfsg1/tuxtype/laser.c 2008-07-05 14:19:30.000000000 +0200
-@@ -829,6 +829,11 @@
- int i = 0;
- comet_type* prev_comet = NULL;
-
-+ /* Do nothing if word is a NULL pointer. This could happen for example if a char *
-+ in a word is not listed keyboard.lst of this specific language. It would imho *
-+ be nicer to get here a warning or a error and not a tux waiting for nothing. *
-+ This have to be fixed later. */
-+ if (word != NULL) {
- DEBUGCODE {fprintf(stderr, "word is: %S\tlength is: %d\n", word, (int)wcslen(word));}
- do
- {
-@@ -865,11 +870,14 @@
- DEBUGCODE {fprintf(stderr, "Assigning letter to comet: %C\n", word[i]);}
- }
- }
-+ } else {
-+ DEBUGCODE {fprintf(stderr, "word was pointer to NULL, showing error dialog\n");}
-+ error_occured();
-+ }
- }
- LOG ("Leaving laser_add_comet()\n");
- }
-
--
- /* Draw numbers/symbols over the attacker: */
-
- static void laser_draw_let(wchar_t c, int x, int y)
-diff -Nurwd orig/tuxtype-1.5.17.dfsg1/tuxtype/titlescreen.c tuxtype-1.5.17.dfsg1/tuxtype/titlescreen.c
---- orig/tuxtype-1.5.17.dfsg1/tuxtype/titlescreen.c 2008-07-05 14:19:19.000000000 +0200
-+++ tuxtype-1.5.17.dfsg1/tuxtype/titlescreen.c 2008-07-05 14:19:30.000000000 +0200
-@@ -867,6 +867,109 @@
- settings.fullscreen = !settings.fullscreen;
- }
-
-+/*Derived from not_implemented: should only be shown if an error occurs somewhere */
-+void error_occured(void)
-+{
-+ SDL_Surface* bk = NULL;
-+ SDL_Surface *s1 = NULL, *s2 = NULL, *s3 = NULL, *s4 = NULL;
-+ sprite* tux = NULL;
-+ SDL_Rect loc;
-+ int finished = 0, i;
-+
-+ LOG( "ErrorOccured() - creating text\n" );
-+ /* if no font is set, use default ones */
-+ if (!font)
-+ font = LoadFont(DEFAULT_MENU_FONT, MENU_FONT_SIZE);
-+
-+ s1 = BlackOutline( _("An error occured"), font, &white);
-+ s2 = BlackOutline( _("This shouldn't happen, you'll found a bug"), font, &white);
-+ s3 = BlackOutline( _("Please report this problem to"), font, &white);
-+
-+ /* we always want the URL in english */
-+ /* NOTE: all fonts are almost certain to include glyphs for ASCII, */
-+ /* so the following "english_font" hackery is probably unnecessary: */
-+ if (!settings.use_english)
-+ {
-+ TTF_Font *english_font;
-+ settings.use_english = 1;
-+ english_font = LoadFont(DEFAULT_MENU_FONT, MENU_FONT_SIZE);
-+ s4 = BlackOutline( "tux4kids-tuxtype-dev at lists.alioth.debian.org", english_font, &white);
-+ TTF_CloseFont(english_font);
-+ settings.use_english = 0;
-+ }
-+ else
-+ s4 = BlackOutline( "tux4kids-tuxtype-dev at lists.alioth.debian.org", font, &white);
-+
-+ tux = LoadSprite("tux/tux-egypt", IMG_ALPHA);
-+ bk = LoadImage("main_bkg.png", IMG_REGULAR);
-+
-+ if (s1 && s2 && s3 && s4 && tux && bk)
-+ {
-+ LOG( "ErrorOccured() - drawing screen\n" );
-+
-+ SDL_BlitSurface(bk, NULL, screen, NULL);
-+ loc.x = 320-(s1->w/2); loc.y = 10;
-+ SDL_BlitSurface( s1, NULL, screen, &loc);
-+ loc.x = 320-(s2->w/2); loc.y = 60;
-+ SDL_BlitSurface( s2, NULL, screen, &loc);
-+ loc.x = 320-(s3->w/2); loc.y = 400;
-+ SDL_BlitSurface( s3, NULL, screen, &loc);
-+ loc.x = 320-(s4->w/2); loc.y = 440;
-+ SDL_BlitSurface( s4, NULL, screen, &loc);
-+
-+ loc.x = 320-(tux->frame[0]->w/2);
-+ loc.y = 200;
-+ loc.w = tux->frame[0]->w;
-+ loc.h = tux->frame[0]->h;
-+ SDL_BlitSurface( tux->frame[tux->cur], NULL, screen, &loc);
-+
-+ SDL_UpdateRect(screen, 0, 0, 0, 0);
-+
-+ i = 0;
-+
-+ while (!finished)
-+ {
-+ while (SDL_PollEvent(&event))
-+ {
-+ switch (event.type)
-+ {
-+ case SDL_QUIT:
-+ exit(0);
-+ case SDL_MOUSEBUTTONDOWN:
-+ case SDL_KEYDOWN:
-+ TitleScreen();
-+ exit(0);
-+ }
-+ }
-+
-+ i++;
-+
-+ if (i %5 == 0)
-+ {
-+ NEXT_FRAME(tux);
-+ SDL_BlitSurface(bk, &loc, screen, &loc);
-+ SDL_BlitSurface(tux->frame[tux->cur], NULL, screen, &loc);
-+ SDL_UpdateRect(screen, loc.x, loc.y, loc.w, loc.h);
-+ }
-+
-+ SDL_Delay(40);
-+ }
-+ }
-+ else
-+ fprintf(stderr, "ErrorOccured() - could not load needed graphic\n");
-+
-+ SDL_FreeSurface(s1);
-+ SDL_FreeSurface(s2);
-+ SDL_FreeSurface(s3);
-+ SDL_FreeSurface(s4);
-+ SDL_FreeSurface(bk);
-+ s1 = s2 = s3 = s4 = bk = NULL;
-+ FreeSprite(tux);
-+ tux = NULL;
-+}
-+
-+
-+
-
- /************************************************************************/
- /* */
Modified: tuxtype/people/holger/tuxtype/trunk/debian/patches/130_fix_german_keyboard-lst.patch
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/patches/130_fix_german_keyboard-lst.patch 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/patches/130_fix_german_keyboard-lst.patch 2009-05-21 15:57:17 UTC (rev 983)
@@ -1,6 +1,6 @@
-diff -Nurwd orig/tuxtype-1.5.17.dfsg1/tuxtype/data/themes/deutsch/keyboard.lst tuxtype-1.5.17.dfsg1/tuxtype/data/themes/deutsch/keyboard.lst
---- orig/tuxtype-1.5.17.dfsg1/tuxtype/data/themes/deutsch/keyboard.lst 2008-07-05 14:19:19.000000000 +0200
-+++ tuxtype-1.5.17.dfsg1/tuxtype/data/themes/deutsch/keyboard.lst 2008-07-05 14:26:36.000000000 +0200
+diff -Nurwd orig/tuxtype-1.5.17.dfsg1/data/themes/deutsch/keyboard.lst tuxtype-1.5.17.dfsg1/tuxtype/data/themes/deutsch/keyboard.lst
+--- orig/tuxtype-1.5.17.dfsg1/data/themes/deutsch/keyboard.lst 2008-07-05 14:19:19.000000000 +0200
++++ tuxtype-1.5.17.dfsg1/data/themes/deutsch/keyboard.lst 2008-07-05 14:26:36.000000000 +0200
@@ -54,7 +54,7 @@
5|
0|!
@@ -10,7 +10,7 @@
0|1
0|2
0|3
-@@ -67,5 +67,12 @@
+@@ -67,4 +67,12 @@
0|0
7|,
8|.
@@ -23,4 +23,4 @@
+9|Ü
+9|ä
+9|Ä
- 9|ß
++9|ß
Modified: tuxtype/people/holger/tuxtype/trunk/debian/patches/series
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/patches/series 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/patches/series 2009-05-21 15:57:17 UTC (rev 983)
@@ -1,4 +1 @@
-110-ttf-sil-andika.patch
-100-nynorsk-words.patch
-120_fix-null-pointer.patch
130_fix_german_keyboard-lst.patch
Modified: tuxtype/people/holger/tuxtype/trunk/debian/rules
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/rules 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/rules 2009-05-21 15:57:17 UTC (rev 983)
@@ -26,7 +26,6 @@
config.status:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- # because we patch a Makefile.am to fix nynorsk in 1.5.17
autoreconf --install
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games
@@ -63,16 +62,13 @@
dh_installdirs
# Add here commands to install the package into debian/tuxtype.
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- rm $(CURDIR)/debian/tmp/usr/share/tuxtype/data/images/icons/tuxtype.ico
- rmdir $(CURDIR)/debian/tmp/usr/share/tuxtype/data/images/icons/
dh_installdirs -ptuxtype-data usr/share/
dh_installdirs
cp $(CURDIR)/debian/tuxtype.xpm $(CURDIR)/debian/tuxtype/usr/share/tuxtype/tuxtype.xpm
mkdir -p $(CURDIR)/debian/tuxtype/usr/share/applications
cp $(CURDIR)/debian/tuxtype.desktop \
$(CURDIR)/debian/tuxtype/usr/share/applications/tuxtype.desktop
- rm $(CURDIR)/debian/tmp/usr/share/tuxtype/data/fonts/*.ttf
- rmdir $(CURDIR)/debian/tmp/usr/share/tuxtype/data/fonts
+ rm $(CURDIR)/debian/tmp/usr/share/tuxtype/fonts -Rf
touch install-stamp
@@ -87,7 +83,6 @@
dh_installmenu
dh_installman
dh_install --sourcedir=debian/tmp
- dh_desktop
dh_link
dh_strip
dh_compress
Modified: tuxtype/people/holger/tuxtype/trunk/debian/tuxtype-data.install
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/tuxtype-data.install 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype/trunk/debian/tuxtype-data.install 2009-05-21 15:57:17 UTC (rev 983)
@@ -1 +1 @@
-/usr/share/tuxtype/data
+/usr/share/tuxtype/
Property changes on: tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/changelog
===================================================================
--- tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/changelog 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/changelog 2009-05-21 15:57:17 UTC (rev 983)
@@ -1,3 +1,11 @@
+tuxtype-data-nonfree (1.7.4.dfsgnonfree1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Bump Standards-version to 3.8.1, no changes needed.
+ * Switch packaging to svn-buildpackage.
+
+ -- Holger Levsen <holger at debian.org> Thu, 21 May 2009 11:28:12 +0200
+
tuxtype-data-nonfree (1.5.17.dfsgnonfree1-1) unstable; urgency=low
* New upstream version.
Modified: tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/control
===================================================================
--- tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/control 2009-05-21 15:06:30 UTC (rev 982)
+++ tuxtype/people/holger/tuxtype-data-nonfree/trunk/debian/control 2009-05-21 15:57:17 UTC (rev 983)
@@ -2,7 +2,7 @@
Section: non-free/games
Priority: optional
Maintainer: Holger Levsen <holger at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
Build-Depends: debhelper (>=5.0.42)
Homepage: http://tux4kids.alioth.debian.org
Vcs-Svn: svn://svn.debian.org/svn/tux4kids/tuxtype/
More information about the Tux4kids-commits
mailing list