Hi,
2012/7/17 Fabian Greffrath fab...@greffrath.com:
I'm just getting some warnings about hardening-no-fortify-functions
and hardening-no-relro that I will look after tomorrow.
This means that LDFLAGS and CPPFLAGS are not taken over from the
environment. Try QMAKE_LFLAGS += ${LDFLAGS} and
Am 16.07.2012 21:19, schrieb Fabrice Coutadeur:
I'm just getting some warnings about hardening-no-fortify-functions
and hardening-no-relro that I will look after tomorrow.
This means that LDFLAGS and CPPFLAGS are not taken over from the
environment. Try QMAKE_LFLAGS += ${LDFLAGS} and
On Mon, Jul 16, 2012 at 7:25 AM, Fabrice Coutadeur coutade...@gmail.com wrote:
Automatic merge failed; fix conflicts and then commit the result.
gbp:error: git returned 1
gbp:error: Couldn't merge from upstream/1.3.1
gbp:error: Merge failed, please resolve.
This is easier than I originally
Hi,
It worked: thank you very much!
I just uploaded 1.3.1 to git ;)
I'm just getting some warnings about hardening-no-fortify-functions
and hardening-no-relro that I will look after tomorrow.
Thanks again,
Fabrice
2012/7/16 Alessio Treglia ales...@debian.org:
On Mon, Jul 16, 2012 at 7:25 AM,
Hi,
I'm trying to update ffdiaporama to 1.3.1 (a bug fixing release) and
after using git-import-orig, I got a lot of merge conflicts on files
that hasn't been changed.
I checked the upstream/1.3 tag (the previous version) in gitk, but as
I couldn't find it anywhere, I tried to create if: 'fatal:
On Sun, Jul 15, 2012 at 8:28 AM, Fabrice Coutadeur coutade...@gmail.com wrote:
What can I do?
rm -r ffdiaporama gbp-clone --pristine-tar ffdiaporama
:)
--
Alessio Treglia | www.alessiotreglia.com
Debian Developer | ales...@debian.org
Ubuntu Core Developer|
Hi,
2012/7/15 Alessio Treglia ales...@debian.org:
On Sun, Jul 15, 2012 at 8:28 AM, Fabrice Coutadeur coutade...@gmail.com
wrote:
What can I do?
rm -r ffdiaporama gbp-clone --pristine-tar ffdiaporama
Actually, this is what I did 4 times, and this is why I decided to
check the upstream tag,
