Bug#680909: unblock: qwbfsmanager/1.2.1-1.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi,
it would be cool if you could unblock qwbfsmanager/1.2.1-1.1.
1.2.1-1 had an automatic freeze exception but never migrated due to two bugs:
#672048 FTBFS: src/gui/pColorButton.h:35:25: fatal error: FreshExport.h: No such file or directory
#677930 FTBFS with gcc 4.7
The version in testing is not affected by those, but it's pretty old (1.2.1
was 190 days in unstable).
A debdiff against the FTBFS'ing version previously in unstable is attached.
The one against 1.1.0-1.1 in testing is pretty big, though. (I know, you look
at the diff to testing for decisions, so I could understand very well if you
say no here).
TIA
Evgeni
unblock qwbfsmanager/1.2.1-1.1
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru qwbfsmanager-1.2.1/debian/changelog qwbfsmanager-1.2.1/debian/changelog
--- qwbfsmanager-1.2.1/debian/changelog 2011-12-31 17:15:47.000000000 +0100
+++ qwbfsmanager-1.2.1/debian/changelog 2012-07-06 22:26:27.000000000 +0200
@@ -1,3 +1,15 @@
+qwbfsmanager (1.2.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with recent qmake
+ Patch by: Filipe AZEVEDO <pasnox@gmail.com>
+ Closes: #672048
+ * Fix FTBFS with gcc-4.7
+ Patch by: Ilya Barygin <randomaction@ubuntu.com>
+ Closes: #677930
+
+ -- Evgeni Golov <evgeni@debian.org> Fri, 06 Jul 2012 08:38:04 +0200
+
qwbfsmanager (1.2.1-1) unstable; urgency=low
* New upstream release. (Closes: #626681)
diff -Nru qwbfsmanager-1.2.1/debian/patches/fix_qmake_replace.patch qwbfsmanager-1.2.1/debian/patches/fix_qmake_replace.patch
--- qwbfsmanager-1.2.1/debian/patches/fix_qmake_replace.patch 1970-01-01 01:00:00.000000000 +0100
+++ qwbfsmanager-1.2.1/debian/patches/fix_qmake_replace.patch 2012-07-06 22:29:50.000000000 +0200
@@ -0,0 +1,52 @@
+From: "Filipe AZEVEDO (Nox P@sNox)" <pasnox@gmail.com>
+Date: Sun, 11 Mar 2012 20:13:14 +0100
+Subject: [PATCH] Fix slash / backslash replace in qmake project
+Origin: upstream
+ Based on upstream commit
+ https://github.com/pasnox/fresh/commit/ae40018bcd80ead2dcdefc0af63a92e50f69b3f6
+
+Index: qwbfsmanager-1.2.1/fresh/installs.pri
+===================================================================
+--- qwbfsmanager-1.2.1.orig/fresh/installs.pri 2011-04-03 22:45:01.000000000 +0200
++++ qwbfsmanager-1.2.1/fresh/installs.pri 2012-07-06 22:28:41.738945741 +0200
+@@ -42,7 +42,7 @@
+ win32:!win32_crossbuild:fresh_core_headers.files *= $$system( for /R src/core %i in (*.h) do @echo %i )
+ else:fresh_core_headers.files *= $$system( find src/core -name '*.h' )
+
+- fresh_core_headers.files = $$replace( fresh_core_headers.files, "\\\\", "/" )
++ fresh_core_headers.files = $$replace( fresh_core_headers.files, $$BACKSLASH, $SLASH )
+
+ # gui headers
+ fresh_gui_headers.path = $$FRESH_INSTALL_HEADERS/FreshGui
+@@ -50,7 +50,7 @@
+ win32:!win32_crossbuild:fresh_gui_headers.files *= $$system( for /R src/gui %i in (*.h) do @echo %i )
+ else:fresh_gui_headers.files *= $$system( find src/gui -name '*.h' )
+
+- fresh_gui_headers.files = $$replace( fresh_gui_headers.files, "\\\\", "/" )
++ fresh_gui_headers.files = $$replace( fresh_gui_headers.files, $$BACKSLASH, $SLASH )
+
+ # generate fresh.prf
+ # remove old one if needed
+Index: qwbfsmanager-1.2.1/fresh/functions.pri
+===================================================================
+--- qwbfsmanager-1.2.1.orig/fresh/functions.pri 2011-04-03 22:45:01.000000000 +0200
++++ qwbfsmanager-1.2.1/fresh/functions.pri 2012-07-06 22:29:46.243526956 +0200
+@@ -4,6 +4,9 @@
+
+ win32:!isEqual( Q_OS, "windows" ):CONFIG *= win32_crossbuild
+
++SLASH = "/"
++BACKSLASH = $$escape_expand( "\\" )
++
+ # lupdate/lrelease too buggy ( not full qmake interpreter ), so avoid functions def in this case
+ isEmpty( translations_pass ) {
+ # return the list of directories recursively from a given path ($$1)
+@@ -21,7 +24,7 @@
+ _q_folders = $$system( $$command )
+ _q_folders *= $$1
+
+- _q_folders = $$replace( _q_folders, "\\\\", "/" )
++ _q_folders = $$replace( _q_folders, $$BACKSLASH, $SLASH )
+
+ # loop paths
+ for( q_folder, _q_folders ) {
diff -Nru qwbfsmanager-1.2.1/debian/patches/gcc-4.7.patch qwbfsmanager-1.2.1/debian/patches/gcc-4.7.patch
--- qwbfsmanager-1.2.1/debian/patches/gcc-4.7.patch 1970-01-01 01:00:00.000000000 +0100
+++ qwbfsmanager-1.2.1/debian/patches/gcc-4.7.patch 2012-07-06 22:26:27.000000000 +0200
@@ -0,0 +1,23 @@
+Description: fix compilation with gcc 4.7
+Author: Ilya Barygin <randomaction@ubuntu.com>
+
+--- qwbfsmanager-1.2.1.orig/fresh/src/gui/environmentvariablemanager/pEnvironmentVariablesModel.cpp
++++ qwbfsmanager-1.2.1/fresh/src/gui/environmentvariablemanager/pEnvironmentVariablesModel.cpp
+@@ -225,12 +225,12 @@ pEnvironmentVariablesModel::Variables pE
+ const QString name = variable.section( '=', 0, 0 );
+ const QString value = variable.section( '=', 1 );
+
+- pEnvironmentVariablesModel::Variable variable;
+- variable.name = name;
+- variable.value = value;
+- variable.enabled = true;
++ pEnvironmentVariablesModel::Variable variable2;
++ variable2.name = name;
++ variable2.value = value;
++ variable2.enabled = true;
+
+- items[ name ] = variable;
++ items[ name ] = variable2;
+ }
+
+ return items;
diff -Nru qwbfsmanager-1.2.1/debian/patches/series qwbfsmanager-1.2.1/debian/patches/series
--- qwbfsmanager-1.2.1/debian/patches/series 2011-12-31 17:04:07.000000000 +0100
+++ qwbfsmanager-1.2.1/debian/patches/series 2012-07-06 22:26:27.000000000 +0200
@@ -1 +1,3 @@
no_rpath.patch
+fix_qmake_replace.patch
+gcc-4.7.patch
Reply to: