[pkg-lynx-commits] [lynx-cur] 01/02: Rename source and primary binary package back to "lynx" again

Axel Beckert abe at deuxchevaux.org
Sat Nov 28 22:42:18 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 5c0e91f8204d29704a1149c42bb5f0f098e0a3d5
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Nov 28 20:56:05 2015 +0100

    Rename source and primary binary package back to "lynx" again
    
    Make "lynx-cur" the transitional package.
    
    Closes: #490265
---
 debian/README.Debian                               | 10 ++--
 debian/changelog                                   |  4 +-
 debian/control                                     | 18 ++++----
 debian/lynx-cur.doc-base                           | 10 ----
 debian/lynx-cur.menu                               |  2 -
 debian/lynx-cur.preinst                            | 53 +++++++++++++++-------
 debian/lynx.doc-base                               | 10 ++++
 debian/{lynx-cur.docs => lynx.docs}                |  0
 debian/{lynx-cur.install => lynx.install}          |  0
 ...ur.lintian-overrides => lynx.lintian-overrides} |  2 +-
 debian/lynx.menu                                   |  2 +
 debian/{lynx-cur.postinst => lynx.postinst}        |  4 +-
 debian/{lynx-cur.postrm => lynx.postrm}            |  4 +-
 debian/lynx.preinst                                | 53 +++++++---------------
 debian/{lynx-cur.prerm => lynx.prerm}              |  2 +-
 debian/rules                                       |  2 +-
 16 files changed, 89 insertions(+), 87 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 3b78a9a..b979efe 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,5 +1,5 @@
-lynx-cur for Debian
-----------------------
+lynx for Debian
+---------------
 
 Developemnet version of lynx with NLS support.
 
@@ -8,7 +8,7 @@ Developemnet version of lynx with NLS support.
    #SSL=ssl
 2. rebuild the package and install it.
 
-* In /etc/lynx-cur/lynx.cfg, we set
+* In /etc/lynx/lynx.cfg, we set
 
 EXTERNAL:ftp:w3m %s:TRUE
 EXTERNAL:file:w3m %s:TRUE
@@ -35,11 +35,11 @@ INCLUDE:~/.lynx/external:EXTERNAL
 the latter will enable you to alter options privately by the files
 ~/.lynx/colors etc.
 
-* In /etc/lynx-cur/local.cfg, you may check the settings of
+* In /etc/lynx/local.cfg, you may check the settings of
 
 STARTFILE:, NNTPSERVER:
 
-* In /etc/lynx-cur/lynx.cfg, you might want to modify the settings of
+* In /etc/lynx/lynx.cfg, you might want to modify the settings of
 
 LOCAL_DOMAIN:, SAVE_SPACE:
 
diff --git a/debian/changelog b/debian/changelog
index 09aa7a3..f867e8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-lynx-cur (2.8.9dev6-6) UNRELEASED; urgency=medium
+lynx (2.8.9dev6-6) UNRELEASED; urgency=medium
 
   * 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)
 
  -- Axel Beckert <abe at debian.org>  Sat, 28 Nov 2015 22:35:26 +0100
 
diff --git a/debian/control b/debian/control
index 985e978..74076a2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: lynx-cur
+Source: lynx
 Section: web
 Priority: extra
 Maintainer: Debian Lynx Packaging Team <pkg-lynx-maint at lists.alioth.debian.org>
@@ -20,19 +20,19 @@ Build-Depends: autotools-dev,
                telnet | telnet-client,
                zlib1g-dev
 Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lynx/lynx-cur.git/
-Vcs-Git: git://anonscm.debian.org/pkg-lynx/lynx-cur.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lynx/lynx.git/
+Vcs-Git: git://anonscm.debian.org/pkg-lynx/lynx.git
 
-Package: lynx-cur
+Package: lynx
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Provides: news-reader,
           www-browser
-Breaks: lynx (<< 2.8.7dev9-1.1),
+Breaks: lynx-cur (<< 2.8.9dev6-6~),
         lynx-cur-wrapper (<< 2.8.8dev.8-2)
-Replaces: lynx (<< 2.8.7dev9-1.1),
+Replaces: lynx-cur (<< 2.8.9dev6-6~),
           lynx-cur-wrapper (<< 2.8.8dev.8-2)
 Conflicts: lynx-ssl
 Recommends: mime-support
@@ -41,12 +41,12 @@ Description: classic non-graphical (text-mode) web browser
  text-mode web clients. It is fast and simple to use, with support for
  browsing via FTP, Gopher, HTTP, HTTPS, NNTP, and the local file system.
 
-Package: lynx
+Package: lynx-cur
 Section: oldlibs
 Architecture: all
 Multi-Arch: foreign
-Depends: lynx-cur (>= 2.8.9dev1),
+Depends: lynx (>= 2.8.9dev6-6~),
          ${misc:Depends}
 Description: Text-mode WWW Browser (transitional package)
  This is a transitional package and can safely be removed; see the
