[Bug 2026730] Re: Merge dash 0.5.12-6 from debian

[Lukas Märdian]

https://launchpad.net/ubuntu/+source/dash/0.5.12-6ubuntu1

** Changed in: dash (Ubuntu)
       Status: Confirmed => In Progress

-- 
You received this bug notification because you are a member of Ubuntu
Sponsors, which is subscribed to the bug report.
https://bugs.launchpad.net/bugs/2026730

Title:
  Merge dash 0.5.12-6 from debian

Status in dash package in Ubuntu:
  In Progress

Bug description:
  This is a tracking bug to merge dash 0.5.12-6 from debian.

  Below now follows the report of the automated merge of the Ubuntu
  changes to the dash source package against the new Debian version.

  This file is designed to be both human readable and machine-parseable.
  Any line beginning with four spaces is a file that should be
  downloaded for the complete merge set.

  
  Here are the particulars of the three versions of dash that were
  chosen for the merge.  The base is the newest version that is a common
  ancestor of both the Ubuntu and Debian packages.  It may be of a
  different upstream version, but that's not usually a problem.

  The files are the source package itself, and the patch from the common
  base to that version.

  base: 0.5.12-2
      dash_0.5.12-2.dsc
      dash_0.5.12.orig.tar.gz
      dash_0.5.12-2.debian.tar.xz

  ubuntu: 0.5.12-2ubuntu1
      dash_0.5.12-2ubuntu1.dsc
      dash_0.5.12.orig.tar.gz
      dash_0.5.12-2ubuntu1.debian.tar.xz

  base -> ubuntu
      dash_0.5.12-2ubuntu1.patch

  debian: 0.5.12-6
      dash_0.5.12-6.dsc
      dash_0.5.12.orig.tar.gz
      dash_0.5.12-6.debian.tar.xz

  base -> debian
      dash_0.5.12-6.patch

  
  Generated Result
  ================

  Due to conflict or error, it was not possible to automatically create
  a source package.  Instead the result of the merge has been placed
  into the following tar file which you will need to turn into a source
  package once the problems have been resolved.

      dash_0.5.12-6ubuntu1.src.tar.gz

  
  Conflicts
  =========

  In one or more cases, there were different changes made in both Ubuntu
  and Debian to the same file; these are known as conflicts.

  It is not possible for these to be automatically resolved, so this
  source needs human attention.

  Those files marked with 'C ' contain diff3 conflict markers, which can
  be resolved using the text editor of your choice.  Those marked with
  'C*' could not be merged that way, so you will find .UBUNTU and
  .DEBIAN files instead and should choose one of them or a combination
  of both, moving it to the real filename and deleting the other.

    C  debian/tests/control

  
  Once you have a source package you are happy to upload, you should
  make sure you include the orig.tar.* if appropriate and information
  about all the versions included in the merge.

  Use the following command to generate a correct .changes file:

    $ dpkg-genchanges -S -v0.5.12-2ubuntu1

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/dash/+bug/2026730/+subscriptions