diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/bzr-builder.manifest desmume-0.9.11+r1~4~ubuntu14.04.1/debian/bzr-builder.manifest --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/bzr-builder.manifest 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/bzr-builder.manifest 2015-07-26 03:58:41.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}+r1~3 +# bzr-builder format 0.3 deb-version {debupstream}+r1~4 lp:~random-stuff/desmume/desmume revid:sergio_br2@yahoo.com.br-20150504013737-du29ai823wfa4p9l -nest packaging lp:~random-stuff/desmume/desmume-debian debian revid:sergio_br2@yahoo.com.br-20150504045957-iu1p8p1sz2wkrfuo +nest packaging lp:~random-stuff/desmume/desmume-debian debian revid:sergio_br2@yahoo.com.br-20150726035218-xqyklalgs4ae619g diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/changelog desmume-0.9.11+r1~4~ubuntu14.04.1/debian/changelog --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/changelog 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/changelog 2015-07-26 03:58:41.000000000 +0000 @@ -1,8 +1,8 @@ -desmume (0.9.11+r1~3~ubuntu14.04.1) trusty; urgency=low +desmume (0.9.11+r1~4~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Launchpad Package Builder Mon, 04 May 2015 05:02:35 +0000 + -- Launchpad Package Builder Sun, 26 Jul 2015 03:58:41 +0000 desmume (0.9.11-1) UNRELEASED; urgency=medium diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/clean desmume-0.9.11+r1~4~ubuntu14.04.1/debian/clean --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/clean 2015-07-26 03:58:41.000000000 +0000 @@ -0,0 +1,3 @@ +config.log +config.status +Makefile diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/control desmume-0.9.11+r1~4~ubuntu14.04.1/debian/control --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/control 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/control 2015-07-26 03:58:41.000000000 +0000 @@ -2,11 +2,22 @@ Section: games Priority: extra Maintainer: Debian Games Team -Uploaders: Pascal Giard , - Evgeni Golov -Build-Depends: debhelper (>= 9), desktop-file-utils, gettext, intltool, libgtk2.0-dev, - libglu1-mesa-dev, libsdl1.2-dev, libagg-dev, libgtkglext1-dev, libtinyxml-dev, - libopenal-dev, libsoundtouch-dev, libasound2-dev, quilt, zlib1g-dev +Uploaders: Pascal Giard , Evgeni Golov +Build-Depends: debhelper (>= 9), + desktop-file-utils, + gettext, + intltool, + libagg-dev, + libasound2-dev, + libglu1-mesa-dev, + libgtk2.0-dev, + libgtkglext1-dev, + libopenal-dev, + libsdl1.2-dev, + libsoundtouch-dev, + libtinyxml-dev, + quilt, + zlib1g-dev Standards-Version: 3.9.5 Homepage: http://desmume.org/ Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/desmume/ @@ -14,10 +25,19 @@ Package: desmume Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Nintendo DS emulator DeSmuME is a Nintendo DS emulator running homebrew demos and commercial games. . This package includes two binaries: * desmume: gtk user interface; * desmume-cli: command line user interface. + +Package: desmume-dbg +Section: debug +Architecture: any +Depends: desmume (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: Nintendo DS emulator debug files + DeSmuME is a Nintendo DS emulator running homebrew demos and commercial games. + . + This package contains the debug symbols for DeSmuME. diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/copyright desmume-0.9.11+r1~4~ubuntu14.04.1/debian/copyright --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/copyright 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/copyright 2015-07-26 03:58:41.000000000 +0000 @@ -20,7 +20,7 @@ 2006-2011 adelikat License: GPL-2+ -Files: src/common.cpp src/GPU_osd.cpp src/windows/inputdx.cpp +Files: src/common.cpp src/GPU_osd.cpp src/windows/inputdx.cpp src/rtc.cpp src/cflash.cpp src/MMU.cpp Copyright: 2006-2011 Guillaume Duhamel 2006-2011 Normmatt @@ -48,24 +48,24 @@ License: GPL-2+ Files: src/gtk-glade/keyval_names.cpp src/gtk-glade/gdk_gl.cpp - src/gtk-glade/dTools/callbacks_2_memview.cpp - src/gtk-glade/dTools/callbacks_4_tileview.cpp + src/gtk-glade/dTools/callbacks_2_memview.cpp + src/gtk-glade/dTools/callbacks_4_tileview.cpp src/gtk-glade/dTools/callbacks_3_palview.cpp Copyright: 2007 Damien Nozay (damdoum) License: GPL-2+ -Files: src/gtk-glade/main.cpp src/gtk-glade/callbacks.cpp - src/gtk-glade/callbacks_IO.cpp +Files: src/gtk-glade/main.cpp src/gtk-glade/callbacks.cpp + src/gtk-glade/callbacks_IO.cpp src/gtk-glade/dTools/callbacks_1_ioregs.cpp Copyright: 2007 Damien Nozay (damdoum) 2007 Pascal Giard (evilynux) License: GPL-2+ -Files: src/bios.cpp src/thumb_instructions.cpp src/NDSSystem.cpp +Files: src/bios.cpp src/thumb_instructions.cpp src/NDSSystem.cpp src/cp15.cpp src/armcpu.cpp src/Disassembler.cpp - src/windows/palView.cpp src/windows/disView.cpp - src/windows/memView.cpp src/windows/mapView.cpp - src/windows/IORegView.cpp src/windows/oamView.cpp + src/windows/palView.cpp src/windows/disView.cpp + src/windows/memView.cpp src/windows/mapView.cpp + src/windows/IORegView.cpp src/windows/oamView.cpp src/windows/tileView.cpp src/windows/ginfo.cpp src/windows/CWindow.cpp Copyright: 2006 yopyop License: GPL-2+ @@ -98,7 +98,7 @@ 2006 yopyop License: GPL-2+ -Files: src/windows/lightView.cpp src/windows/matrixView.cpp +Files: src/windows/lightView.cpp src/windows/matrixView.cpp src/windows/colorctrl.cpp Copyright: 2007 Acid Burn License: GPL-2+ @@ -196,7 +196,7 @@ remains attached. Files: debian/* -Copyright: 2007-2009 Reinhard Tartler +Copyright: 2007-2009 Reinhard Tartler 2007-2009 Pascal Giard 2008-2012 Evgeni Golov License: GPL-2+ @@ -259,22 +259,22 @@ distribution. License: MIT - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, copy, - modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, copy, + modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . - The above copyright notice and this permission notice shall be + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/desmume.dirs desmume-0.9.11+r1~4~ubuntu14.04.1/debian/desmume.dirs --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/desmume.dirs 1970-01-01 00:00:00.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/desmume.dirs 2015-07-26 03:58:41.000000000 +0000 @@ -0,0 +1,4 @@ +usr/games +usr/share/locale +usr/share/pixmaps +usr/share/applications diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/desmume.install desmume-0.9.11+r1~4~ubuntu14.04.1/debian/desmume.install --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/desmume.install 1970-01-01 00:00:00.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/desmume.install 2015-07-26 03:58:41.000000000 +0000 @@ -0,0 +1,9 @@ +usr/games +#usr/share/locale/fr/LC_MESSAGES +#usr/share/locale/nb/LC_MESSAGES +#usr/share/locale/pt_BR/LC_MESSAGES +#usr/share/locale/sv/LC_MESSAGES +#usr/share/locale/zh_CN/LC_MESSAGES +#usr/share/locale/zh_TW/LC_MESSAGES +#usr/share/locale/es/LC_MESSAGES +usr/share/man/man1/ diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/dirs desmume-0.9.11+r1~4~ubuntu14.04.1/debian/dirs --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/dirs 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -usr/games -usr/share/locale -usr/share/pixmaps -usr/share/applications diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/docs desmume-0.9.11+r1~4~ubuntu14.04.1/debian/docs --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/docs 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/docs 2015-07-26 03:58:41.000000000 +0000 @@ -1,3 +1,4 @@ README README.LIN AUTHORS +ChangeLog diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/patches/fix_1486_crash_on_second_rom_load.patch desmume-0.9.11+r1~4~ubuntu14.04.1/debian/patches/fix_1486_crash_on_second_rom_load.patch --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/patches/fix_1486_crash_on_second_rom_load.patch 1970-01-01 00:00:00.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/patches/fix_1486_crash_on_second_rom_load.patch 2015-07-26 03:58:41.000000000 +0000 @@ -0,0 +1,12 @@ +Index: desmume-0.9.11/src/gtk/main.cpp +=================================================================== +--- desmume-0.9.11.orig/src/gtk/main.cpp 2015-07-25 20:50:37.762996831 -0300 ++++ desmume-0.9.11/src/gtk/main.cpp 2015-07-25 20:51:38.763600222 -0300 +@@ -1359,7 +1359,6 @@ + gtk_recent_manager_add_full (manager, uri, &recentData); + + g_free(uri); +- g_free(recentData.app_name); + g_free(recentData.app_exec); + gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "run"), TRUE); + Launch(); diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/patches/series desmume-0.9.11+r1~4~ubuntu14.04.1/debian/patches/series --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/patches/series 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/patches/series 2015-07-26 03:58:41.000000000 +0000 @@ -1,3 +1,4 @@ +fix_1486_crash_on_second_rom_load.patch version_string.patch osmesa_3Demu.patch 01_use_system_tinyxml.patch diff -Nru desmume-0.9.11+r1~3~ubuntu14.04.1/debian/rules desmume-0.9.11+r1~4~ubuntu14.04.1/debian/rules --- desmume-0.9.11+r1~3~ubuntu14.04.1/debian/rules 2015-05-04 05:02:35.000000000 +0000 +++ desmume-0.9.11+r1~4~ubuntu14.04.1/debian/rules 2015-07-26 03:58:41.000000000 +0000 @@ -1,24 +1,28 @@ #!/usr/bin/make -f LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -#export LDFLAGS -CFLAGS=-O3 +CFLAGS=-g -O3 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security CXXFLAGS=$(CFLAGS) %: - dh $@ --with quilt + dh $@ --parallel --with quilt override_dh_auto_configure: dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games \ + --enable-debug \ --enable-gdb-stub \ --enable-openal \ --enable-hud \ override_dh_auto_install: dh_auto_install - mv debian/desmume/usr/share/games/pixmaps/DeSmuME.xpm \ + mv debian/tmp/usr/share/games/pixmaps/DeSmuME.xpm \ debian/desmume/usr/share/pixmaps/ - rm -rf debian/desmume/usr/share/games/pixmaps - mv debian/desmume/usr/share/games/applications/desmume*.desktop \ + mv debian/tmp/usr/share/games/applications/desmume*.desktop \ debian/desmume/usr/share/applications/ - rm -rf debian/desmume/usr/share/games/applications + +override_dh_installchangelogs: + dh_installchangelogs -k ChangeLog + +override_dh_strip: + dh_strip -a --dbg-package=desmume-dbg