diff -Nru libdatrie-0.2.10/debian/changelog libdatrie-0.2.10/debian/changelog --- libdatrie-0.2.10/debian/changelog 2015-10-20 07:19:48.000000000 +0000 +++ libdatrie-0.2.10/debian/changelog 2016-02-01 15:08:51.000000000 +0000 @@ -1,3 +1,19 @@ +libdatrie (0.2.10-2) unstable; urgency=medium + + * Use system jquery.js for doc package [lintian]. + - d/control: Add dependency on libjs-jquery. + - d/rules: Exclude jquery.js on dh_install. + - d/libdatrie-doc.links: Add symlinks for jquery.js to system file. + - d/control: Demote web browser from Depends to Suggests; + Use iceweasel instead of lynx. + * Convert rules to dh. + - d/rules: Rewrite rules using dh with appropriate overrides. + - d/compat: Bump to level 9, to get multiarch support from dh. + - d/control: B-Dep on debhelper >= 9. + * Use HTTPS in Vcs-* fields [lintian]. + + -- Theppitak Karoonboonyanan Mon, 01 Feb 2016 22:08:41 +0700 + libdatrie (0.2.10-1) unstable; urgency=medium * Imported Upstream version 0.2.10 diff -Nru libdatrie-0.2.10/debian/compat libdatrie-0.2.10/debian/compat --- libdatrie-0.2.10/debian/compat 2015-10-20 07:19:48.000000000 +0000 +++ libdatrie-0.2.10/debian/compat 2016-02-01 15:08:51.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libdatrie-0.2.10/debian/control libdatrie-0.2.10/debian/control --- libdatrie-0.2.10/debian/control 2015-10-20 07:19:48.000000000 +0000 +++ libdatrie-0.2.10/debian/control 2016-02-01 15:08:51.000000000 +0000 @@ -3,14 +3,14 @@ Maintainer: Theppitak Karoonboonyanan Build-Depends: autoconf-archive, - debhelper (>= 8.1.3), + debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1~) Build-Depends-Indep: doxygen (>= 1.8.8) Standards-Version: 3.9.6 Section: libs -Vcs-Git: git://anonscm.debian.org/collab-maint/libdatrie.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/libdatrie.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/libdatrie.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/libdatrie.git Homepage: http://linux.thai.net/projects/libthai Package: libdatrie-dev @@ -74,7 +74,8 @@ Section: doc Architecture: all Multi-Arch: foreign -Depends: lynx | www-browser, ${misc:Depends} +Depends: libjs-jquery, ${misc:Depends} +Suggests: iceweasel | www-browser Description: Documentation files for double-array trie library Trie is a kind of digital search tree, an efficient indexing method with O(1) time complexity for searching. Comparably as efficient as hashing, diff -Nru libdatrie-0.2.10/debian/libdatrie-doc.links libdatrie-0.2.10/debian/libdatrie-doc.links --- libdatrie-0.2.10/debian/libdatrie-doc.links 1970-01-01 00:00:00.000000000 +0000 +++ libdatrie-0.2.10/debian/libdatrie-doc.links 2016-02-01 15:08:51.000000000 +0000 @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/libdatrie-doc/html/jquery.js diff -Nru libdatrie-0.2.10/debian/rules libdatrie-0.2.10/debian/rules --- libdatrie-0.2.10/debian/rules 2015-10-20 07:19:48.000000000 +0000 +++ libdatrie-0.2.10/debian/rules 2016-02-01 15:08:51.000000000 +0000 @@ -4,129 +4,45 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - build_flags = --build=$(DEB_BUILD_GNU_TYPE) -else - build_flags = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -endif - -dpkg-buildflags = DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" dpkg-buildflags -build_flags += $(shell $(dpkg-buildflags) --export=configure) - SHARED_PKG := libdatrie1 SHLIB_VER := 0.2.0 -config.status: configure.ac - dh_testdir - - [ -d m4 ] || mkdir m4 - dh_autoreconf - - # Add here commands to configure the package. - ./configure --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - $(build_flags) +%: + dh $@ --with autoreconf - -build-indep: build-indep-stamp -build-indep-stamp: config.status - dh_testdir - - # Add here commands to compile the package. +override_dh_auto_build-indep: $(MAKE) -C doc - touch $@ - -build-arch: build-arch-stamp -build-arch-stamp: config.status - dh_testdir - - # Add here commands to compile the package. +override_dh_auto_build-arch: $(MAKE) -C datrie $(MAKE) -C tools $(MAKE) -C man -ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) -C tests check -endif - - touch $@ - -build: build-indep build-arch - -clean: - dh_testdir - dh_testroot - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - dh_autoreconf_clean - dh_clean +# No test for doc +override_dh_auto_test-indep: -install-indep: build-indep - dh_testdir - dh_testroot - dh_prep - dh_installdirs -i +override_dh_auto_test-arch: + $(MAKE) -C tests check - # Add here commands to install the package into debian/tmp +override_dh_auto_install-indep: $(MAKE) -C doc install DESTDIR=$(CURDIR)/debian/tmp -install-arch: build-arch - dh_testdir - dh_testroot - dh_prep - dh_installdirs -a +override_dh_install-indep: + dh_install -i -Xjquery.js - # Add here commands to install the package into debian/tmp +override_dh_auto_install-arch: $(MAKE) -C datrie install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C tools install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C man install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install-am DESTDIR=$(CURDIR)/debian/tmp -# Build architecture-independent files here. -binary-indep: build-indep install-indep - dh_testdir - dh_testroot - dh_installchangelogs -i ChangeLog - dh_installdocs -i - dh_install -i --sourcedir=debian/tmp - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build-arch install-arch - dh_testdir - dh_testroot - dh_installchangelogs -Nlibdatrie-dev -a ChangeLog +override_dh_installchangelogs-arch: + dh_installchangelogs -Nlibdatrie-dev -a + +override_dh_installdocs-arch: dh_installdocs -plibdatrie-dev --link-doc=libdatrie1 dh_installdocs --remaining-packages -a - dh_install -a --sourcedir=debian/tmp - dh_installman -a - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a + +override_dh_makeshlibs: dh_makeshlibs -a -p$(SHARED_PKG) -V'$(SHARED_PKG) (>= $(SHLIB_VER))' \ --add-udeb="libdatrie1-udeb" - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-arch install-indep