[pkg-lynx-commits] [lynx-cur] 01/03: Merge branch 'master' into renaming-back

[Axel Beckert]

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 46994866c4e2f5f47ded3565d2745d8fdb74c90d
Merge: f2c0d02 7f6023b
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Dec 22 22:32:16 2015 +0100

    Merge branch 'master' into renaming-back

 CHANGES                           |    7 +-
 PACKAGE/debian/changelog          |    4 +-
 PACKAGE/lynx.nsi                  |    6 +-
 PACKAGE/lynx.spec                 |    4 +-
 PACKAGE/version.iss               |    2 +-
 WWW/Library/Implementation/HTTP.c |    8 +-
 configure                         |    2 +-
 configure.in                      |    6 +-
 debian/changelog                  |   37 +-
 debian/upstream/signing-key.asc   |   24 +
 debian/watch                      |    4 +
 lynx.cfg                          |    6 +-
 makefile.in                       |    4 +-
 po/et.po                          | 1554 ++++++++++---------
 po/fr.po                          | 1564 +++++++++----------
 po/sl.po                          |    2 +-
 po/vi.po                          | 1718 +++++++++++----------
 po/zh_CN.po                       | 2977 +++++++++++++++----------------------
 src/LYIcon.rc                     |   10 +-
 userdefs.h                        |    6 +-
 20 files changed, 3842 insertions(+), 4103 deletions(-)

diff --cc debian/changelog
index d054465,289318e..a1aa4ac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,39 -1,16 +1,34 @@@
- 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
++lynx (2.8.9dev8-2) 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
++ -- Axel Beckert <abe at debian.org>  Tue, 22 Dec 2015 22:31:34 +0100
++
+ lynx-cur (2.8.9dev8-1) unstable; urgency=low
+ 
+   * New upstream development 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.
+   * Add additional upstream signing key (702353E0F7E48EDB).
+   * Add ftp://invisible-island.net/lynx/tarballs/ to debian/watch as it
+     seems to contain a different set of files.
+ 
+  -- Axel Beckert <abe at debian.org>  Tue, 22 Dec 2015 22:17:18 +0100
  
  lynx-cur (2.8.9dev6-5) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git