Importing more recent debian/ to elinks.git

Kalle Olavi Niemitalo <[email protected]> Sun, 31 Jul 2011 20:04:47 +0300
Newsgroups gmane.comp.web.links
Message-ID <[email protected]>
--===============0273541858==
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"

--=-=-=

As reported at <http://bugzilla.elinks.cz/show_bug.cgi?id=1117>,
contrib/debian/elinks.desktop is in a pre-standard format that
triggers a warning from the mimeo program.  I could easily fix
that in the upstream elinks sources; however, Debian already has
an up-to-date elinks.desktop file that also includes translations
to a few languages.  To avoid needless forking, I'd like to copy
that version to the elinks-0.12 branch and later merge to master.

Then, to keep authorship information, I think I should also copy
debian/changelog, and perhaps the rest of the debian directory.
According to <http://bugzilla.elinks.cz/show_bug.cgi?id=988>, the
Debian maintainer does not want us to have a debian/ directory in
the ELinks sources, so the files would go in contrib/debian/.
Does that seem reasonable to do?

Also, should I make the commit a merge (from
git://git.debian.org/git/collab-maint/elinks.git#debian/unstable),
or would that just complicate later Debian maintenance?

I suppose another solution would be to move elinks.desktop out of
contrib/debian/ and update AUTHORS accordingly.  It does look a
bit odd that the Arch Linux build script reads a file from a
Debian-specific directory.

--=-=-=
Content-Type: application/pgp-signature

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

iEYEARECAAYFAk41izQACgkQHm9IGt60eMjxGQCfcVfnnon0PuYshvnPwwvA7zuG
gEEAniDf+W06dx0Ez3MEKlPjh1x34hwM
=XOOu
-----END PGP SIGNATURE-----
--=-=-=--

--===============0273541858==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
elinks-dev mailing list
[email protected]
http://linuxfromscratch.org/mailman/listinfo/elinks-dev

--===============0273541858==--