Merge lp:~ubuntu-branches/ubuntu/trusty/libnih/trusty-201311121441 into lp:ubuntu/trusty/libnih

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/trusty/libnih reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/libnih/trusty-201311121441. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

1089. By Dimitri John Ledkov on 2013-11-12

releasing package libnih version 1.0.3-4ubuntu24

1088. By Dimitri John Ledkov on 2013-11-11

Do not blindly use passed pointer to the TEST_FUNCTION (et.al),
instead make a strncpy of it. Since passed pointer can be freed behind
our back, when we still need it.

1087. By Dimitri John Ledkov on 2013-11-11

releasing package libnih version 1.0.3-4ubuntu23

1086. By Dimitri John Ledkov on 2013-11-10

Split test_node.c into two translation units. (LP: #1248677)

1085. By Dimitri John Ledkov on 2013-11-09

releasing package libnih version 1.0.3-4ubuntu22

1084. By Dimitri John Ledkov on 2013-11-08

Disable parallel running of test-suite, not deterministic.

1083. By Dimitri John Ledkov on 2013-11-08

Update TAP output patch to latest.

1082. By Dimitri John Ledkov on 2013-11-07

Add autopkgtest to run full testsuite.

1081. By Dimitri John Ledkov on 2013-11-07

Fix TEST_FUNCTION_FEATURE formatting.

1080. By Dimitri John Ledkov on 2013-11-07

Optimise TAP compatible test-suite, generated out of range conditional
branches on arm*, but not any other platforms.