Please merge aptitude 0.6.8.2-1(main) from Debian unstable (main)

I've got the diff between 0.6.8.1 and 0.6.8.2 its just 2.5M and I can upload it somewhere if needed.

Contains changes to the tree outside of debian/patches:
src/apt_options.cc, src/generic/apt/pkg_changelog.cc.

Update to patches/04_changelog misses the entire point of that file.
Now it contains only changes to “branding”, which belong in
03_branding anyway.

No attempt to address any of the outstanding Ubuntu-specific issues.
There are several bug reports concerning Ubuntu patches. At least one
of which is resolved by this update, and some others are trivial to
address.

debian/changelog also does not mention several of the remaining changes.

Please update the changelog to include all the differences between the Debian and Ubuntu packages. It would be nice to look through the open bugs as Daniel suggested. Unsubscribing sponsors, please resubscribe when ready.

Oh, realigning the patches to their proper purposes as Daniel suggested would also be good.

Everything has been fixed except there is an issue with the latest google-mock as attempting to run the aptitude build tests fail when trying to find gtest. I can build/test aptitude successfully in Debian Sid and I did notice a few changes between Debian's google-mock and ours. I've emailed the uploader to see if they are planning on doing a new upload and if not, attempt to get that package sorted before coming back to this one.

On 30 January 2013 12:23, Adam Stokes <email address hidden> wrote:
> Everything has been fixed

Fine.

In the past few days the source of bug #1033838 has been discovered.
If the canonical location for that setting should be the user-setup
package (which IMO makes sense), then the file debian/05aptitude can
be removed, fixing that issue and also bug #1053776.

With patch no-google-mock gone, the remaining changes can be made
redundant with minor upstream changes after Wheezy.

Would you care to provide an updated patch or branch with the work in progress?

> attempting to run the aptitude build tests fail when
> trying to find gtest.

Due to the Ubuntu package not shipping the files under /usr/src/gmock?
 This difference from Debian is not obviously mentioned in the
changelog.

My most recent work can be seen here:

http://people.canonical.com/~stokes/aptitude_0.6.8.2-1ubuntu1.raring.debdiff

The google-mock package does provide the source under /usr/src/gmock, I am just having a hard time figuring out why aptitude is not building those shared libs in order to run the tests. On Debian, however, those shared libs from both gtest and gmock are built and the testsuite is executed as expected.

On 30 January 2013 23:02, Adam Stokes <email address hidden> wrote:
> My most recent work can be seen here:
>
> http://people.canonical.com/~stokes/aptitude_0.6.8.2-1ubuntu1.raring.debdiff

A diff from the Debian version would be more convenient to review. Anyway …

+aptitude (0.6.8.2-1ubuntu1) precise; urgency=low
+
+ * Merge from Debian unstable (LP #1103541)
+ Remaining changes:
+ - debian/05aptitude: Never autoremove kernels.

Can now be removed, closing the two bugs refered to in an earlier comment.

+ - Drop aptitude-doc to Suggests.

+ - 03_branding: Ubuntu branding.
+ - 04_changelog: Take changelogs from changelogs.ubuntu.com.

There are easily addressed open bug reports about these two patches.

03_branding has no changes at all and is still missing some strings as
reported on Launchpad.

04_changelog continues to contain branding changes that could be moved
to 03_branding. The update to this patch is significant, have you
confirmed that the proposed package can download changelogs, and
fetches them from the correct server? The changelog entry does not
mention closing bug #1053792; do you not consider that bug closed by
this updated patch?

Please peruse the list of open bug reports. Search term “ubuntu
patch” will direct you to a limited, yet relevant set. Of course,
there may be other bugs outside this set that are closed by the
upstream changes and should also be mentioned.

+ - 14_html2text_preferred: Switch back to html2text in favor of elinks,
+ since html2text is in main and elinks isn't. Convert all files to utf-8
+ encoding as it is better then ascii for iso-8859-1 (English docs).
+ - no-google-mock: dropped since package exists in main.

On 30 January 2013 23:02, Adam Stokes <email address hidden> wrote:
> The google-mock package does provide the source under /usr/src/gmock,

They are not listed in the manifest of
google-mock_1.6.0-0ubuntu3_i386.deb? Instead there are some shared
libraries that, at upstreams request, the Debian package no longer
provides.

> I
> am just having a hard time figuring out why aptitude is not building
> those shared libs in order to run the tests. On Debian, however, those
> shared libs from both gtest and gmock are built and the testsuite is
> executed as expected.

Rather, aptitude builds a single /static/ library if the google-mock
package does not contain the shared library. The build system,
between configure.ac and tests/Makefile.am, is only prepared for the
Debian google-mock packages, so the significant divergance in Ubuntu
may require a minor patch to the these files.

[Expired for aptitude (Ubuntu) because there has been no activity for 60 days.]

http://people.canonical.com/~stokes/aptitude_0.6.8.2-1ubuntu1.raring.debdiff

gives me 404. Was this merge done or not? =)

On 2 August 2013 21:26, Dmitrijs Ledkovs <email address hidden> wrote:
> http://people.canonical.com/~stokes/aptitude_0.6.8.2-1ubuntu1.raring.debdiff
>
> gives me 404. Was this merge done or not? =)

It did previously exist, however, the work was never completed.

In a few days 0.6.10 will be uploaded to unstable.