[pkg-lynx-commits] [lynx-cur] 01/01: Merge branch 'master' into renaming-back
Axel Beckert
abe at deuxchevaux.org
Sun Dec 20 23:16:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch renaming-back
in repository lynx-cur.
commit f2c0d02cedb48e629b11304a512d49eb75c40100
Merge: 1173a13 0aeb915
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sun Dec 20 22:06:27 2015 +0100
Merge branch 'master' into renaming-back
ABOUT-NLS | 7 +-
CHANGES | 64 +-
COPYHEADER | 8 +-
INSTALLATION | 5 +-
LYMessages_en.h | 30 +-
PACKAGE/debian/changelog | 4 +-
PACKAGE/debian/control | 2 +-
PACKAGE/debian/copyright | 14 +-
PACKAGE/debian/watch | 2 +-
PACKAGE/lynx.nsi | 8 +-
PACKAGE/lynx.spec | 6 +-
PACKAGE/version.iss | 4 +-
README | 12 +-
WWW/Library/Implementation/HTGopher.c | 14 +-
WWW/Library/Implementation/HTMIME.c | 4 +-
WWW/Library/Implementation/HTTP.c | 66 +-
WWW/Library/Implementation/dtd_util.c | 14 +-
WWW/Library/Implementation/hdr_HTMLDTD.h | 23 +-
WWW/Library/Implementation/makefile.in | 23 +-
WWW/Library/Implementation/src0_HTMLDTD.h | 50 +-
WWW/Library/Implementation/src0_HTMLDTD.txt | 477 +-
WWW/Library/Implementation/src1_HTMLDTD.h | 50 +-
WWW/Library/Implementation/src1_HTMLDTD.txt | 477 +-
WWW/Library/Implementation/tidy_tls.h | 12 +-
aclocal.m4 | 187 +-
config.guess | 14 +-
config.hin | 3 +-
config.sub | 11 +-
configure | 7449 ++++++++++----------
configure.in | 9 +-
debian/changelog | 17 +
debian/patches/20_use_gzip-n.diff | 33 -
debian/patches/40_reproducible_build.diff | 62 -
debian/patches/add_client_certificate_support.diff | 251 -
debian/patches/fix-typos.diff | 34 -
debian/patches/gnutls_add_rehandshake_support.diff | 80 -
debian/patches/gnutls_set_default_priority.diff | 36 -
debian/patches/lynxcfg.patch | 24 +-
debian/patches/manpage_improved.patch | 17 -
debian/patches/series | 8 -
debian/patches/use-dpkg-buildflags.patch | 20 -
debian/rules | 2 +-
docs/OS-390.announce | 2 +-
lynx.cfg | 45 +-
lynx.man | 17 +-
lynx_help/Lynx_users_guide.html | 27 +-
lynx_help/about_lynx.html | 4 +-
lynx_help/lynx-dev.html | 15 +-
lynx_help/lynx_help_main.html | 12 +-
makefile.in | 6 +-
po/ca.po | 3165 +++++----
po/et.po | 2 +-
po/lynx.pot | 1563 ++--
po/makefile.inn | 8 +-
po/sl.po | 4 +-
po/sv.po | 2422 +++----
samples/lynx-demo.cfg | 2 +-
samples/lynx_bookmarks.htm | 4 +-
scripts/cfg_edit.sh | 2 +-
src/GridText.c | 3 +-
src/HTML.c | 18 +-
src/LYCookie.c | 7 +-
src/LYEditmap.c | 1076 +--
src/LYForms.c | 151 +-
src/LYGlobalDefs.h | 13 +-
src/LYHistory.c | 4 +-
src/LYIcon.rc | 12 +-
src/LYKeymap.c | 274 +-
src/LYKeymap.h | 7 +-
src/LYMain.c | 70 +-
src/LYOptions.c | 53 +-
src/LYReadCFG.c | 5 +-
src/LYSession.c | 4 +-
src/LYStrings.c | 72 +-
src/LYStrings.h | 3 +-
src/LYrcFile.c | 30 +-
src/LYrcFile.h | 6 +-
src/UCdomap.c | 9 +-
src/chrtrans/makefile.in | 4 +-
src/tidy_tls.c | 187 +-
userdefs.h | 16 +-
81 files changed, 9666 insertions(+), 9291 deletions(-)
diff --cc debian/changelog
index bcd00ba,3525114..d054465
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,14 +1,40 @@@
++lynx (2.8.9dev7-2) UNRELEASED; urgency=medium
++
++ * Merge lynx-cur 2.8.9dev7-1 into the lynx source package
++
++ -- Axel Beckert <abe at debian.org> Sun, 20 Dec 2015 22:00:23 +0100
++
+ lynx-cur (2.8.9dev7-1) UNRELEASED; urgency=medium
+
+ * New upstream developement release.
+ + Remove all patches applied upstream (partially applied modified)
+ + export NO_BUILDSTAMP to make build reproducible (instead of
+ patching)
+ * Prefix all debhelper files with the according package name for
+ consistency.
+
+ -- Axel Beckert <abe at debian.org> Sun, 20 Dec 2015 17:36:12 +0100
+
+lynx (2.8.9dev6-6) experimental; urgency=low
+
+ [ Axel Beckert ]
+ * Prefix all debhelper files with the according package name for
+ consistency.
+ * Rename source and primary binary package back to "lynx" again, make
+ "lynx-cur" the transitional package. (Closes: #490265)
+ * Change source package back to "Priority: optional". ("Priority: extra"
+ dates back to the time where lynx and lynx-cur both were
+ non-transitional packages and shipped different versions.)
+
+ [ Elimar Riesebieter ]
+ * Break out a lynx-common package. Lintian won't emit an
+ "arch-dep-package-has-big-usr-share" warning anymore. We'll save
+ around 1.1 MB (arch-1) times. Around 2 MB (depends on architecture)
+ are preserved for the binary package. (Closes: #797442)
+ * Add myself to uploaders.
+
+ -- Axel Beckert <abe at debian.org> Mon, 07 Dec 2015 23:33:58 +0100
+
lynx-cur (2.8.9dev6-5) unstable; urgency=medium
* Change Homepage header and watch file since lynx.isc.org is deprecated.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git
More information about the pkg-lynx-commits
mailing list