Source: exult Version: 1.2-15.3 Severity: normal Tags: patch pending I've prepared an NMU for exult (versioned as 1.2-16.1) and uploaded it to DELAYED/7. Let me know if I should delay it longer.
The NMU bases on the version on the git repository, as it really fixes a lot. That's why the diff is so big... nmu.diff is the diff in respect to the archives, vcs.diff is the diff in respect to the VCS -- System Information: Debian Release: stretch/sid APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'testing'), (500, 'stable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.3.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -u exult-1.2/debian/changelog exult-1.2/debian/changelog --- exult-1.2/debian/changelog +++ exult-1.2/debian/changelog @@ -1,3 +1,28 @@ +exult (1.2-16.1) unstable; urgency=medium + + * Non-maintainer upload. + * NMU based on git repository + * Add patch to fix FTBFS for libpng1.6 (Closes: #809894) + + -- Tobias Frost <[email protected]> Sun, 24 Jan 2016 17:35:39 +0100 + +exult (1.2-16) UNRELEASED; urgency=medium + + * Standards-Version bumped to 3.9.5. + * Shorten debian/rules file: + + Compat level bumped to 9. + + Depend on debhelper (>= 9). + * Use canonical Vcs-* fields. + * debian/patches/06_build-with-libpng1.5.patch: Add short description, + author, and email. + * Acknowledge 1.2-15.2 NMU. (Closes: #664226) + * debian/po: + + Add Japanese translation (victory). (Closes: #690691) + + Add Turkish translation (Mert Dirik). (Closes: #757874) + * debian/source/format: Define source format as 1.0. + + -- Jord?? Polo <[email protected]> Tue, 18 Mar 2014 19:44:57 +0100 + exult (1.2-15.3) unstable; urgency=medium * Non-maintainer upload. @@ -24,7 +49,7 @@ Closes: #653779 * Fix pending l10n issues. Debconf translations: - Danish (Joe Hansen). Closes: #595628 - - Dutch; (Jeroen Schot). Closes: #654391 + - Dutch (Jeroen Schot). Closes: #654391 - Polish (Micha?? Ku??ach). Closes: #657628 - Italian (Francesca Ciceri). Closes: #658502 @@ -218,7 +243,7 @@ Fixes build failure on gcc4. (Closes: #295052) * debian/control (Build-Depends): Modify libsdl1.2-dev build dependency to the aalib and smpeg transitioned version. (Closes: #320873, - Closes: #322140) Switch from libpng2-dev to libpng12-dev. + Closes: #322140) Switch from libpng2-dev to libpng12-dev. (Closes: #328348) * debian/po/cs.po: New file, by Martin Sin. (Closes: #319580). * debian/exult.files: Updated. @@ -251,7 +276,7 @@ * debian/rules (configure): Use /usr/games as exec_prefix. * debian/rules/exult.menu (command): Changed to /usr/games/exult. * debian/rules/exult.dirs: New file, for /usr/games. - * debian/rules (install): Added call to dh_installdirs. + * debian/rules (install): Added call to dh_installdirs. -- Michael Banck <[email protected]> Wed, 13 Oct 2004 16:04:22 +0200 diff -u exult-1.2/debian/compat exult-1.2/debian/compat --- exult-1.2/debian/compat +++ exult-1.2/debian/compat @@ -1 +1 @@ -5 +9 diff -u exult-1.2/debian/control exult-1.2/debian/control --- exult-1.2/debian/control +++ exult-1.2/debian/control @@ -3,14 +3,14 @@ Priority: extra Maintainer: Jord?? Polo <[email protected]> Uploaders: Michael Banck <[email protected]> -Build-Depends: debhelper (>= 5), quilt (>= 0.40), flex, bison, +Build-Depends: debhelper (>= 9), quilt (>= 0.40), flex, bison, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.1), libsdl-mixer1.2-dev, libx11-dev, libgimp2.0-dev (>= 2.2.8-11), libglade2-dev, zlib1g-dev, libpng-dev, autoconf (>= 2.58), automake1.11, libtool, libfreetype6-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.5 Homepage: http://exult.sourceforge.net/ -Vcs-Git: git://git.debian.org/git/users/jorda-guest/pkg/exult.git -Vcs-Browser: http://git.debian.org/?p=users/jorda-guest/pkg/exult.git +Vcs-Git: git://anonscm.debian.org/users/jorda-guest/pkg/exult.git +Vcs-Browser: https://anonscm.debian.org/cgit/users/jorda-guest/pkg/exult.git Package: exult Architecture: any diff -u exult-1.2/debian/exult.install exult-1.2/debian/exult.install --- exult-1.2/debian/exult.install +++ exult-1.2/debian/exult.install @@ -1,5 +1,4 @@ usr/games/exult usr/lib/games/exult -../../debian/exult.wrapper usr/games usr/share/applications/exult.desktop usr/share/games/exult/*.flx usr/share/games/exult/exultmsg.txt reverted: --- exult-1.2/debian/patches/06_build-with-libpng1.5 +++ exult-1.2.orig/debian/patches/06_build-with-libpng1.5 @@ -1,64 +0,0 @@ -Index: exult-1.2/shapes/pngio.cc -=================================================================== ---- exult-1.2.orig/shapes/pngio.cc -+++ exult-1.2/shapes/pngio.cc -@@ -79,7 +79,11 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((png)))) // Handle errors. -+#else - if (setjmp(png->jmpbuf)) // Handle errors. -+#endif - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -89,7 +93,11 @@ - // Indicate we already read something. - png_set_sig_bytes(png, sizeof(sigbuf)); - png_read_info(png, info); // Read in image info. -+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_uint_32 w, h; -+#else - unsigned long w, h; -+#endif - int depth, color, interlace; - png_get_IHDR(png, info, &w, &h, &depth, &color, - &interlace, 0, 0); -@@ -208,7 +216,11 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((png)))) // Handle errors. -+#else - if (setjmp(png->jmpbuf)) // Handle errors. -+#endif - { - png_destroy_write_struct(&png, &info); - fclose(fp); -@@ -306,7 +318,11 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ if (setjmp(png_jmpbuf((png)))) // Handle errors. -+#else - if (setjmp(png->jmpbuf)) // Handle errors. -+#endif - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -316,7 +332,11 @@ - // Indicate we already read something. - png_set_sig_bytes(png, sizeof(sigbuf)); - png_read_info(png, info); // Read in image info. -+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_uint_32 w, h; -+#else - unsigned long w, h; -+#endif - int depth, color, interlace; - png_get_IHDR(png, info, &w, &h, &depth, &color, - &interlace, 0, 0); diff -u exult-1.2/debian/patches/series exult-1.2/debian/patches/series --- exult-1.2/debian/patches/series +++ exult-1.2/debian/patches/series @@ -1,6 +1,7 @@ +07_libpng16.patch 01_gimp_plugin_dir.patch 02_desktop_dir.patch 03_gcc4_build_fix.patch 04_disable_timidity_check.patch 05_midi_file_path.patch -06_build-with-libpng1.5 +06_build-with-libpng1.5.patch diff -u exult-1.2/debian/po/ca.po exult-1.2/debian/po/ca.po --- exult-1.2/debian/po/ca.po +++ exult-1.2/debian/po/ca.po @@ -13,7 +13,6 @@ "PO-Revision-Date: 2007-04-21 17:27+0200\n" "Last-Translator: Jord?? Polo <[email protected]>\n" "Language-Team: Catal?? <[email protected]>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u exult-1.2/debian/po/cs.po exult-1.2/debian/po/cs.po --- exult-1.2/debian/po/cs.po +++ exult-1.2/debian/po/cs.po @@ -19,7 +19,6 @@ "PO-Revision-Date: 2006-08-06 13:46+0200\n" "Last-Translator: Martin Sin <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -79,8 +78,8 @@ #. Description #: ../templates:3001 msgid "" -"Please enter the path to the top directory of the game, or leave it blank if " -"you don't have it." +"Please enter the path to the top directory of the game, or leave it blank " +"if you don't have it." msgstr "" "Zadejte pros??m cestu do hlavn??ho adres????e hry, nebo ji nechte pr??zdnou, " "pokud ji nem??te." diff -u exult-1.2/debian/po/de.po exult-1.2/debian/po/de.po --- exult-1.2/debian/po/de.po +++ exult-1.2/debian/po/de.po @@ -19,7 +19,6 @@ "PO-Revision-Date: 2004-08-07 14:10+0200\n" "Last-Translator: Helge Kreutzmann <[email protected]>\n" "Language-Team: German <[email protected]>\n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -61,8 +60,9 @@ "Exult needs to know where your copy of Ultima VII: Serpent Isle is located. " "You need to give the path where the game's top directory can be found." msgstr "" -"Exult muss wissen, wo sich Ihre Kopie von Ultima VII: Serpent Isle befindet. " -"Sie m?ssen den Pfad zu dem obersten Verzeichnis des Spiels eingeben." +"Exult muss wissen, wo sich Ihre Kopie von Ultima VII: Serpent Isle " +"befindet. Sie m?ssen den Pfad zu dem obersten Verzeichnis des Spiels " +"eingeben." #. Type: string #. Description @@ -80,8 +80,8 @@ #. Description #: ../templates:3001 msgid "" -"Please enter the path to the top directory of the game, or leave it blank if " -"you don't have it." +"Please enter the path to the top directory of the game, or leave it blank " +"if you don't have it." msgstr "" "Bitte geben Sie den Pfad zum obersten Verzeichnis des Spieles an, oder " "lassen Sie es leer, falls Sie es nicht haben." @@ -101,8 +101,8 @@ "exist.)" msgstr "" "Der eingegebene Pfad sieht nicht nach einem obersten Verzeichnis von Ultima " -"VII aus (insbesondere wurde ein Unterverzeichnis mit Name ?static? erwartet, " -"das aber nicht existiert)." +"VII aus (insbesondere wurde ein Unterverzeichnis mit Name ?static? " +"erwartet, das aber nicht existiert)." #~ msgid "This does not look like a top directory of one of the Ultimas." #~ msgstr "" diff -u exult-1.2/debian/po/es.po exult-1.2/debian/po/es.po --- exult-1.2/debian/po/es.po +++ exult-1.2/debian/po/es.po @@ -33,7 +33,6 @@ "PO-Revision-Date: 2007-03-19 19:00+0100\n" "Last-Translator: Enrique Matias Sanchez (aka Quique) <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u exult-1.2/debian/po/fr.po exult-1.2/debian/po/fr.po --- exult-1.2/debian/po/fr.po +++ exult-1.2/debian/po/fr.po @@ -19,7 +19,6 @@ "PO-Revision-Date: 2006-08-15 14:26+0200\n" "Last-Translator: Thomas Huriaux <[email protected]>\n" "Language-Team: French <[email protected]>\n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -81,8 +80,8 @@ #. Description #: ../templates:3001 msgid "" -"Please enter the path to the top directory of the game, or leave it blank if " -"you don't have it." +"Please enter the path to the top directory of the game, or leave it blank " +"if you don't have it." msgstr "" "Veuillez indiquer le chemin d'acc?s au r?pertoire racine du jeu, ou laissez " "le champ vide si vous ne poss?dez pas le jeu." diff -u exult-1.2/debian/po/gl.po exult-1.2/debian/po/gl.po --- exult-1.2/debian/po/gl.po +++ exult-1.2/debian/po/gl.po @@ -12,7 +12,6 @@ "PO-Revision-Date: 2009-01-17 14:39+0100\n" "Last-Translator: Marce Villarino <[email protected]>\n" "Language-Team: galician <[email protected]>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u exult-1.2/debian/po/pt.po exult-1.2/debian/po/pt.po --- exult-1.2/debian/po/pt.po +++ exult-1.2/debian/po/pt.po @@ -11,7 +11,6 @@ "PO-Revision-Date: 2007-03-22 10:04+0000\n" "Last-Translator: Lu??sa Louren??o <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -30,9 +29,9 @@ "located. You need to give the path where the game's top directory can be " "found." msgstr "" -"O exult precisa de saber onde se encontra localizada a sua c??pia do Ultima " -"VII: The Black Gate. Precisa de indicar o caminho para o topo da directoria " -"onde se encontra o jogo." +"O exult precisa de saber onde se encontra localizada a sua c??pia do Ultima VII: " +"The Black Gate. Precisa de indicar o caminho para o topo da directoria onde se " +"encontra o jogo." #. Type: string #. Description @@ -53,9 +52,10 @@ "Exult needs to know where your copy of Ultima VII: Serpent Isle is located. " "You need to give the path where the game's top directory can be found." msgstr "" -"O exult precisa de saber onde se encontra localizada a sua c??pia do Ultima " -"VII: Serpent Isle. Precisa de indicar o caminho para o topo da directoria " -"onde se encontra o jogo." +"O exult precisa de saber onde se encontra localizada a sua c??pia do Ultima VII: " +"Serpent Isle. Precisa de indicar o caminho para o topo da directoria onde se " +"encontra o jogo." + #. Type: string #. Description @@ -76,8 +76,8 @@ "Please enter the path to the top directory of the game, or leave it blank if " "you don't have it." msgstr "" -"Por favor indique o caminho para o topo da directoria do jogo, ou deixe em " -"branco caso n??o o tenha." +"Por favor indique o caminho para o topo da directoria do jogo, ou deixe em branco " +"caso n??o o tenha." #. Type: note #. Description @@ -97,2 +97,2 @@ -"(Especificamente, uma subdirectoria chamada \"static\" era esperada mas n??o " -"existe.)" +"(Especificamente, uma subdirectoria chamada \"static\" era esperada mas " +"n??o existe.)" diff -u exult-1.2/debian/po/ru.po exult-1.2/debian/po/ru.po --- exult-1.2/debian/po/ru.po +++ exult-1.2/debian/po/ru.po @@ -21,13 +21,11 @@ "PO-Revision-Date: 2007-03-09 11:47+0900\n" "Last-Translator: Yuriy Talakan' <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=KOI8-R\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: string #. Description @@ -43,8 +41,8 @@ "located. You need to give the path where the game's top directory can be " "found." msgstr "" -"Exult ????? ?????, ??? ????????? ???? ????? Ultima VII: Black Gate. ??? " -"????? ?????? ????, ??? ????????? ??????? ???????? ?????? ????." +"Exult ????? ?????, ??? ????????? ???? ????? Ultima VII: Black Gate. ??? ????? " +"?????? ????, ??? ????????? ??????? ???????? ?????? ????." #. Type: string #. Description @@ -65,8 +63,8 @@ "Exult needs to know where your copy of Ultima VII: Serpent Isle is located. " "You need to give the path where the game's top directory can be found." msgstr "" -"Exult ????? ?????, ??? ????????? ???? ????? Ultima VII: Serpent Isle. ??? " -"????? ?????? ????, ??? ????????? ??????? ???????? ?????? ????." +"Exult ????? ?????, ??? ????????? ???? ????? Ultima VII: Serpent Isle. ??? ????? " +"?????? ????, ??? ????????? ??????? ???????? ?????? ????." #. Type: string #. Description @@ -86,8 +84,7 @@ msgid "" "Please enter the path to the top directory of the game, or leave it blank if " "you don't have it." -msgstr "" -"??????? ???? ? ???????? ???????? ???? ??? ???????? ???? ??????, ???? ??? ???." +msgstr "??????? ???? ? ???????? ???????? ???? ??? ???????? ???? ??????, ???? ??? ???." #. Type: note #. Description @@ -106,2 +103,3 @@ -"????????? ???? ?? ????? ?? ??????? ??????? Ultima VII. (? ???? ??????, ?? " -"???????? ?????????? ?? ????? \"static\", ?? ?? ?? ??????????.)" +"????????? ???? ?? ????? ?? ??????? ??????? Ultima VII. " +"(? ???? ??????, ?? ???????? ?????????? ?? ????? \"static\", ?? ?? ?? ??????????.)" + diff -u exult-1.2/debian/po/sv.po exult-1.2/debian/po/sv.po --- exult-1.2/debian/po/sv.po +++ exult-1.2/debian/po/sv.po @@ -18,7 +18,6 @@ "PO-Revision-Date: 2006-08-06 20:43+0100\n" "Last-Translator: Daniel Nylander <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -38,7 +37,8 @@ "found." msgstr "" "Exult beh?ver veta var din kopia av Ultima VII: The Black Gate finns " -"n?gonstans. Du beh?ver ange s?kv?gen till var spelets toppkatalog kan hittas." +"n?gonstans. Du beh?ver ange s?kv?gen till var spelets toppkatalog kan " +"hittas." #. Type: string #. Description @@ -60,7 +60,8 @@ "You need to give the path where the game's top directory can be found." msgstr "" "Exult beh?ver veta var din kopia av Ultima VII: Serpent Isle finns " -"n?gonstans. Du beh?ver ange s?kv?gen till var spelets toppkatalog kan hittas." +"n?gonstans. Du beh?ver ange s?kv?gen till var spelets toppkatalog kan " +"hittas." #. Type: string #. Description @@ -78,8 +79,8 @@ #. Description #: ../templates:3001 msgid "" -"Please enter the path to the top directory of the game, or leave it blank if " -"you don't have it." +"Please enter the path to the top directory of the game, or leave it blank " +"if you don't have it." msgstr "" "Ange s?kv?gen till toppkatalogen f?r spelet eller l?mna f?ltet blankt om du " "inte har det." diff -u exult-1.2/debian/po/zh_TW.po exult-1.2/debian/po/zh_TW.po --- exult-1.2/debian/po/zh_TW.po +++ exult-1.2/debian/po/zh_TW.po @@ -19,7 +19,6 @@ "PO-Revision-Date: 2005-02-01 19:59+0800\n" "Last-Translator: Asho Yeh <[email protected]>\n" "Language-Team: Chinese (traditional) <[email protected]>\n" -"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u exult-1.2/debian/rules exult-1.2/debian/rules --- exult-1.2/debian/rules +++ exult-1.2/debian/rules @@ -1,62 +1,23 @@ #!/usr/bin/make -f -# Based on the sample rules file written by Joey Hess. -# Modified for Exult by Michael `Wumpus' Zinn <[email protected]>. -# Modified for Debian by Carlos Laviola <[email protected]>. - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make - -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - confflags := --build $(DEB_HOST_GNU_TYPE) -else - confflags := --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - debug := --enable-debug --disable-sdl-parachute -endif +export DEB_CXXFLAGS_MAINT_APPEND = -fpermissive +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 - CXXFLAGS += -O0 -else - CFLAGS += -O2 - CXXFLAGS += -O2 -endif +%: + dh $@ --with=quilt -CXXFLAGS += -fpermissive - -configure: patch configure-stamp -configure-stamp: - dh_testdir +override_dh_auto_configure: ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 autoreconf -f -i -s - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LIBS="-lX11" ./configure \ - $(confflags) $(debug) \ + dh_auto_configure -- LIBS="-lX11" \ --prefix=/usr \ --bindir=\$${prefix}/games \ --mandir=\$${prefix}/share/man \ --datadir=\$${prefix}/share/games \ --enable-exult-studio \ --enable-gimp-plugin - touch configure-stamp - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: configure - dh_testdir - $(MAKE) LDFLAGS="-Wl,--as-needed" - touch build-stamp -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp +override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) maintainer-clean rm -f data/*flx.h rm -f configure config.log config.guess config.sub config.cache libtool \ @@ -67,37 +28,8 @@ - dh_clean rm -f depcomp rm -f INSTALL -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - # install the package into debian/tmp; dh_install then puts the files - # into debian/exult or debian/exult-studio as required +override_dh_auto_install: $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp dh_install --fail-missing --sourcedir=$(CURDIR)/debian/tmp - # handle the exult wrapper - mv $(CURDIR)/debian/exult/usr/games/exult.wrapper \ + cp $(CURDIR)/debian/exult.wrapper \ $(CURDIR)/debian/exult/usr/games/exult - -binary-indep: -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installmenu - dh_installman - dh_installchangelogs ChangeLog - dh_installdebconf - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure only in patch2: unchanged: --- exult-1.2.orig/debian/patches/06_build-with-libpng1.5.patch +++ exult-1.2/debian/patches/06_build-with-libpng1.5.patch @@ -0,0 +1,68 @@ +# +# build-with-libpng1.5 patch by Nobuhiro Iwamatsu <[email protected]> +# +# Allow building with libpng 1.5. +# + +--- exult-1.2.orig/shapes/pngio.cc ++++ exult-1.2/shapes/pngio.cc +@@ -79,7 +79,11 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png)))) // Handle errors. ++#else + if (setjmp(png->jmpbuf)) // Handle errors. ++#endif + { + png_destroy_read_struct(&png, &info, 0); + fclose(fp); +@@ -89,7 +93,11 @@ + // Indicate we already read something. + png_set_sig_bytes(png, sizeof(sigbuf)); + png_read_info(png, info); // Read in image info. ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_uint_32 w, h; ++#else + unsigned long w, h; ++#endif + int depth, color, interlace; + png_get_IHDR(png, info, &w, &h, &depth, &color, + &interlace, 0, 0); +@@ -208,7 +216,11 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png)))) // Handle errors. ++#else + if (setjmp(png->jmpbuf)) // Handle errors. ++#endif + { + png_destroy_write_struct(&png, &info); + fclose(fp); +@@ -306,7 +318,11 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png)))) // Handle errors. ++#else + if (setjmp(png->jmpbuf)) // Handle errors. ++#endif + { + png_destroy_read_struct(&png, &info, 0); + fclose(fp); +@@ -316,7 +332,11 @@ + // Indicate we already read something. + png_set_sig_bytes(png, sizeof(sigbuf)); + png_read_info(png, info); // Read in image info. ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_uint_32 w, h; ++#else + unsigned long w, h; ++#endif + int depth, color, interlace; + png_get_IHDR(png, info, &w, &h, &depth, &color, + &interlace, 0, 0); only in patch2: unchanged: --- exult-1.2.orig/debian/patches/07_libpng16.patch +++ exult-1.2/debian/patches/07_libpng16.patch @@ -0,0 +1,11 @@ +--- a/shapes/pngio.cc ++++ b/shapes/pngio.cc +@@ -31,7 +31,7 @@ + + #include <png.h> + #include <setjmp.h> +- ++#include <string.h> + + /* + * Read in an 8-bit .png file. Each pixel returned is one byte, only in patch2: unchanged: --- exult-1.2.orig/debian/po/ja.po +++ exult-1.2/debian/po/ja.po @@ -0,0 +1,95 @@ +# Japanese translation of exult debconf templates. +# Copyright (C) 2012 +# This file is distributed under the same license as the exult package. +# victory <[email protected]>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: exult\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-06-17 01:59+0000\n" +"PO-Revision-Date: 2014-03-18 19:44+0100\n" +"Last-Translator: victory <[email protected]>\n" +"Language-Team: Japanese <[email protected]>\n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Path to \"The Black Gate\":" +msgstr "\"The Black Gate\" ????????????:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Exult needs to know where your copy of Ultima VII: The Black Gate is " +"located. You need to give the path where the game's top directory can be " +"found." +msgstr "" +"Exult ??? Ultima VII: The Black Gate ?????????????????????????????????????????????????????????" +"????????????????????????????????????????????????????????????????????????????????????" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "If you don't have BG, just leave the field blank." +msgstr "BG ????????????????????????????????????????????????????????????" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Path to \"Serpent Isle\":" +msgstr "\"Serpent Isle\" ????????????:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Exult needs to know where your copy of Ultima VII: Serpent Isle is located. " +"You need to give the path where the game's top directory can be found." +msgstr "" +"Exult ??? Ultima VII: Serpent Isle ?????????????????????????????????????????????????????????" +"????????????????????????????????????????????????????????????????????????????????????" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "If you don't have SI, just leave the field blank." +msgstr "SI ????????????????????????????????????????????????????????????" + +#. Type: note +#. Description +#: ../templates:3001 +msgid "The entered path is not a directory" +msgstr "???????????????????????????????????????????????????????????????" + +#. Type: note +#. Description +#: ../templates:3001 +msgid "" +"Please enter the path to the top directory of the game, or leave it blank if " +"you don't have it." +msgstr "" +"?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????" +"?????????????????????" + +#. Type: note +#. Description +#: ../templates:4001 +msgid "Invalid Ultima top directory" +msgstr "Ultima ?????????????????????????????????????????????" + +#. Type: note +#. Description +#: ../templates:4001 +msgid "" +"The entered path does not look like a Ultima VII top directory. " +"(Specifically, a subdirectory named \"static\" was expected but did not " +"exist.)" +msgstr "" +"???????????????????????? Ultima VII ?????????????????????????????????????????????????????????(???????????????" +"?????????\"static\" ????????????????????????????????????????????????????????????????????????????????????)" only in patch2: unchanged: --- exult-1.2.orig/debian/po/tr.po +++ exult-1.2/debian/po/tr.po @@ -0,0 +1,97 @@ +# Turkish translation of exult package +# Copyright (C) 2014 Mert Dirik +# This file is distributed under the same license as the exult package. +# Mert Dirik <[email protected]>, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: exult 1.2-15.3\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2006-08-03 21:47+0200\n" +"PO-Revision-Date: 2014-08-09 00:35+0200\n" +"Last-Translator: Mert Dirik <[email protected]>\n" +"Language-Team: Debian L10n Turkish <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" +"X-Generator: Poedit 1.5.4\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Path to \"The Black Gate\":" +msgstr "\"The Black Gate\" konumu:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Exult needs to know where your copy of Ultima VII: The Black Gate is " +"located. You need to give the path where the game's top directory can be " +"found." +msgstr "" +"Exult'??n \"Ultima VII: The Black Gate\" kopyas??n??n hangi konumda kurulu " +"oldu??unu bilmesi gerekiyor. Oyunun kurulu oldu??u ??st dizini buraya yazman??z " +"gerekmektedir." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "If you don't have BG, just leave the field blank." +msgstr "E??er bu oyuna sahip de??ilseniz bu alan?? bo?? b??rak??n." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Path to \"Serpent Isle\":" +msgstr "\"Serpent Isle\" konumu:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"Exult needs to know where your copy of Ultima VII: Serpent Isle is located. " +"You need to give the path where the game's top directory can be found." +msgstr "" +"Exult'??n \"Ultima VII: Serpent Isle\" kopyas??n??n hangi konumda kurulu " +"oldu??unu bilmesi gerekiyor. Oyunun kurulu oldu??u ??st dizini buraya yazman??z " +"gerekmektedir." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "If you don't have SI, just leave the field blank." +msgstr "E??er bu oyuna sahip de??ilseniz bu alan?? bo?? b??rak??n." + +#. Type: note +#. Description +#: ../templates:3001 +msgid "The entered path is not a directory" +msgstr "Girilen yol bir dizin de??il" + +#. Type: note +#. Description +#: ../templates:3001 +msgid "" +"Please enter the path to the top directory of the game, or leave it blank if " +"you don't have it." +msgstr "" +"L??tfen oyunun ??st dizininin bulundu??u konumu girin, e??er yoksa bo?? b??rak??n." + +#. Type: note +#. Description +#: ../templates:4001 +msgid "Invalid Ultima top directory" +msgstr "Ge??ersiz Ultima ??st dizini" + +#. Type: note +#. Description +#: ../templates:4001 +msgid "" +"The entered path does not look like a Ultima VII top directory. " +"(Specifically, a subdirectory named \"static\" was expected but did not " +"exist.)" +msgstr "" +"Girilen yol bir Ultima VII ??st dizini gibi durmuyor. (Belirtilen ??st dizinin " +"i??inde bir \"static\" alt dizini olmas?? bekleniyordu fakat bulunamad??.)" only in patch2: unchanged: --- exult-1.2.orig/debian/source/format +++ exult-1.2/debian/source/format @@ -0,0 +1 @@ +1.0
diff -Naur exult/debian/changelog exult-1.2/debian/changelog --- exult/debian/changelog 2016-01-24 17:18:25.476536177 +0100 +++ exult-1.2/debian/changelog 2016-01-24 17:36:01.886361955 +0100 @@ -1,3 +1,11 @@ +exult (1.2-16.1) unstable; urgency=medium + + * Non-maintainer upload. + * NMU based on git repository + * Add patch to fix FTBFS for libpng1.6 (Closes: #809894) + + -- Tobias Frost <[email protected]> Sun, 24 Jan 2016 17:35:39 +0100 + exult (1.2-16) UNRELEASED; urgency=medium * Standards-Version bumped to 3.9.5. diff -Naur exult/debian/patches/07_libpng16.patch exult-1.2/debian/patches/07_libpng16.patch --- exult/debian/patches/07_libpng16.patch 1970-01-01 01:00:00.000000000 +0100 +++ exult-1.2/debian/patches/07_libpng16.patch 2016-01-24 17:26:18.542930588 +0100 @@ -0,0 +1,11 @@ +--- a/shapes/pngio.cc ++++ b/shapes/pngio.cc +@@ -31,7 +31,7 @@ + + #include <png.h> + #include <setjmp.h> +- ++#include <string.h> + + /* + * Read in an 8-bit .png file. Each pixel returned is one byte, diff -Naur exult/debian/patches/series exult-1.2/debian/patches/series --- exult/debian/patches/series 2016-01-24 17:18:25.476536177 +0100 +++ exult-1.2/debian/patches/series 2016-01-24 17:24:09.402306145 +0100 @@ -1,3 +1,4 @@ +07_libpng16.patch 01_gimp_plugin_dir.patch 02_desktop_dir.patch 03_gcc4_build_fix.patch
