[Pkg-tcltk-commits] r1874 - tdom/trunk/debian
geox-guest at alioth.debian.org
geox-guest at alioth.debian.org
Sat Aug 26 15:52:53 UTC 2017
Author: geox-guest
Date: 2017-08-26 15:52:53 +0000 (Sat, 26 Aug 2017)
New Revision: 1874
Modified:
tdom/trunk/debian/changelog
tdom/trunk/debian/control
tdom/trunk/debian/rules
Log:
* Multiarch support.
Modified: tdom/trunk/debian/changelog
===================================================================
--- tdom/trunk/debian/changelog 2017-08-25 09:24:22 UTC (rev 1873)
+++ tdom/trunk/debian/changelog 2017-08-26 15:52:53 UTC (rev 1874)
@@ -1,7 +1,16 @@
tdom (0.9.0-1) UNRELEASED; urgency=medium
+ * Team upload.
* New upstream release: 0.9.0 (...)
+ [ Hector Romojaro ]
+ * Multiarch support.
+ * Update Vcs-* fields.
+ * Bump Standards-Version to 4.1.0.
+ * Hardening options.
+ * Update maintainer (me) email address.
+ * Cosmetic changes in tdom-dev package description.
+
-- Stefan Sobernig <stefan.sobernig at wu-wien.ac.at> Thu, 24 Aug 2017 13:42:46 +0200
tdom (0.8.3-1) unstable; urgency=low
Modified: tdom/trunk/debian/control
===================================================================
--- tdom/trunk/debian/control 2017-08-25 09:24:22 UTC (rev 1873)
+++ tdom/trunk/debian/control 2017-08-26 15:52:53 UTC (rev 1874)
@@ -2,15 +2,16 @@
Section: libs
Priority: optional
Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
-Uploaders: Hector Romojaro <hromojaro at dia.uned.es>, Stefan Sobernig <stefan.sobernig at wu-wien.ac.at>, Avni Khatri <avni321 at gmail.com>, Carl Blesius <carl at blesius.org>
+Uploaders: Hector Romojaro <hector.romojaro at gmail.com>, Stefan Sobernig <stefan.sobernig at wu-wien.ac.at>, Avni Khatri <avni321 at gmail.com>, Carl Blesius <carl at blesius.org>
Build-Depends: debhelper (>= 9), autotools-dev, tcl-dev (>= 8.4), libexpat1-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
Homepage: http://tdom.github.io/
Vcs-Svn: svn://anonscm.debian.org/pkg-tcltk/tdom/trunk
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-tcltk/tdom/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-tcltk/tdom/
Package: tdom
Architecture: any
+Multi-Arch: same
Depends: ${tclsh:Depends}, ${shlibs:Depends}, ${misc:Depends}
Description: fast XML/DOM/XPath/XSLT extension for Tcl written in C
tDOM takes advantage of Expat, the XML parser from James Clark,
@@ -24,12 +25,12 @@
Package: tdom-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: tdom (= ${binary:Version}), ${misc:Depends}
Description: fast XML/DOM/XPath/XSLT extension for Tcl written in C (development files)
- This package contains the header files and development libraries for
- tDOM, a fast XML/DOM/XPath/XSLT extension for Tcl. tDOM takes
- advantage of Expat, the XML parser from James Clark. It comes with a
- (partial) DOM-I and DOM-II implementation in C for maximum performance
- and minimum memory need. A very complete, compliant and fast XPath
- implementation is provided. A fast XSLT implementation in C
+ Header files and development libraries for tDOM, a fast XML/DOM/XPath/XSLT
+ extension for Tcl. tDOM takes advantage of Expat, the XML parser from James
+ Clark. It comes with a (partial) DOM-I and DOM-II implementation in C for
+ maximum performance and minimum memory need. A very complete, compliant and
+ fast XPath implementation is provided. A fast XSLT implementation in C
completes the feature set.
Modified: tdom/trunk/debian/rules
===================================================================
--- tdom/trunk/debian/rules 2017-08-25 09:24:22 UTC (rev 1873)
+++ tdom/trunk/debian/rules 2017-08-26 15:52:53 UTC (rev 1874)
@@ -3,6 +3,12 @@
#export DH_VERBOSE=1
#export DH_OPTIONS=-v
+# Hardening
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# Multiarch support
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
%:
dh $@ --with autotools-dev
@@ -47,7 +53,7 @@
VERSION=$(shell grep -m 1 AC_INIT configure.in | sed -e 's/AC_INIT(\[tdom\], \[//g' -e 's/\])//g')
DEV=$(CURDIR)/debian/tdom-dev
-ARCH_DEPENDENT=$(CURDIR)/debian/tdom/usr/lib/tcltk
+ARCH_DEPENDENT=$(CURDIR)/debian/tdom/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
override_dh_auto_configure:
# Add here commands to configure the package.
@@ -56,8 +62,8 @@
--prefix=$(CURDIR)/debian/tdom/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-tcl=/usr/lib/ \
- --libdir=\$${prefix}/lib/tcltk \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/ \
+ --libdir=\$${prefix}/lib/tcltk/$(DEB_HOST_MULTIARCH) \
--enable-threads \
--includedir=$(DEV)/usr/include/tdom \
--with-expat=/usr )
@@ -68,8 +74,8 @@
--prefix=$(CURDIR)/debian/tdom/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-tcl=/usr/lib/ \
- --libdir=\$${prefix}/lib/tcltk \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/ \
+ --libdir=\$${prefix}/lib/tcltk/$(DEB_HOST_MULTIARCH) \
--enable-threads \
--includedir=$(DEV)/usr/include/tdom \
--with-expat=/usr )
@@ -80,8 +86,8 @@
--prefix=$(CURDIR)/debian/tdom/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-tcl=/usr/lib/ \
- --libdir=\$${prefix}/lib/tcltk \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/ \
+ --libdir=\$${prefix}/lib/tcltk/$(DEB_HOST_MULTIARCH) \
--enable-threads \
--includedir=$(DEV)/usr/include/tdom \
--with-expat=/usr )
@@ -129,24 +135,24 @@
# cp -R $(TARGET)/usr/include/tdom/* $(DEV)/usr/include/tdom
# move and fix tdomConfig.sh
- install -d -m 755 -o root -g root $(DEV)/usr/lib/tcltk/tdom$(VERSION)
- mv $(ARCH_DEPENDENT)/tdomConfig.sh $(DEV)/usr/lib/tcltk/tdom$(VERSION)/
+ install -d -m 755 -o root -g root $(DEV)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)
+ mv $(ARCH_DEPENDENT)/tdomConfig.sh $(DEV)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)/
perl -i -p \
- -e "s|^(TDOM_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/tdom$(VERSION) -ltdomstub$(VERSION)'|;" \
- -e "s|^(TDOM_BUILD_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/tdom$(VERSION)/libtdomstub$(VERSION).a'|;" \
- -e "s|^(TDOM_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/tdom$(VERSION) -ltdomstub$(VERSION)'|;" \
- -e "s|^(TDOM_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/tdom$(VERSION)/libtdomstub$(VERSION).a'|;" \
- $(DEV)/usr/lib/tcltk/tdom$(VERSION)/tdomConfig.sh
+ -e "s|^(TDOM_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION) -ltdomstub$(VERSION)'|;" \
+ -e "s|^(TDOM_BUILD_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)/libtdomstub$(VERSION).a'|;" \
+ -e "s|^(TDOM_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION) -ltdomstub$(VERSION)'|;" \
+ -e "s|^(TDOM_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)/libtdomstub$(VERSION).a'|;" \
+ $(DEV)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)/tdomConfig.sh
#install -d -m 755 -o root -g root $(DEV)/usr/lib/tcltk/tdom$(VERSION)
# `- provide symlinks
- (cd $(DEV)/usr/lib; \
- ln -sf ../lib/tcltk/tdom$(VERSION)/tdomConfig.sh;)
+ (cd $(DEV)/usr/lib/$(DEB_HOST_MULTIARCH); \
+ ln -sf ../../lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)/tdomConfig.sh;)
# move tDOM stub library
- mv $(ARCH_DEPENDENT)/tdom$(VERSION)/*.a $(DEV)/usr/lib/tcltk/tdom$(VERSION)/
+ mv $(ARCH_DEPENDENT)/tdom$(VERSION)/*.a $(DEV)/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/tdom$(VERSION)/
override_dh_installchangelogs:
dh_installchangelogs ChangeLog
More information about the Pkg-tcltk-commits
mailing list