diff -Nru eboard-1.1.1/debian/changelog eboard-1.1.1/debian/changelog --- eboard-1.1.1/debian/changelog 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/changelog 2012-01-14 13:54:44.000000000 +0000 @@ -1,3 +1,46 @@ +eboard (1.1.1-5ubuntu1) precise; urgency=low + + * Merge from Debian testing, remaining Ubuntu changes: + - 96_ubuntu_gcc_4.6.dpatch. + + -- Luca Falavigna Sat, 14 Jan 2012 14:54:37 +0100 + +eboard (1.1.1-5) unstable; urgency=low + + * New maintainer (Closes: #648340) + * debian/rules: Rewrite using dh + - debian/clean: Added + * Use 3.0 (quilt) source format, add debian/source/format + * Use quilt instead of dpatch: + - Rename debian/patches/00list to debian/patches/series + - Add DEP-3 headers + * debian/dirs: Only /usr/games/ is needed + * debhelper 8: + - Bump debian/compat + - Update debhelper Build-Depends + * debian/control: + - Add ${misc:Depends} + - Drop Build-Depends on dpatch and g++ (g++ 3.2.2 was released in 2003) + - Use Breaks plus Replaces instead of Conflicts + - Standards-Version 3.9.2 + * debian/copyright: Explicitly refer to the GPL-2 license + * Drop debian/patches/02_add_desktop_entry.dpatch: + - Add debian/eboard.desktop and install it with debian/eboard.install + - Rename icon-eboard.xpm to eboard.xpm and install it to + /usr/share/pixmaps. Clean eboard.xpm after + * Drop debian/patches/90_use_debian_crafty_books.dpatch. crafty's book.bin + is now located in /usr/share/crafty + + -- Vincent Legout Mon, 02 Jan 2012 20:19:13 +0100 + +eboard (1.1.1-4.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/91_fix_ftbfs_554315.dpatch: Closes: #554315. + * Fixed spelling-error-in-description resizeable resizable. + + -- Bart Martens Sun, 02 Oct 2011 14:04:13 +0200 + eboard (1.1.1-4.1ubuntu1) oneiric; urgency=low * Add 96_ubuntu_gcc_4.6.dpatch to change the placement of $LDFLAGS so diff -Nru eboard-1.1.1/debian/clean eboard-1.1.1/debian/clean --- eboard-1.1.1/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ eboard-1.1.1/debian/clean 2012-01-02 16:38:52.000000000 +0000 @@ -0,0 +1,3 @@ +multilang/eboard.fr.dict +multilang/eboard.ja.dict +eboard.xpm diff -Nru eboard-1.1.1/debian/compat eboard-1.1.1/debian/compat --- eboard-1.1.1/debian/compat 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/compat 2011-12-18 16:44:14.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru eboard-1.1.1/debian/control eboard-1.1.1/debian/control --- eboard-1.1.1/debian/control 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/control 2012-01-14 13:52:30.000000000 +0000 @@ -3,21 +3,22 @@ Priority: optional Homepage: http://www.bergo.eng.br/eboard/ Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Patrik Fimml -Build-Depends: debhelper (>= 7.0.0), libgtk2.0-dev, g++ (>= 3:3.2.2-0), dpatch -Standards-Version: 3.8.0.0 +XSBC-Original-Maintainer: Vincent Legout +Build-Depends: debhelper (>= 8.0.0), libgtk2.0-dev +Standards-Version: 3.9.2 Package: eboard Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: sox, xfonts-75dpi -Conflicts: eboard-extras-pack1 (<< 2-1) +Breaks: eboard-extras-pack1 (<< 2-1) +Replaces: eboard-extras-pack1 (<< 2-1) Suggests: gnuchess | crafty, eboard-extras-pack1 Description: GTK+ chessboard program eboard is a graphical chess program which can function as an interface to Internet chess servers such as FICS and to chess engines such as Crafty. . - eboard has a themeable and freely resizeable board, a tabbed or multi-window + eboard has a themeable and freely resizable board, a tabbed or multi-window display, and supports multiple simultaneous boards. . This package contains a chess interface, which means that you can play against diff -Nru eboard-1.1.1/debian/copyright eboard-1.1.1/debian/copyright --- eboard-1.1.1/debian/copyright 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/copyright 2011-12-18 17:17:47.000000000 +0000 @@ -23,4 +23,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in "/usr/share/common-licenses/GPL". +Public License can be found in "/usr/share/common-licenses/GPL-2". diff -Nru eboard-1.1.1/debian/dirs eboard-1.1.1/debian/dirs --- eboard-1.1.1/debian/dirs 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/dirs 2011-12-18 16:56:59.000000000 +0000 @@ -1,4 +1 @@ -usr/games -usr/bin -usr/share/applications -usr/share/pixmaps +/usr/games/ diff -Nru eboard-1.1.1/debian/eboard.desktop eboard-1.1.1/debian/eboard.desktop --- eboard-1.1.1/debian/eboard.desktop 1970-01-01 00:00:00.000000000 +0000 +++ eboard-1.1.1/debian/eboard.desktop 2011-12-18 17:40:22.000000000 +0000 @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=eboard +Comment=A graphical chessboard program +TryExec=/usr/games/eboard +Exec=/usr/games/eboard +Categories=GTK;Game;BoardGame; +Icon=eboard diff -Nru eboard-1.1.1/debian/eboard.install eboard-1.1.1/debian/eboard.install --- eboard-1.1.1/debian/eboard.install 1970-01-01 00:00:00.000000000 +0000 +++ eboard-1.1.1/debian/eboard.install 2012-01-02 16:39:14.000000000 +0000 @@ -0,0 +1,2 @@ +debian/eboard.desktop /usr/share/applications +eboard.xpm /usr/share/pixmaps diff -Nru eboard-1.1.1/debian/patches/00list eboard-1.1.1/debian/patches/00list --- eboard-1.1.1/debian/patches/00list 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -01_cleanup_config_log.dpatch -02_add_desktop_entry.dpatch -03_fix_sound.dpatch -40_french_translation.dpatch -40_hungarian_translation.dpatch -90_respect_deb_build_options.dpatch -90_use_debian_crafty_books.dpatch -95_ubuntu_gcc_4.4.dpatch -96_ubuntu_gcc_4.6.dpatch diff -Nru eboard-1.1.1/debian/patches/01_cleanup_config_log.dpatch eboard-1.1.1/debian/patches/01_cleanup_config_log.dpatch --- eboard-1.1.1/debian/patches/01_cleanup_config_log.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/01_cleanup_config_log.dpatch 2011-12-19 19:33:26.000000000 +0000 @@ -1,13 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_cleanup_config_log.dpatch by Patrik Fimml -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove config.log in make distclean +Description: Clean up config.log +Author: Patrik Fimml -@DPATCH@ - ---- eboard-1.1.1.orig/elifekam 2008-02-22 16:51:22.000000000 +0100 -+++ eboard-1.1.1/elifekam 2008-05-27 19:25:20.000000000 +0200 +Index: eboard/elifekam +=================================================================== +--- eboard.orig/elifekam 2011-12-19 20:31:11.985811337 +0100 ++++ eboard/elifekam 2011-12-19 20:33:22.281814925 +0100 @@ -36,7 +36,7 @@ rm -f $(OBJS) eboard *~ diff -Nru eboard-1.1.1/debian/patches/02_add_desktop_entry.dpatch eboard-1.1.1/debian/patches/02_add_desktop_entry.dpatch --- eboard-1.1.1/debian/patches/02_add_desktop_entry.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/02_add_desktop_entry.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_add_desktop_entry.dpatch by Patrik Fimml -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Add .desktop entry. - -@DPATCH@ -diff -urNad eboard-1.1.1~/eboard.desktop eboard-1.1.1/eboard.desktop ---- eboard-1.1.1~/eboard.desktop 1970-01-01 01:00:00.000000000 +0100 -+++ eboard-1.1.1/eboard.desktop 2009-01-22 21:56:21.000000000 +0100 -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Version=1.0 -+Type=Application -+Name=eboard -+Comment=A graphical chessboard program -+TryExec=/usr/games/eboard -+Exec=/usr/games/eboard -+Categories=GTK;Game;BoardGame; -+Icon=eboard -diff -urNad eboard-1.1.1~/elifekam eboard-1.1.1/elifekam ---- eboard-1.1.1~/elifekam 2009-01-22 21:56:21.000000000 +0100 -+++ eboard-1.1.1/elifekam 2009-01-22 21:56:21.000000000 +0100 -@@ -39,6 +39,10 @@ - rm -f $(OBJS) eboard *~ config.h config.make config.log Makefile $(DIST).tar.gz $(DIST).tar.bz2 eboard.spec eboard-config - - install: install-bin install-man install-data install-nls -+ $(INSTALL) -d $(prefix)/share/applications -+ $(INSTALL) -m 0644 eboard.desktop $(prefix)/share/applications -+ $(INSTALL) -d $(prefix)/share/pixmaps -+ $(INSTALL) -m 0644 icon-eboard.xpm $(prefix)/share/pixmaps/eboard.xpm - - install-bin: eboard - $(INSTALL) -d $(bindir) diff -Nru eboard-1.1.1/debian/patches/03_fix_sound.dpatch eboard-1.1.1/debian/patches/03_fix_sound.dpatch --- eboard-1.1.1/debian/patches/03_fix_sound.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/03_fix_sound.dpatch 2011-12-19 19:34:18.000000000 +0000 @@ -1,13 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_fix_sound.dpatch by Patrik Fimml -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix sound playback using sox. +Description: Fix sound +Author: Patrik Fimml -@DPATCH@ -diff -urNad eboard-1.1.1~/sound.cc eboard-1.1.1/sound.cc ---- eboard-1.1.1~/sound.cc 2008-02-22 16:51:22.000000000 +0100 -+++ eboard-1.1.1/sound.cc 2008-07-06 11:52:46.000000000 +0200 +Index: eboard/sound.cc +=================================================================== +--- eboard.orig/sound.cc 2011-12-19 20:31:11.929811336 +0100 ++++ eboard/sound.cc 2011-12-19 20:34:16.301816412 +0100 @@ -200,8 +200,7 @@ switch(type) { diff -Nru eboard-1.1.1/debian/patches/40_french_translation.dpatch eboard-1.1.1/debian/patches/40_french_translation.dpatch --- eboard-1.1.1/debian/patches/40_french_translation.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/40_french_translation.dpatch 2011-12-19 19:34:50.000000000 +0000 @@ -1,13 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_french_translation.dpatch by Patrik Fimml -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Improve French translation (thanks to Simon Valiquette) +Description: French translation +Author: Patrik Fimml -@DPATCH@ -diff -urNad eboard-1.1.1~/AUTHORS eboard-1.1.1/AUTHORS ---- eboard-1.1.1~/AUTHORS 2009-02-01 12:31:30.000000000 +0100 -+++ eboard-1.1.1/AUTHORS 2009-02-01 12:31:31.000000000 +0100 +Index: eboard/AUTHORS +=================================================================== +--- eboard.orig/AUTHORS 2011-12-19 20:31:11.897811334 +0100 ++++ eboard/AUTHORS 2011-12-19 20:34:48.485817299 +0100 @@ -20,6 +20,7 @@ - Brazilian Portuguese (pt_BR), translation by Felipe Bergo - German (de), translation by Bernhard Bialas @@ -16,9 +13,10 @@ - Italian (it_IT), translation by Massimo Danieli - Czech (cs), translation by Ales Dolecek -diff -urNad eboard-1.1.1~/multilang/README eboard-1.1.1/multilang/README ---- eboard-1.1.1~/multilang/README 2009-02-01 12:31:30.000000000 +0100 -+++ eboard-1.1.1/multilang/README 2009-02-01 12:31:31.000000000 +0100 +Index: eboard/multilang/README +=================================================================== +--- eboard.orig/multilang/README 2011-12-19 20:31:11.889811335 +0100 ++++ eboard/multilang/README 2011-12-19 20:34:48.485817299 +0100 @@ -9,7 +9,7 @@ Translators: @@ -36,9 +34,10 @@ active, maintained hu, Hungarian -diff -urNad eboard-1.1.1~/multilang/eboard.fr.po eboard-1.1.1/multilang/eboard.fr.po ---- eboard-1.1.1~/multilang/eboard.fr.po 2009-02-01 12:31:30.000000000 +0100 -+++ eboard-1.1.1/multilang/eboard.fr.po 2009-02-01 12:31:49.000000000 +0100 +Index: eboard/multilang/eboard.fr.po +=================================================================== +--- eboard.orig/multilang/eboard.fr.po 2011-12-19 20:31:11.881811334 +0100 ++++ eboard/multilang/eboard.fr.po 2011-12-19 20:34:48.489817299 +0100 @@ -1,7 +1,7 @@ # state: translated # (2) pieces.cc:70,157 @@ -850,16 +849,16 @@ -# (2) dlg_prefs.cc:193; proto_fics.cc:1861 +# state: translated +# (1) dlg_prefs.cc:193 - msgid "Seek Graph" --msgstr "" ++msgid "Seek Graph" +msgstr "Offres de parties" - --# state: untranslated ++ +# state: translated +# (1) proto_fics.cc:1861 -+msgid "Seek Graph" + msgid "Seek Graph" +-msgstr "" +msgstr "Graphique des offres de parties" -+ + +-# state: untranslated +# state: translated # (1) dlg_prefs.cc:382 msgid "Seek Graph Font" diff -Nru eboard-1.1.1/debian/patches/40_hungarian_translation.dpatch eboard-1.1.1/debian/patches/40_hungarian_translation.dpatch --- eboard-1.1.1/debian/patches/40_hungarian_translation.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/40_hungarian_translation.dpatch 2011-12-19 19:35:17.000000000 +0000 @@ -1,22 +1,20 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_hungarian_translation.dpatch by Patrik Fimml -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix hungarian translation (thanks to Simon Valiquette) +Description: Hungarian translation +Author: Patrik Fimml -@DPATCH@ -diff -urNad eboard-1.1.1~/multilang/eboard.hu.po eboard-1.1.1/multilang/eboard.hu.po ---- eboard-1.1.1~/multilang/eboard.hu.po 2008-02-22 16:51:22.000000000 +0100 -+++ eboard-1.1.1/multilang/eboard.hu.po 2009-01-31 14:53:54.000000000 +0100 +Index: eboard/multilang/eboard.hu.po +=================================================================== +--- eboard.orig/multilang/eboard.hu.po 2011-12-19 20:31:11.845811333 +0100 ++++ eboard/multilang/eboard.hu.po 2011-12-19 20:35:14.617818018 +0100 @@ -1,4 +1,4 @@ -onzol leka# (2) +# (2) msgid " ** PNG LOAD FAILED: using internal low-res pieceset. It'll look ugly.\n" msgstr " ** PNG betöltés sikertelen: kis felbontású saját figurák használata. Rosszabbul fog kinézni." -diff -urNad eboard-1.1.1~/multilang/eboard.ja.po eboard-1.1.1/multilang/eboard.ja.po ---- eboard-1.1.1~/multilang/eboard.ja.po 2008-02-22 16:51:22.000000000 +0100 -+++ eboard-1.1.1/multilang/eboard.ja.po 2009-01-31 14:53:54.000000000 +0100 +Index: eboard/multilang/eboard.ja.po +=================================================================== +--- eboard.orig/multilang/eboard.ja.po 2011-12-19 20:31:11.837811333 +0100 ++++ eboard/multilang/eboard.ja.po 2011-12-19 20:35:14.617818018 +0100 @@ -900,7 +900,7 @@ # state: translated # (1) dlg_connect.cc:290 @@ -26,9 +24,10 @@ # state: translated # (1) proto_xboard.cc:66 -diff -urNad eboard-1.1.1~/multilang/harvest.in eboard-1.1.1/multilang/harvest.in ---- eboard-1.1.1~/multilang/harvest.in 2008-02-22 16:51:22.000000000 +0100 -+++ eboard-1.1.1/multilang/harvest.in 2009-01-31 14:53:54.000000000 +0100 +Index: eboard/multilang/harvest.in +=================================================================== +--- eboard.orig/multilang/harvest.in 2011-12-19 20:31:11.853811334 +0100 ++++ eboard/multilang/harvest.in 2011-12-19 20:35:14.621818019 +0100 @@ -1,5 +1,5 @@ package=eboard -langs=cs,de,es,it,ja,pl,pt_BR,fr diff -Nru eboard-1.1.1/debian/patches/90_respect_deb_build_options.dpatch eboard-1.1.1/debian/patches/90_respect_deb_build_options.dpatch --- eboard-1.1.1/debian/patches/90_respect_deb_build_options.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/90_respect_deb_build_options.dpatch 2011-12-19 19:35:57.000000000 +0000 @@ -1,13 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 90_respect_deb_build_options.dpatch by Patrik Fimml -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Respect DEB_BUILD_OPTIONS +Description: Respect deb build options +Author: Patrik Fimml -@DPATCH@ - ---- a/configure 2008-05-27 20:04:52.000000000 +0200 -+++ eboard-1.1.1/configure 2008-05-27 20:05:13.000000000 +0200 +Index: eboard/configure +=================================================================== +--- eboard.orig/configure 2011-12-19 20:31:11.801811332 +0100 ++++ eboard/configure 2011-12-19 20:35:54.237819109 +0100 @@ -2,11 +2,15 @@ use IO::Handle; @@ -25,8 +22,10 @@ my @ldflags = ("-lpthread"); my @libs = (); my $configh = "config.h"; ---- a/elifekam 2008-05-27 20:04:52.000000000 +0200 -+++ eboard-1.1.1/elifekam 2008-05-27 20:05:13.000000000 +0200 +Index: eboard/elifekam +=================================================================== +--- eboard.orig/elifekam 2011-12-19 20:33:22.281814925 +0100 ++++ eboard/elifekam 2011-12-19 20:35:54.237819109 +0100 @@ -4,6 +4,10 @@ DIST = eboard-$(version) diff -Nru eboard-1.1.1/debian/patches/90_use_debian_crafty_books.dpatch eboard-1.1.1/debian/patches/90_use_debian_crafty_books.dpatch --- eboard-1.1.1/debian/patches/90_use_debian_crafty_books.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/90_use_debian_crafty_books.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 90_use_debian_crafty_books.dpatch by Patrik Fimml -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use the opening books installed by crafty-books-{small,medtosmall,medium} - -@DPATCH@ -diff -urNad eboard-1.1.1~/proto_xboard.cc eboard-1.1.1/proto_xboard.cc ---- eboard-1.1.1~/proto_xboard.cc 2008-02-22 16:51:22.000000000 +0100 -+++ eboard-1.1.1/proto_xboard.cc 2008-06-07 11:43:49.000000000 +0200 -@@ -1118,6 +1118,7 @@ - ff.addDirectory("/usr/share/eboard"); - ff.addDirectory("/usr/local/share/crafty"); - ff.addDirectory("/usr/share/crafty"); -+ ff.addDirectory("/var/lib/crafty"); - - if (ff.find("book.bin",zz)) { - p=strrchr(zz,'/'); diff -Nru eboard-1.1.1/debian/patches/91_fix_ftbfs_554315.dpatch eboard-1.1.1/debian/patches/91_fix_ftbfs_554315.dpatch --- eboard-1.1.1/debian/patches/91_fix_ftbfs_554315.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ eboard-1.1.1/debian/patches/91_fix_ftbfs_554315.dpatch 2011-12-19 19:38:30.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Fix ftbfs with --no-add-needed +Author: Bart Martens +Bug-Debian: http://bugs.debian.org/554315 + +Index: eboard/configure +=================================================================== +--- eboard.orig/configure 2011-12-19 20:36:09.885819540 +0100 ++++ eboard/configure 2011-12-19 20:38:05.689822729 +0100 +@@ -11,7 +11,7 @@ + my $version = "1.1.1"; + my $cxx = "g++"; + my @cxxflags = ($deb_build_opts{noopt} ? "-O0" : "-O2", "-g"); +-my @ldflags = ("-lpthread"); ++my @ldflags = ("-lpthread","-ldl"); + my @libs = (); + my $configh = "config.h"; + my $configmake = "config.make"; diff -Nru eboard-1.1.1/debian/patches/95_ubuntu_gcc_4.4.dpatch eboard-1.1.1/debian/patches/95_ubuntu_gcc_4.4.dpatch --- eboard-1.1.1/debian/patches/95_ubuntu_gcc_4.4.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/95_ubuntu_gcc_4.4.dpatch 2011-12-19 19:42:04.000000000 +0000 @@ -1,14 +1,13 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 95_ubuntu_gcc_4.4.dpatch by Fabrice Coutadeur -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix a compilation error due to invalid conversion from 'const char*' to -## DP: 'char*'. This is achieved by copying the string before modifying it. +Description: Fix a invalid conversion compilation error + Fix a compilation error due to invalid conversion from 'const char*' to + 'char*'. This is achieved by copying the string before modifying it. +Author: Fabrice Coutadeur +Bug-Debian: http://bugs.debian.org/551718 -@DPATCH@ -diff -urNad eboard-1.1.1~/ntext.cc eboard-1.1.1/ntext.cc ---- eboard-1.1.1~/ntext.cc 2008-02-22 15:51:22.000000000 +0000 -+++ eboard-1.1.1/ntext.cc 2009-10-20 04:35:42.000000000 +0000 +Index: eboard/ntext.cc +=================================================================== +--- eboard.orig/ntext.cc 2011-12-18 17:37:44.166511955 +0100 ++++ eboard/ntext.cc 2011-12-18 17:44:54.378523803 +0100 @@ -33,6 +33,7 @@ #include #include "ntext.h" diff -Nru eboard-1.1.1/debian/patches/96_ubuntu_gcc_4.6.dpatch eboard-1.1.1/debian/patches/96_ubuntu_gcc_4.6.dpatch --- eboard-1.1.1/debian/patches/96_ubuntu_gcc_4.6.dpatch 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/patches/96_ubuntu_gcc_4.6.dpatch 2012-01-14 13:51:40.000000000 +0000 @@ -1,13 +1,10 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 96_ubuntu_gcc_4.6.dpatch by Daniel T Chen -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Correct placement of libs to fix FTBFS with GCC 4.6. +Description: fix FTBFS with gcc-4.6 +Author: Daniel T Chen -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eboard-1.1.1~/elifekam eboard-1.1.1/elifekam ---- eboard-1.1.1~/elifekam 2011-09-16 16:52:06.000000000 -0400 -+++ eboard-1.1.1/elifekam 2011-09-16 16:52:37.000000000 -0400 +Index: eboard/elifekam +=================================================================== +--- eboard.orig/elifekam 2011-12-19 20:31:11.985811337 +0100 ++++ eboard/elifekam 2011-12-19 20:33:22.281814925 +0100 @@ -28,7 +28,7 @@ all: eboard nls-dicts diff -Nru eboard-1.1.1/debian/patches/series eboard-1.1.1/debian/patches/series --- eboard-1.1.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ eboard-1.1.1/debian/patches/series 2012-01-14 13:52:08.000000000 +0000 @@ -0,0 +1,8 @@ +01_cleanup_config_log.dpatch +03_fix_sound.dpatch +40_french_translation.dpatch +40_hungarian_translation.dpatch +90_respect_deb_build_options.dpatch +91_fix_ftbfs_554315.dpatch +95_ubuntu_gcc_4.4.dpatch +96_ubuntu_gcc_4.6.dpatch diff -Nru eboard-1.1.1/debian/rules eboard-1.1.1/debian/rules --- eboard-1.1.1/debian/rules 2012-01-14 14:01:27.000000000 +0000 +++ eboard-1.1.1/debian/rules 2012-01-02 16:39:10.000000000 +0000 @@ -1,69 +1,13 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -include /usr/share/dpatch/dpatch.make - -configure: configure-stamp -configure-stamp: patch-stamp - dh_testdir - ./configure --prefix=/usr --data-prefix=/usr/share/games \ - --man-prefix=/usr/share/man --extra-flags=-fsigned-char - - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - $(MAKE) - - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp multilang/*.dict - - [ ! -f Makefile ] || $(MAKE) distclean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +override_dh_auto_configure: + dh_auto_configure -- --prefix=/usr --data-prefix=/usr/share/games \ + --man-prefix=/usr/share/man +override_dh_auto_install: + cp -f icon-eboard.xpm eboard.xpm dh_auto_install mv debian/eboard/usr/bin/eboard debian/eboard/usr/games/eboard - - dh_lintian - dh_desktop - -binary-indep: build install -# We have nothing to do by default. - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installmenu - - dh_installman - - dh_installchangelogs ChangeLog - dh_link - 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 - diff -Nru eboard-1.1.1/debian/source/format eboard-1.1.1/debian/source/format --- eboard-1.1.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ eboard-1.1.1/debian/source/format 2012-01-14 14:01:28.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)