Thanks for those complete comments.
Here is the new debdiff from last Ubuntu version to merged version...
** Attachment added: base-files_4.0.1ubuntu6_4.0.4ubuntu1.debdiff
http://launchpadlibrarian.net/16636047/base-files_4.0.1ubuntu6_4.0.4ubuntu1.debdiff
--
Apache-2.0 missing from
...and the new debdiff from Debian version to merged version.
base-files (4.0.4ubuntu1) intrepid; urgency=low
* Merge from debian unstable (LP: #247082), remaining changes:
- Branding changes
- Add /etc/lsb-release file
- Add lsb-release-udeb package
- Record md5sums of
This bug was fixed in the package base-files - 4.0.4ubuntu1
---
base-files (4.0.4ubuntu1) intrepid; urgency=low
* Merge from debian unstable (LP: #247082), remaining changes:
- Branding changes
- Add /etc/lsb-release file
- Add lsb-release-udeb package
- Record
Hi Thierry,
A few comments on the resulting debdiff; none of these are issues that
you've introduced, but as long as we're merging (sorry, I know that was
my idea :), I think they should be addressed.
--- base-files-4.0.4/debian/postinst2008-03-11 11:02:27.0 +0100
+++
Debdiff from last Ubuntu version to merged version
base-files (4.0.4) unstable; urgency=low
* Added Apache-2.0 to common-licenses. Closes: #471736.
Retrieved from http://www.apache.org/licenses/LICENSE-2.0.txt.
* Fixed typo in README.base. Closes: #475201.
-- Santiago Vila [EMAIL
Debdiff from Debian version to merged version
base-files (4.0.4ubuntu1) intrepid; urgency=low
* Merge from debian unstable (LP: #247082), remaining changes:
- Branding changes.
- Add /etc/lsb-release file.
- Add lsb-release-udeb package.
- Record md5sums of unmodified
Steve: let me know if you don't have time to sponsor the merge, I would
then subscribe the relevant team.
** Changed in: base-files (Ubuntu)
Importance: Undecided = Low
Status: In Progress = Triaged
--
Apache-2.0 missing from common-licenses
https://bugs.launchpad.net/bugs/247082
You
During the development phase, I think it's always preferable to do a
merge with Debian than to cherry-pick changes unless we know of a
specific reason that the Debian changes are unsuitable.
I don't see anything unsuitable in the base-files 4.0.4 changelog; can
you please prepare this as a merge?
Debdiff for a new release adding the missing license.
Let me know if you prefer a complete merge with Debian base-files 4.0.4.
** Changed in: base-files (Ubuntu)
Assignee: (unassigned) = Thierry Carrez (tcarrez)
Status: New = In Progress
** Attachment added:
