------------------------------------------------------------ revno: 89 fixes bug: http://bugs.debian.org/654511 committer: Dmitrijs Ledkovs <[email protected]> branch nick: xiphos timestamp: Wed 2012-02-22 23:59:46 +0000 message: * Build using webkit backend * Contains unpacked source for waf binary (Closes: #654511) added: debian/source.lintian-overrides modified: debian/changelog debian/control debian/rules debian/watch debian/xiphos-data.install
-- lp:xiphos/debian https://code.launchpad.net/~pkgcrosswire/xiphos/main Your team CrossWire Packaging Team is subscribed to branch lp:xiphos/debian. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/xiphos/main/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2012-02-22 23:40:53 +0000 +++ debian/changelog 2012-02-22 23:59:46 +0000 @@ -1,8 +1,11 @@ xiphos (3.1.5+dfsg-1) UNRELEASED; urgency=low + [ Dmitrijs Ledkovs <[email protected]> ] * New upstream release. + * Build using webkit backend + * Contains unpacked source for waf binary (Closes: #654511) - -- Dmitrijs Ledkovs <[email protected]> Wed, 22 Feb 2012 23:39:29 +0000 + -- Dmitrijs Ledkovs <[email protected]> Wed, 22 Feb 2012 22:18:12 +0000 xiphos (3.1.4-3) unstable; urgency=low === modified file 'debian/control' --- debian/control 2011-06-25 14:17:06 +0000 +++ debian/control 2012-02-22 23:59:46 +0000 @@ -2,13 +2,11 @@ Build-Depends: debhelper (>= 7.0.50~), libsword-dev (>=1.5.11), rarian-compat, - libgtkhtml3.14-dev, - libgtkhtml-editor-3.14-dev | libgtkhtml-editor-dev | gtkhtml3.14, + libgtkhtml-4.0-dev | libgtkhtml3.14-dev, + libgtkhtml-editor-4.0-dev | libgtkhtml-editor-3.14-dev | libgtkhtml-editor-dev | gtkhtml3.14, + libwebkitgtk-3.0-dev | libwebkitgtk-dev, gnome-doc-utils, intltool, - libgtk2.0-dev, - libgsf-1-dev, - libglade2-dev, libdbus-glib-1-dev, libxml2-dev Section: gnome @@ -22,7 +20,7 @@ Package: xiphos Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xiphos-data (= ${source:Version}), libgtkhtml-editor-3.14-0 | libgtkhtml-editor0 | gtkhtml3.14 +Depends: ${shlibs:Depends}, ${misc:Depends}, xiphos-data (= ${source:Version}) Replaces: xiphos-data Conflicts: xiphos-svn Provides: sword-frontend === modified file 'debian/rules' --- debian/rules 2011-06-25 14:17:06 +0000 +++ debian/rules 2012-02-22 23:59:46 +0000 @@ -4,7 +4,7 @@ %: dh $@ override_dh_auto_configure: - ./waf configure --nocache --prefix=/usr --enable-gtkhtml + ./waf configure --nocache --prefix=/usr override_dh_auto_build: ./waf build --nocache override_dh_auto_install: @@ -14,8 +14,7 @@ override_dh_auto_clean: ./waf distclean --nocache override_dh_clean: + find . -name '*.pyc' -delete dh_clean - rm -rf .waf* - rm -rf waffles/*.pyc override_dh_builddeb: dh_builddeb $(if $(ppa),-- -Zlzma) === added file 'debian/source.lintian-overrides' --- debian/source.lintian-overrides 1970-01-01 00:00:00 +0000 +++ debian/source.lintian-overrides 2012-02-22 23:59:46 +0000 @@ -0,0 +1,13 @@ +# http://wiki.debian.org/UnpackWaf +# +# ....or provide alternative dfsg version of tarball +# genarated using upstream ./waf dist_dfsg command & upload it somewhere. +# +# To be honest, I disagree with FTP teams decision. But I am complying. +# +# Some additional food for though: +# +# http://lintian.debian.org/tags/source-contains-prebuilt-binary.html +# http://lintian.debian.org/tags/source-contains-prebuilt-windows-binary.html +# +xiphos source: debian-watch-file-should-mangle-version === modified file 'debian/watch' --- debian/watch 2009-04-06 22:04:52 +0000 +++ debian/watch 2012-02-22 23:59:46 +0000 @@ -1,2 +1,3 @@ version=3 -http://sf.net/gnomesword/xiphos-(.+)\.tar\.gz +opts="uversionmangle=s/\%2B/\+/" \ +https://launchpad.net/xiphos/+download https://launchpad.net/xiphos/.*/xiphos-(.*)\.tar\.bz2 === modified file 'debian/xiphos-data.install' --- debian/xiphos-data.install 2010-05-19 00:30:58 +0000 +++ debian/xiphos-data.install 2012-02-22 23:59:46 +0000 @@ -1,6 +1,5 @@ usr/share/locale usr/share/xiphos -usr/share/pixmaps usr/share/gnome usr/share/doc/xiphos/Xiphos.ogg usr/share/omf
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
