[tkhtml3] 01/01: Push to newest standards (3.9.5) and dh (9) and solve lintian warnings

Mon Apr 14 13:15:14 UTC 2014

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository tkhtml3.

commit f29c590a3281414d50d965e38789833a5558c63d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Apr 14 15:14:50 2014 +0200

    Push to newest standards (3.9.5) and dh (9) and solve lintian warnings
---
 debian/changelog                      |  3 ++-
 debian/compat                         |  2 +-
 debian/control                        | 14 +++++++-------
 debian/copyright                      |  6 +++---
 debian/hv3.install                    |  2 +-
 debian/patches/configure_shlibs.patch | 34 +++++++++++++++++++++++++++++-----
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4223da..a8afe82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 tk-html3 (3.0~fossil20110109-3) unstable; urgency=low
 
+  * Push to newest standards (3.9.5) and dh (9) and solve lintian warnings
   * Remove some asserts to make it more stable [Stefan Ziegler]
 
- -- Ole Streicher <debian at liska.ath.cx>  Mon, 29 Apr 2013 10:16:15 +0200
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 14 Apr 2014 14:31:32 +0200
 
 tk-html3 (3.0~fossil20110109-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index ab58d60..450aae5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,16 @@
 Source: tk-html3
 Priority: optional
 Maintainer: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, tcl-dev, tk-dev
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), dh-autoreconf, tcl-dev, tk-dev
+Standards-Version: 3.9.5
 Section: interpreters
 Homepage: http://tkhtml.tcl.tk/index.html
-Vcs-Git: git://git.debian.org/git/debian-science/packages/tkhtml3.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/tkhtml3.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/tkhtml3.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/tkhtml3.git
 
 Package: tk-html3
 Architecture: any
-Depends: ${tk:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${tk:Depends}
 Description: Render HTML and CSS content with tk
  Tkhtml3 is a Tk widget that displays content formatted according to
  the HTML and CSS standards. Tkhtml3 is not an end-user application, it
@@ -22,11 +22,11 @@ Description: Render HTML and CSS content with tk
 Package: hv3
 Section: web
 Architecture: all
-Depends: ${tk:Depends}, ${misc:Depends}, tk-html3, libsqlite3-tcl, tcllib
+Depends: libsqlite3-tcl, tcllib, tk-html3, ${misc:Depends}, ${tk:Depends}
 Recommends: libtk-img, tcl-tls
 Description: Lightweight web browser
  Hv3 is a cross-platform web browser with support for modern web
  standards like HTML, CSS, HTTP.
  .
- ECMAScript (a.k.a. javascript) is not supported since the corresponding 
+ ECMAScript (a.k.a. javascript) is not supported since the corresponding
  library (SEE) is installed (not available in Debian yet).
diff --git a/debian/copyright b/debian/copyright
index 73b7037..d8fd231 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -71,7 +71,7 @@ License: MIT alike
  .
  GOVERNMENT USE: If you are acquiring this software on behalf of the
  U.S. government, the Government shall have only "Restricted Rights"
- in the software and related documentation as defined in the Federal 
+ in the software and related documentation as defined in the Federal
  Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
  are acquiring the software on behalf of the Department of Defense, the
  software shall be classified as "Commercial Computer Software" and the
@@ -102,7 +102,7 @@ License: GPLv2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  General Public License for more details.
  .
- On Debian systems, the complete text of the GNU General 
+ On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
  .
  Author contact information:
@@ -125,7 +125,7 @@ License: LGPLv2+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
  .
- On Debian systems, the complete text of the GNU Library General 
+ On Debian systems, the complete text of the GNU Library General
  Public License can be found in `/usr/share/common-licenses/LGPL-2'.
  .
  Author contact information:
diff --git a/debian/hv3.install b/debian/hv3.install
index 5b3f574..4aef379 100644
--- a/debian/hv3.install
+++ b/debian/hv3.install
@@ -1,4 +1,4 @@
+debian/hv3.desktop /usr/share/applications
 hv/[a-r]*.tcl /usr/share/hv3
 hv/hv3 usr/bin
 hv/hv3.1 usr/share/man/man1
-debian/hv3.desktop /usr/share/applications
diff --git a/debian/patches/configure_shlibs.patch b/debian/patches/configure_shlibs.patch
index 134a0bc..4df0da1 100644
--- a/debian/patches/configure_shlibs.patch
+++ b/debian/patches/configure_shlibs.patch
@@ -1,9 +1,19 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Description: Configure shared libs for hurd-i386 and kfreeBSD-* correctly.
+Description: Configure shared libs for hurd-i386 and kfreeBSD-* correctly
+ and propagate LDFLAGS
 Bug-Debian: http://bugs.debian.org/692301
 --- a/tclconfig/tcl.m4
 +++ b/tclconfig/tcl.m4
-@@ -1469,13 +1469,13 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1447,7 +1447,7 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD="${CC} -shared"
++	    SHLIB_LD="${CC} -shared ${LDFLAGS}"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+@@ -1469,13 +1469,13 @@
  	    fi
  
  	    ;;
@@ -13,13 +23,23 @@ Bug-Debian: http://bugs.debian.org/692301
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
  
- 	    SHLIB_LD="${CC} -shared"
+-	    SHLIB_LD="${CC} -shared"
 -	    DL_OBJS=""
++	    SHLIB_LD="${CC} -shared ${LDFLAGS}"
 +	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
  	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
  	    CC_SEARCH_FLAGS=""
-@@ -1576,7 +1576,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1552,7 +1552,7 @@
+ 	    *)
+ 		SHLIB_CFLAGS="-fpic";;
+ 	    esac
+-	    SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
++	    SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS}"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+@@ -1576,10 +1576,10 @@
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -27,4 +47,8 @@ Bug-Debian: http://bugs.debian.org/692301
 +	FreeBSD-*|GNU/kFreeBSD*)
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="ld -Bshareable -x"
+-	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD="ld -Bshareable -x ${LDFLAGS}"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/tkhtml3.git

