diff -u frozen-bubble-2.1.0/frozen-bubble frozen-bubble-2.1.0/frozen-bubble --- frozen-bubble-2.1.0/frozen-bubble +++ frozen-bubble-2.1.0/frozen-bubble @@ -3424,7 +3424,7 @@ sub sanitize_nick { my ($nick) = @_; - $nick = substr($nick, 0, 8); + $nick = substr($nick, 0, 10); $nick =~ s/[^a-zA-Z0-9_-]//g; return $nick; } diff -u frozen-bubble-2.1.0/debian/control frozen-bubble-2.1.0/debian/control --- frozen-bubble-2.1.0/debian/control +++ frozen-bubble-2.1.0/debian/control @@ -3,7 +3,7 @@ Priority: extra Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Josselin Mouette -Build-Depends: debhelper (>= 5), libsdl-perl (>= 1.20-8), perl (>= 5.8), libsdl1.2-dev (>= 1.2.4), libsdl-mixer1.2-dev (>> 1.2.2), libsdl-pango-dev, libglib2.0-dev, dpkg-dev (>= 1.13.19) +Build-Depends: debhelper (>= 5), libsdl-perl (>= 1.20-8), perl (>= 5.8), libsdl1.2-dev (>= 1.2.4), libsdl-mixer1.2-dev (>> 1.2.2), libsdl-pango-dev, libglib2.0-dev, dpkg-dev (>= 1.13.19), dpatch Standards-Version: 3.7.2 Package: frozen-bubble diff -u frozen-bubble-2.1.0/debian/rules frozen-bubble-2.1.0/debian/rules --- frozen-bubble-2.1.0/debian/rules +++ frozen-bubble-2.1.0/debian/rules @@ -6,18 +6,20 @@ # architecture-dependant package, as well as an architecture-independent # package. +include /usr/share/dpatch/dpatch.make + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 DEST_DIR=$(CURDIR)/debian/tmp/usr build: build-stamp -build-stamp: +build-stamp: patch-stamp dh_testdir $(MAKE) PREFIX=/usr DATADIR=/usr/share/games LOCALEDIR=/usr/share/locale LIBDIR=/usr/lib/games BINDIR=/usr/games MANDIR=/usr/share/man OPTIMIZE="-O2 -g -Wall" touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp diff -u frozen-bubble-2.1.0/debian/changelog frozen-bubble-2.1.0/debian/changelog --- frozen-bubble-2.1.0/debian/changelog +++ frozen-bubble-2.1.0/debian/changelog @@ -1,3 +1,16 @@ +frozen-bubble (2.1.0-2ubuntu2) hardy; urgency=low + + * debian/rules, debian/control, + debian/patches/00list: + - added dpatch support + * debian/patches/fble_open_dialog.dpatch: + - fixed level editor showing selected level (LP: #181933) + (thanks to David Joham for the patch) + * debian/patches/nick-truncated-to-8-chars.dpatch: + - included previous change + + -- Mario Bonino Fri, 11 Jan 2008 14:40:21 +0100 + frozen-bubble (2.1.0-2ubuntu1) hardy; urgency=low * frozen-bubble: in sanitize_nick, nick is truncated to 8 chars to avoid an only in patch2: unchanged: --- frozen-bubble-2.1.0.orig/debian/patches/00list +++ frozen-bubble-2.1.0/debian/patches/00list @@ -0,0 +1,2 @@ +fble_open_dialog.dpatch +nick-truncated-to-8-chars.dpatch only in patch2: unchanged: --- frozen-bubble-2.1.0.orig/debian/patches/fble_open_dialog.dpatch +++ frozen-bubble-2.1.0/debian/patches/fble_open_dialog.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fble_open_dialog.dpatch by Mario Bonino +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to fix frozen bubble level editor open levelset dialog bug (patch from David Joham). + +@DPATCH@ +diff -urNad frozen-bubble-2.1.0~/c_stuff/lib/FBLE.pm frozen-bubble-2.1.0/c_stuff/lib/FBLE.pm +--- frozen-bubble-2.1.0~/c_stuff/lib/FBLE.pm 2006-10-27 12:14:39.000000000 +0200 ++++ frozen-bubble-2.1.0/c_stuff/lib/FBLE.pm 2008-01-11 14:38:43.000000000 +0100 +@@ -1363,10 +1363,6 @@ + } + } + $list_browser_highlight_offset = $file_highlight_offset; +- if (is_ok_select_start_value($start_level) == 0) { +- $start_level = $file_browser_levelsets_num_levels[$list_browser_highlight_offset]; +- show_selected_level(); +- } + display_levelset_screenshot(); + } else { + $list_browser_highlight_offset = $file_highlight_offset; only in patch2: unchanged: --- frozen-bubble-2.1.0.orig/debian/patches/nick-truncated-to-8-chars.dpatch +++ frozen-bubble-2.1.0/debian/patches/nick-truncated-to-8-chars.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## nick-truncated-to-8-chars.dpatch by Mario Bonino +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: In sanitize_nick, nick is truncated to 8 chars to avoid an error when starting a LAN server. + +@DPATCH@ +diff -urNad frozen-bubble-2.1.0~/frozen-bubble frozen-bubble-2.1.0/frozen-bubble +--- frozen-bubble-2.1.0~/frozen-bubble 2008-01-26 12:10:53.000000000 +0100 ++++ frozen-bubble-2.1.0/frozen-bubble 2008-01-26 12:11:13.000000000 +0100 +@@ -3424,7 +3424,7 @@ + + sub sanitize_nick { + my ($nick) = @_; +- $nick = substr($nick, 0, 10); ++ $nick = substr($nick, 0, 8); + $nick =~ s/[^a-zA-Z0-9_-]//g; + return $nick; + }