[pkg-lynx-commits] [lynx-cur] 04/05: Further refine Elimar's changes

[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 06929828fffe98931b574397d5416e2c40101b21
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Dec 7 04:23:06 2015 +0100

    Further refine Elimar's changes
---
 debian/changelog             |  7 ++++---
 debian/control               | 11 ++++++++---
 debian/lynx.links            |  8 +++++++-
 debian/patches/lynxcfg.patch |  2 +-
 debian/rules                 |  4 +++-
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2564731..5c2e7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,9 +10,10 @@ lynx (2.8.9dev6-6) UNRELEASED; urgency=medium
     non-transitional packages and shipped different versions.)
 
   [ Elimar Riesebieter ]
-  * Break out lynx-common. Lintian won't note an
-    "arch-dep-package-has-big-usr-share" anymore. We'll save arround 1,1M per
-    (arch-1). Around 2M (depends on arch) are preserved for the binary package.
+  * Break out a lynx-common package. Lintian won't emit an
+    "arch-dep-package-has-big-usr-share" warning anymore. We'll save
+    arround 1.1 MB (arch-1) times. Around 2 MB (depends on architecture)
+    are preserved for the binary package. (Closes: #797442)
 
  -- Elimar Riesebieter <riesebie at lxtec.de>  Sun, 30 Aug 2015 09:48:14 +0200
 
diff --git a/debian/control b/debian/control
index 976e5bf..0e9e779 100644
--- a/debian/control
+++ b/debian/control
@@ -27,13 +27,18 @@ Package: lynx-common
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: lynx
+Breaks: lynx-cur (<< 2.8.9dev6-6~),
+        lynx-cur-wrapper (<< 2.8.8dev.8-2)
+Replaces: lynx-cur (<< 2.8.9dev6-6~),
+          lynx-cur-wrapper (<< 2.8.8dev.8-2)
 Description: shared files for lynx-cur package
  In continuous development since 1992, Lynx sets the standard for
  text-mode web clients.
  .
- This package contains files shared by the lynx-cur package over any arch
- available in Debian.  Examples of such shared files are: manpages, locale and
- mimetype definitions, and configuration files.
+ This package contains architecture-independent files shared by the
+ lynx package over any architecture available in Debian.  Examples of
+ such shared files are: manpages, locale and mimetype definitions, and
+ configuration files.
 
 Package: lynx
 Architecture: any
diff --git a/debian/lynx.links b/debian/lynx.links
index 5355f7b..3aac4ac 100644
--- a/debian/lynx.links
+++ b/debian/lynx.links
@@ -1 +1,7 @@
-/usr/share/doc/lynx-common	/usr/share/doc/lynx
+usr/share/doc/lynx-common/README.Debian usr/share/doc/lynx/README.Debian
+usr/share/doc/lynx-common/README.gz     usr/share/doc/lynx/README.gz
+usr/share/doc/lynx-common/PROBLEMS.gz   usr/share/doc/lynx/PROBLEMS.gz
+usr/share/doc/lynx-common/COPYHEADER    usr/share/doc/lynx/COPYHEADER
+usr/share/doc/lynx-common/changelog.gz  usr/share/doc/lynx/changelog.gz
+usr/share/doc/lynx-common/lynx_help     usr/share/doc/lynx/lynx_help
+usr/share/doc/lynx-common/docs          usr/share/doc/lynx/docs
diff --git a/debian/patches/lynxcfg.patch b/debian/patches/lynxcfg.patch
index c3d5fd7..d83bf9c 100644
--- a/debian/patches/lynxcfg.patch
+++ b/debian/patches/lynxcfg.patch
@@ -23,7 +23,7 @@ Last-Update: 2015-Dec-07
  .ex
 -#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
 +##HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
-+HELPFILE:file://localhost/usr/share/doc/lynx/lynx_help/lynx_help_main.html
++HELPFILE:file://localhost/usr/share/doc/lynx-common/lynx_help/lynx_help_main.html
  
  .h2 DEFAULT_INDEX_FILE
  # DEFAULT_INDEX_FILE is the default file retrieved when the
diff --git a/debian/rules b/debian/rules
index 678c03f..7fcc471 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,10 @@ override_dh_auto_install:
 	cd debian/tmp/usr/share/lynx_help && rm -vf COPYING COPYHEADER
 	cd debian/tmp/usr/share/lynx_doc && rm -rvf CHANGES \
 		COPYHEADER.asc COPYING COPYING.asc samples test
+
 override_dh_link:
-	rm -rf debian/lynx-cur/usr/share/doc/lynx-cur
+	rm -v debian/lynx/usr/share/doc/lynx/changelog
 	dh_link
+
 %:
 	dh $@ --parallel --with autotools_dev

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