[MoM Merge] ldtp 0.9.2-2ubuntu1

[Stephan Rügamer]

Binary package hint: ldtp

Dear Colleagues,

please upload ldtp 0.9.2-2ubuntu1 to ubuntu.
It's a merge.

Changelog since last upload:

ldtp (0.9.2-2ubuntu1) hardy; urgency=low

  * Merge from debian unstable, remaining changes:
    + debian/control:
      - Updated to match Ubuntu Maintainer Policy
    + debian/python-ldtp.install: (LP: #137280)
      - Changed pathname to python2.5 to fix FTBFS

 -- Stephan Hermann <email address hidden> Fri, 09 Nov 2007 15:24:42 +0100

ldtp (0.9.2-2) unstable; urgency=low

  * debian/python-ldtp.install: added missing ldtplib/*.py, Thanks to Fernando
    Ribeiro <email address hidden> for help
  * debian/watch: updated according to latest upstream url
  * debian/rules: fixed permission of files from newly added ldtplib/*.py

 -- Kartik Mistry <email address hidden> Wed, 10 Oct 2007 10:26:38 +0530

ldtp (0.9.2-1) unstable; urgency=low

  * New upstream release
  * debian/patches/01_alpha-ftbfs-fix.dpatch merged with upstream, dropped it
  * debian/control: dropped dpatch support
  * Added manpage: debian/ldtpcodegen.1
  * debian/copyright: moved copyright out of license section, added package
    copyright, added missing copyright holders, libcap is no longer used, so
    removed it
  * debian/rules: fixed way to install manpages, dropped dpatch support,
    ldtpcodegen/ldtp does not need to change permission since it is binary now

 -- Kartik Mistry <email address hidden> Thu, 6 Sep 2007 18:18:56 +0530

ldtp (0.8.0-5) unstable; urgency=low

  * Improved man pages: ldtp.1, ldtprunner.1, ldtprecord.1, Thanks to Mohammed
    Adnène Trojette <email address hidden> for tips and patch
  * debian/rules: minor cleanups and better clean target

 -- Kartik Mistry <email address hidden> Sun, 29 Jul 2007 22:00:41 +0530

ldtp (0.8.0-4) unstable; urgency=low

  * debian/control: fixed lintian substvar-source-version-is-deprecated
    warning, added homepage entries to long descriptions
  * debian/rules: minor cleanups
  * debian/watch: fixed now

 -- Kartik Mistry <email address hidden> Fri, 22 Jun 2007 15:31:42 +0530

Please find attached a debdiff from ldtp 0.8.0-3ubuntu1 to 0.9.2-2ubuntu1

Regards,

\sh

[Chris Halse Rogers (raof)]

You've clearly got some of the merge process correct, but not quite all of it yet :).
Particularly:
* It seems that you haven't tested that you can build the package after applying the debdiff you attached - your debdiff contains some conflict markers.
* You haven't attached the debdiff between the new base Debian package and the merged package - this debdiff is often more interesting to reviewers than the debdiff against the previous Ubuntu version.

Please fix these up, and re-subscribe ubuntu-universe-sponsors. Don't hesitate to ask on #ubuntu-motu if you're unsure about anything.
See «https://wiki.ubuntu.com/MOTU/Merging» for more details.

[Luke Yelavich (themuso)]

Firstly, it seems you have managed to leave an extra Maintainer: in the XSBC-Original-Maintainer. Secondly, Theres generally no need to put bug numbers in changelog entries for merges, as the bug has been mentioned and closed in the original fix for the Ubuntu package.

If you could fix these up, and re-subscribe ubuntu-universe-sponsors when youare done, that would be great. Thanks.

[Luke Yelavich (themuso)]

Uploaded. Thanks for your work. Please mar as fix released once the package has built on all architectures.