Please merge qtiplot (universe) with version 0.9.8.2-1 from Debian unstable main

[Alex Valavanis]

Binary package hint: qtiplot

Debian changelog head:

 qtiplot (0.9.8.2-1) unstable; urgency=low
 .
   * New upstream release
   * Remove quilt dependency
   * Depend on liborigin2 (>=1:13092010)
   * Re-enable liborigin2 (Closes: #604819)
   * Added -lz to qtiplot.pro (Closes: #600736)
   * Add Dependency on libboost-thread-dev

[Alex Valavanis (valavanisalex)]

This is still pending upload in Debian, so I guess we'll have to wait before merging.

[Alex Valavanis (valavanisalex)]

Looking at the Ubuntu-specific changes:

* libqtassistant-client dependency - STILL NEEDED
* 03_binutils-gold-fix.diff - DROP: NOW IN DEBIAN

[Alex Valavanis (valavanisalex)]

Now available in Debian

[Artur Rona (ari-tczew)]

Do you will prepare a patch for merge, or rather looking for contributor to do it?

[Alex Valavanis (valavanisalex)]

I'm happy to do it later in the week. I'll mark it "In progress" when I start. If anyone else wants to do it sooner, then that's fine too.

[Artur Rona (ari-tczew)]

You can assign bug to yourself, then other contributors know that you want to do it. ATM there is no any important reasons to do it right now.

[Bhavani Shankar (bhavi)]

and the patch file doesnt apply cleanly i believe

Just to check I pulled the merge

bhavani@flyingmonster:~/development/qtiplot/qtiplot-0.9.8.2-1ubuntu1/debian$ debuild -S -sa -k84E1A1A8 -v0.9.8-2ubuntu1
 dpkg-buildpackage -rfakeroot -d -us -uc -S -sa -v0.9.8-2ubuntu1
dpkg-buildpackage: set CFLAGS to default value: -g -O2
dpkg-buildpackage: set CPPFLAGS to default value:
dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
dpkg-buildpackage: set FFLAGS to default value: -g -O2
dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
dpkg-buildpackage: source package qtiplot
dpkg-buildpackage: source version 0.9.8.2-1ubuntu1
dpkg-buildpackage: source changed by Ubuntu Merge-o-Matic <email address hidden>
 fakeroot debian/rules clean
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
[ ! -f Makefile ] || /usr/bin/make clean
find -type f -name 'Makefile' -exec rm -f {} \;
find -type f -name '*.qm' -exec rm -f {} \;
rm -f minigzip.c
rm -f qtiplot/qtiplot
rm -f manual/html/*.html
rm -f manual/qtiplot-manual-en.pdf
rm -f manual/html/qtiplot.adp
rm -rf API
rm -rf tmp
rm -f qtiplot/translations/*.qm
rm -f qtiplot/translations/*.ts
rm -rf 3rdparty/qwtplot3d/lib
rm -rf 3rdparty/qwtplot3d/tmp
rm -f build.conf
rm -f 3rdparty/qwt/lib/libqwt.a
dh_clean
 dpkg-source -b qtiplot-0.9.8.2-1ubuntu1
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building qtiplot using existing ./qtiplot_0.9.8.2.orig.tar.gz
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file qtiplot/qtiplot.pro.rej
dpkg-source: error: LC_ALL="C" LANG="C" patch -s -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/03_binutils-gold-fix.diff/ gave error exit status 1
dpkg-buildpackage: error: dpkg-source -b qtiplot-0.9.8.2-1ubuntu1 gave error exit status 2
debuild: fatal error at line 1340:
dpkg-buildpackage -rfakeroot -d -us -uc -S -sa -v0.9.8-2ubuntu1 failed
bhavani@flyingmonster:~/development/qtiplot/qtiplot-0.9.8.2-1ubuntu1/debian$

Regards

[Alex Valavanis (valavanisalex)]

OK, I have assigned it to myself. However, I won't be offended if anyone else wants to do it urgently!

@Bhavani - The build system patches have been merged in Debian, so 03_binutils-gold-fix.diff can be dropped in Ubuntu.

[Bhavani Shankar (bhavi)]

okay sorry for oversighting alex

regards

[Alex Valavanis (valavanisalex)]

Adding debdiffs (not yet build tested)

[Alex Valavanis (valavanisalex)]

Launchpad keeps giving me an "Oops!" message when I try to upload the old->new Ubuntu debdiff. I'll try again later

[Alex Valavanis (valavanisalex)]

Uploaded to PPA:

https://launchpad.net/~valavanisalex/+archive/qtiplot

[Alex Valavanis (valavanisalex)]

PPA build succeeded (i386 + amd64)

[Bhavani Shankar (bhavi)]

Artur: I ll have a look at this asap if there are no objections from your side

regards

[Alex Valavanis (valavanisalex)]

AMD64 build installs and runs fine for me. Subscribing sponsors

[Artur Rona (ari-tczew)]

Bhavani, feel free to take this one. 10th Dec is coming soon!

[Bhavani Shankar (bhavi)]

thanks artur all the best mate

now looking into this

regards

[Launchpad Janitor (janitor)]

This bug was fixed in the package qtiplot - 0.9.8.2-1ubuntu1

---------------
qtiplot (0.9.8.2-1ubuntu1) natty; urgency=low

  * Merge from debian unstable (LP: #685807). Remaining changes:
    - Drop 03_binutils-gold-fix.diff. Now merged into 01_build_system.diff
    - Build-Depends on libqtassistantclient-dev
      Recommends qt-assistant-compat to fix a FTBFS since qtassistant
      is removed in qt > 4.6 (LP: #598826)

qtiplot (0.9.8.2-1) unstable; urgency=low

  * New upstream release
  * Remove quilt dependency
  * Depend on liborigin2 (>=1:13092010)
  * Re-enable liborigin2 (Closes: #604819)
  * Added -lz to qtiplot.pro (Closes: #600736)
  * Add Dependency on libboost-thread-dev
 -- Alex Valavanis <email address hidden> Wed, 08 Dec 2010 10:32:48 +0000