Your message dated Tue, 25 Sep 2012 06:14:03 +0100
with message-id <1348550043.6724.25.ca...@jacala.jungle.funky-badger.org>
and subject line Re: Bug#688096: unblock: bsnes/0.088-5 (pre-approval)
has caused the Debian Bug report #688096,
regarding unblock: bsnes/0.088-5 (pre-approval)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
688096: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688096
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please tell me if you would unblock the following changes for the package bsnes,
which would close two bugs.
* Fix issues with bsnes-purify (Closes: #687034):
- Fix segmentation fault when run with less than two arguments.
- Purify also files with uppercase suffix.
* Add missing epoch to versioned Build-Depends on gcc (Closes: #687197).
* Remove workaround for g++ bug PR c++/53821, which is now fixed in wheezy.
The debdiff against the package in testing is attached. I did not upload the
changes to unstable yet.
Best regards,
Tobias Hansen
unblock bsnes/0.088-5
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (650, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru bsnes-0.088/debian/changelog bsnes-0.088/debian/changelog
--- bsnes-0.088/debian/changelog 2012-09-04 01:57:13.000000000 +0200
+++ bsnes-0.088/debian/changelog 2012-09-19 11:03:29.000000000 +0200
@@ -1,3 +1,13 @@
+bsnes (0.088-5) unstable; urgency=low
+
+ * Fix issues with bsnes-purify (Closes: #687034):
+ - Fix segmentation fault when run with less than two arguments.
+ - Purify also files with uppercase suffix.
+ * Add missing epoch to versioned Build-Depends on gcc (Closes: #687197).
+ * Remove workaround for g++ bug PR c++/53821, which is now fixed in wheezy.
+
+ -- Tobias Hansen <tobias....@gmx.de> Wed, 19 Sep 2012 10:52:02 +0200
+
bsnes (0.088-4) unstable; urgency=low
* Add workaround for g++ bug PR c++/53821. (Closes: #684840)
diff -Nru bsnes-0.088/debian/control bsnes-0.088/debian/control
--- bsnes-0.088/debian/control 2012-05-11 13:08:23.000000000 +0200
+++ bsnes-0.088/debian/control 2012-09-18 02:11:39.000000000 +0200
@@ -11,7 +11,7 @@
libao-dev,
libxv-dev,
libasound2-dev [linux-any],
- gcc (>= 4.6)
+ gcc (>= 4:4.6)
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-games/bsnes.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/bsnes.git
diff -Nru bsnes-0.088/debian/patches/fix-purify-header-removal-and-input.patch bsnes-0.088/debian/patches/fix-purify-header-removal-and-input.patch
--- bsnes-0.088/debian/patches/fix-purify-header-removal-and-input.patch 2012-05-10 16:13:11.000000000 +0200
+++ bsnes-0.088/debian/patches/fix-purify-header-removal-and-input.patch 2012-09-18 02:07:43.000000000 +0200
@@ -1,10 +1,21 @@
Description: Purify: Fix header checks and input handling
* Add parantheses to fix checks for headers.
* Accept folder names entered without trailing slash.
+ * Check also files with uppercase extensions.
+ * Rename purify to bsnes-purify in help output.
Author: Tobias Hansen <tobias....@gmx.de>
--- a/purify/purify.cpp
+++ b/purify/purify.cpp
+@@ -43,7 +43,7 @@
+ bool Application::loadFile(const string &filename, string &suffix, uint8_t *&data, unsigned &size) {
+ print("-> ", notdir(filename), "\n");
+
+- if(filename.endswith(".zip")) {
++ if(filename.iendswith(".zip")) {
+ zip archive;
+ if(archive.open(filename) == false) return print("* failed to open archive\n"), false;
+ if(archive.file.size() != 1) return print("* file count (", archive.file.size(), ") incorrect\n"), false;
@@ -60,7 +60,7 @@
//<famicom>
@@ -41,12 +52,32 @@
string markup = SuperFamicomCartridge(data, size).markup;
string path = {target, nall::basename(filename), ".sfc/"};
-@@ -238,15 +238,20 @@
+@@ -225,11 +225,11 @@
+ unsigned size;
+ if(loadFile({source, filename}, suffix, data, size) == false) continue;
+
+- if(suffix == "nes" || suffix == "fc") outputFamicom(filename, data, size);
+- if(suffix == "sfc" || suffix == "smc") outputSuperFamicom(filename, data, size);
+- if(suffix == "gb") outputGameBoy(filename, data, size);
+- if(suffix == "gbc" || suffix == "gbb") outputGameBoyColor(filename, data, size);
+- if(suffix == "gba") outputGameBoyAdvance(filename, data, size);
++ if(suffix.iequals("nes") || suffix.iequals("fc")) outputFamicom(filename, data, size);
++ if(suffix.iequals("sfc") || suffix.iequals("smc")) outputSuperFamicom(filename, data, size);
++ if(suffix.iequals("gb")) outputGameBoy(filename, data, size);
++ if(suffix.iequals("gbc") || suffix.iequals("gbb")) outputGameBoyColor(filename, data, size);
++ if(suffix.iequals("gba")) outputGameBoyAdvance(filename, data, size);
+
+ delete[] data;
+ }
+@@ -238,21 +238,29 @@
int main(int argc, char **argv) {
Application *application = new Application;
-+ string source = argv[2];
-+ if(!source.endswith("/")) source.append("/");
++ string source;
++ if(argc == 4) {
++ source = argv[2];
++ if(!source.endswith("/")) source.append("/");
++ }
+
if(argc == 4 && cstring{argv[1]} == "scan") {
- application->source = argv[2];
@@ -65,3 +96,11 @@
application->outputDirectory();
}
+ else {
+- print("purify v01\n");
+- print("usage: purify [mode] source target\n\n");
++ print("bsnes-purify v01\n");
++ print("usage: bsnes-purify [mode] source target\n\n");
+ print("modes:\n");
+ print(" scan - create database\n");
+ print(" output - create folder images\n");
diff -Nru bsnes-0.088/debian/patches/gcc-pr53821-workaround.patch bsnes-0.088/debian/patches/gcc-pr53821-workaround.patch
--- bsnes-0.088/debian/patches/gcc-pr53821-workaround.patch 2012-08-28 01:45:31.000000000 +0200
+++ bsnes-0.088/debian/patches/gcc-pr53821-workaround.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-Description: Work around gcc bug PR c++/53821
- This bug is present in Wheezys gcc-4.7 4.7.1-2.
- It is fixed in gcc-4.7 4.7.1-3.
-Author: Tobias Hansen <tobias....@gmx.de>
-
---- a/bsnes/nall/sort.hpp
-+++ b/bsnes/nall/sort.hpp
-@@ -69,6 +69,7 @@
- }
-
- template<typename T>
-+ inline
- void sort(T list[], unsigned size) {
- return sort(list, size, [](const T &l, const T &r) { return l < r; });
- }
diff -Nru bsnes-0.088/debian/patches/series bsnes-0.088/debian/patches/series
--- bsnes-0.088/debian/patches/series 2012-08-27 22:45:42.000000000 +0200
+++ bsnes-0.088/debian/patches/series 2012-09-19 10:51:16.000000000 +0200
@@ -5,4 +5,3 @@
detect-endianness.patch
remove-march=native-build-flag.patch
fix-purify-header-removal-and-input.patch
-gcc-pr53821-workaround.patch
--- End Message ---
--- Begin Message ---
On Tue, 2012-09-25 at 01:02 +0200, Tobias Hansen wrote:
> Am 23.09.2012 19:38, schrieb Adam D. Barratt:
> > On Wed, 2012-09-19 at 12:04 +0200, Tobias Hansen wrote:
> >> * Fix issues with bsnes-purify (Closes: #687034):
> >> - Fix segmentation fault when run with less than two arguments.
> >> - Purify also files with uppercase suffix.
> >> * Add missing epoch to versioned Build-Depends on gcc (Closes: #687197).
> >> * Remove workaround for g++ bug PR c++/53821, which is now fixed in
> >> wheezy.
> >
> > Please go ahead.
[...]
> I also changed my email address in debian/control and removed the DMUA
> flag. A debdiff with the changes compared to the approved version is
> attached. Please unblock the package.
Unblocked; thanks.
Regards,
Adam
--- End Message ---