- lynx-cur package instead.
+ lynx package instead.
diff --git a/debian/lynx-cur.doc-base b/debian/lynx-cur.doc-base
deleted file mode 100644
index 37cc438..0000000
--- a/debian/lynx-cur.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: lynx-cur
-Title: Debian Lynx Manual
-Author: Michael Grobe <grobe at ukans.edu> et al.
-Abstract: This manual describes what lynx-cur is
- and how it can be used on Debian systems.
-Section: Network/Web Browsing
-
-Format: HTML
-Index: /usr/share/doc/lynx-cur/lynx_help/lynx_help_main.html.gz
-Files: /usr/share/doc/lynx-cur/lynx_help/*.html.gz
diff --git a/debian/lynx-cur.menu b/debian/lynx-cur.menu
deleted file mode 100644
index 857598c..0000000
--- a/debian/lynx-cur.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(lynx-cur):needs="text" section="Applications/Network/Web Browsing"\
-  title="Lynx-cur" command="lynx"
diff --git a/debian/lynx-cur.preinst b/debian/lynx-cur.preinst
index d9f0499..1d4d4c5 100644
--- a/debian/lynx-cur.preinst
+++ b/debian/lynx-cur.preinst
@@ -1,29 +1,48 @@
 #!/bin/sh
-pack=lynx-cur
 
 set -e
 
-case "$1" in
-    install|upgrade)
-    if dpkg --compare-versions "$2" 'lt-nl' '2.8.8dev.8-2' ; then
-	update-alternatives --remove lynx /usr/bin/lynx.cur
-	update-alternatives --remove www-browser /usr/bin/lynx.cur
+# Inspired by
+# http://wiki.debian.org/DpkgConffileHandling
+# Remove a no-longer used conffile
+rm_or_moveconffile() {
+    PKGNAME="$1"
+    CONFFILE="$2"
+    NEWDIR="$3"
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+        if [ "$md5sum" != "$old_md5sum" ]; then
+	    test -e "$NEWDIR" || mkdir -m 755 -p "$NEWDIR"
+            echo "Obsolete conffile $CONFFILE has been modified by you." 1>&2
+	    if [ -e "$NEWDIR/`basename $CONFFILE`" ]; then
+	        echo "replacement conffile $NEWDIR/`basename $CONFFILE` already exists." 1>&2
+                echo "Saving as $CONFFILE.dpkg-bak ..." 1>&2
+                mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+            else
+                echo "Moving conffile $CONFFILE to new location $NEWDIR" 1>&2
+                mv -f "$CONFFILE" "$NEWDIR/"
+            fi
+        else
+            echo "Removing obsolete conffile $CONFFILE ..." 1>&2
+            rm -f "$CONFFILE"
+        fi
     fi
+}
 
-    ;;
 
-    abort-upgrade)
-    ;;
 
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
+case "$1" in
+    install|upgrade)
+    # Upgrading from a a real, non-dummy lynx-cur package.
+    if dpkg --compare-versions "$2" 'lt-nl' '2.8.9dev6-6~' ; then
+        update-alternatives --quiet --remove www-browser /usr/bin/lynx
+	update-alternatives --quiet --remove lynx-cur /usr/bin/lynx.stable
+        rm_or_moveconffile lynx-cur /etc/lynx-cur/lynx.cfg /etc/lynx
+        rm_or_moveconffile lynx-cur /etc/lynx-cur/lynx.lss /etc/lynx
+    fi
     ;;
+    *)
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
-
-exit 0
diff --git a/debian/lynx.doc-base b/debian/lynx.doc-base
new file mode 100644
index 0000000..f4c847e
--- /dev/null
+++ b/debian/lynx.doc-base
@@ -0,0 +1,10 @@
+Document: lynx
+Title: Debian Lynx Manual
+Author: Michael Grobe <grobe at ukans.edu> et al.
+Abstract: This manual describes what lynx is
+ and how it can be used on Debian systems.
+Section: Network/Web Browsing
+
+Format: HTML
+Index: /usr/share/doc/lynx/lynx_help/lynx_help_main.html.gz
+Files: /usr/share/doc/lynx/lynx_help/*.html.gz
diff --git a/debian/lynx-cur.docs b/debian/lynx.docs
similarity index 100%
rename from debian/lynx-cur.docs
rename to debian/lynx.docs
diff --git a/debian/lynx-cur.install b/debian/lynx.install
similarity index 100%
rename from debian/lynx-cur.install
rename to debian/lynx.install
diff --git a/debian/lynx-cur.lintian-overrides b/debian/lynx.lintian-overrides
similarity index 83%
rename from debian/lynx-cur.lintian-overrides
rename to debian/lynx.lintian-overrides
index 5bdc6b8..8a5a535 100644
--- a/debian/lynx-cur.lintian-overrides
+++ b/debian/lynx.lintian-overrides
@@ -4,4 +4,4 @@
 # previous versions in Debian, so we ignore this specific case of a
 # misspelled project name.
 
-lynx-cur: spelling-error-in-binary usr/bin/lynx XWINDOWS X
+lynx: spelling-error-in-binary usr/bin/lynx XWINDOWS X
diff --git a/debian/lynx.menu b/debian/lynx.menu
new file mode 100644
index 0000000..631d946
--- /dev/null
+++ b/debian/lynx.menu
@@ -0,0 +1,2 @@
+?package(lynx):needs="text" section="Applications/Network/Web Browsing"\
+  title="Lynx" command="lynx"
diff --git a/debian/lynx-cur.postinst b/debian/lynx.postinst
similarity index 90%
rename from debian/lynx-cur.postinst
rename to debian/lynx.postinst
index 8577eca..47ed709 100644
--- a/debian/lynx-cur.postinst
+++ b/debian/lynx.postinst
@@ -1,6 +1,6 @@
 #!/bin/sh
-# postinst script for lynx-beta
-pack=lynx-cur
+# postinst script for lynx
+pack=lynx
 cnfdir=/etc/${pack}
 CONFIGFILE=${cnfdir}/local.cfg
 
diff --git a/debian/lynx-cur.postrm b/debian/lynx.postrm
similarity index 83%
rename from debian/lynx-cur.postrm
rename to debian/lynx.postrm
index c24c857..2df1ee9 100644
--- a/debian/lynx-cur.postrm
+++ b/debian/lynx.postrm
@@ -1,6 +1,6 @@
 #! /bin/sh
-# postrm script for lynx-cur
-pack=lynx-cur
+# postrm script for lynx
+pack=lynx
 cnfdir=/etc/${pack}
 
 set -e
diff --git a/debian/lynx.preinst b/debian/lynx.preinst
index c2e2ce5..c2a81b2 100644
--- a/debian/lynx.preinst
+++ b/debian/lynx.preinst
@@ -1,48 +1,29 @@
 #!/bin/sh
+pack=lynx
 
 set -e
 
-# Inspired by
-# http://wiki.debian.org/DpkgConffileHandling
-# Remove a no-longer used conffile
-rm_or_moveconffile() {
-    PKGNAME="$1"
-    CONFFILE="$2"
-    NEWDIR="$3"
-    if [ -e "$CONFFILE" ]; then
-        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
-        if [ "$md5sum" != "$old_md5sum" ]; then
-	    test -e "$NEWDIR" || mkdir -m 755 -p "$NEWDIR"
-            echo "Obsolete conffile $CONFFILE has been modified by you." 1>&2
-	    if [ -e "$NEWDIR/`basename $CONFFILE`" ]; then
-	        echo "replacement conffile $NEWDIR/`basename $CONFFILE` already exists." 1>&2
-                echo "Saving as $CONFFILE.dpkg-bak ..." 1>&2
-                mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-            else
-                echo "Moving conffile $CONFFILE to new location $NEWDIR" 1>&2
-                mv -f "$CONFFILE" "$NEWDIR/"
-            fi
-        else
-            echo "Removing obsolete conffile $CONFFILE ..." 1>&2
-            rm -f "$CONFFILE"
-        fi
-    fi
-}
-
-
-
 case "$1" in
     install|upgrade)
-    # Upgrading from a a real, non-dummy lynx package.
-    if dpkg --compare-versions "$2" 'lt-nl' '2.8.7dev9-1.1' ; then
-        update-alternatives --quiet --remove www-browser /usr/bin/lynx
-	update-alternatives --quiet --remove lynx /usr/bin/lynx.stable
-        rm_or_moveconffile lynx /etc/lynx.cfg /etc/lynx-cur
-        rm_or_moveconffile lynx /etc/lynx.lss /etc/lynx-cur
+    if dpkg --compare-versions "$2" 'lt-nl' '2.8.8dev.8-2' ; then
+	update-alternatives --remove lynx /usr/bin/lynx.cur
+	update-alternatives --remove www-browser /usr/bin/lynx.cur
     fi
+
     ;;
+
+    abort-upgrade)
+    ;;
+
     *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
 esac
 
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
 #DEBHELPER#
+
+exit 0
diff --git a/debian/lynx-cur.prerm b/debian/lynx.prerm
similarity index 94%
rename from debian/lynx-cur.prerm
rename to debian/lynx.prerm
index 2ab8ea7..b4b3b81 100644
--- a/debian/lynx-cur.prerm
+++ b/debian/lynx.prerm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for lynx-cur
+# prerm script for lynx
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/rules b/debian/rules
index 3612909..71af74b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ endif
 	ZIP=/usr/bin/zip \
 	LIBS="-lbsd" \
 	dh_auto_configure --verbose -- \
-	--sysconfdir=/etc/lynx-cur \
+	--sysconfdir=/etc/lynx \
 	--enable-8bit-toupper --enable-externs \
 	--enable-nsl-fork --enable-cgi-links --enable-exec-links \
 	--enable-exec-scripts --enable-persistent-cookies --enable-nls \

-- 
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