Please sync links2 2.1pre37-1.1 (universe) from Debian unstable (main).

[Bhavani Shankar]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 affects ubuntu/links2
 status new
 importance wishlist
 subscribe ubuntu-universe-sponsors

Please sync links2 2.1pre37-1.1 (universe) from Debian unstable (main).

Explanation of the Ubuntu delta and why it can be dropped:

Debian has incorporated ubuntu changes esp security fix. so ubuntu
changes can be dropped.

Changelog since current intrepid version 2.1pre37-1ubuntu2:

links2 (2.1pre37-1.1) unstable; urgency=high

  * Non-maintainer upload by the security team
  * Make sure links cannot bypass the proxy, if it is configurered only
    to use it in order to avoid leaking of sensitive information to
    external programs, fix in session.c (Closes: #492744)
    Fixes: CVE-2008-3329

 -- Steffen Joeris <email address hidden> Sat, 02 Aug 2008 03:33:53 +0000

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFIoEEgL+KnYRaooWIRAnuzAJ9OPLUv2+5eEUYbFUmJKn/tZrABGgCfeXmt
76xYjvLTrsMg27NdxpYpixA=
=p0e6
-----END PGP SIGNATURE-----

[Daniel Holbach (dholbach)]

What about this revision?

links2 (2.1pre37-1ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes:
   + debian/links2.desktop:
    - Modify to make it validate with desktop-file-validate
  * debian/control:
   + updated standards version.
   + updated maintainer filed.

Bhavani: please check the actual diff before you file a sync request.

[Bhavani Shankar (bhavi)]

OK ! converting to a merge

[Bhavani Shankar (bhavi)]

Oh.. A minute please daniel:

From the diff

+++ links2-2.1pre37/debian/links2.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Links 2
+Exec=xlinks2
+Terminal=false
+Categories=Network;WebBrowser;
+Comment=Web browser running in both graphics and text mode

From /debian/links2.desktop (Of the sync I requested)

[Desktop Entry]
Type=Application
Name=Links 2
Exec=xlinks2
Terminal=false
Categories=Network;WebBrowser;
Comment=Web browser running in both graphics and text mode

So both are the same..

and its building perfectly on my system.

Regards

[Daniel Holbach (dholbach)]

They are not the same:

diff -u links2-2.1pre37/debian/links2.desktop links2-2.1pre37/debian/links2.desktop
--- links2-2.1pre37/debian/links2.desktop
+++ links2-2.1pre37/debian/links2.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Name=Links 2
 Exec=xlinks2

Which gives:

daniel@devel:~$ desktop-file-validate links2-2.1pre37/debian/links2.desktop
links2-2.1pre37/debian/links2.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
daniel@devel:~$

[Daniel Holbach (dholbach)]

I just mention it here, it's probably not worth keeping this diff.

[Daniel Holbach (dholbach)]

ACKed.

[Sebastien Bacher (seb128)]

[Updating] links2 (2.1pre37-1ubuntu2 [Ubuntu] < 2.1pre37-1.1 [Debian])
 * Trying to add links2...
  - <links2_2.1pre37-1.1.dsc: downloading from http://ftp.debian.org/debian/>
  - <links2_2.1pre37.orig.tar.gz: already in distro - downloading from librarian>
  - <links2_2.1pre37-1.1.diff.gz: downloading from http://ftp.debian.org/debian/>
I: links2 [universe] -> links2_2.1pre37-1ubuntu2 [universe].
I: links2 [universe] -> links_2.1pre37-1ubuntu2 [universe].