diff -Nru w3m-el-1.4.632+0.20181112/debian/changelog w3m-el-1.4.632+0.20181112/debian/changelog --- w3m-el-1.4.632+0.20181112/debian/changelog 2020-04-21 10:42:33.000000000 +0000 +++ w3m-el-1.4.632+0.20181112/debian/changelog 2020-07-05 15:28:13.000000000 +0000 @@ -1,3 +1,11 @@ +w3m-el (1.4.632+0.20181112-4) unstable; urgency=medium + + * New patch 070_duckduckgo.patch to update URL for DuckDuckGo + * Update debian/watch + * Update debhelper-compat to 13 + + -- Tatsuya Kinoshita Mon, 06 Jul 2020 00:28:13 +0900 + w3m-el (1.4.632+0.20181112-3) unstable; urgency=medium * New patch 060_mailcap.patch to prevent w3m-content-type-alist takes ages diff -Nru w3m-el-1.4.632+0.20181112/debian/control w3m-el-1.4.632+0.20181112/debian/control --- w3m-el-1.4.632+0.20181112/debian/control 2020-04-21 10:40:47.000000000 +0000 +++ w3m-el-1.4.632+0.20181112/debian/control 2020-07-05 15:25:41.000000000 +0000 @@ -2,7 +2,7 @@ Section: lisp Priority: optional Maintainer: Tatsuya Kinoshita -Build-Depends: debhelper-compat (= 12) +Build-Depends: debhelper-compat (= 13) Build-Depends-Indep: emacs-nox | emacs | emacs25 | emacs24 | emacs23, autoconf Homepage: https://emacs-w3m.github.io/ Vcs-Browser: https://salsa.debian.org/debian/w3m-el diff -Nru w3m-el-1.4.632+0.20181112/debian/patches/070_duckduckgo.patch w3m-el-1.4.632+0.20181112/debian/patches/070_duckduckgo.patch --- w3m-el-1.4.632+0.20181112/debian/patches/070_duckduckgo.patch 1970-01-01 00:00:00.000000000 +0000 +++ w3m-el-1.4.632+0.20181112/debian/patches/070_duckduckgo.patch 2020-07-05 15:10:12.000000000 +0000 @@ -0,0 +1,19 @@ +Subject: Update url for duckduckgo search engine +Origin: upstream, https://github.com/emacs-w3m/emacs-w3m/commit/09d8b32b3f103bb19f9bbb87ecccd2f32553cba8 +Bug: https://github.com/emacs-w3m/emacs-w3m/issues/78 + +2020-07-01 Boruch Baum + + * w3m-search.el (w3m-search-engine-alist): Update url for duckduckgo. + +--- a/w3m-search.el ++++ b/w3m-search.el +@@ -214,7 +214,7 @@ __mk_ja_JP=%%83J%%83%%5E%%83J%%83i&url=search-alias%%3Daps&field-keywords=%s" + ("ja.wikipedia" "https://ja.wikipedia.org/wiki/Special:Search?search=%s" + utf-8) + ("msdn" "https://search.msdn.microsoft.com/search/default.aspx?query=%s") +- ("duckduckgo" "https://duckduckgo.com/?q=%s" utf-8))) ++ ("duckduckgo" "https://lite.duckduckgo.com/lite" utf-8 "q=%s"))) + "*An alist of search engines. + Each element looks like (ENGINE ACTION CODING POST-DATA) + ENGINE is a string, the name of the search engine. diff -Nru w3m-el-1.4.632+0.20181112/debian/patches/series w3m-el-1.4.632+0.20181112/debian/patches/series --- w3m-el-1.4.632+0.20181112/debian/patches/series 2020-04-18 16:29:57.000000000 +0000 +++ w3m-el-1.4.632+0.20181112/debian/patches/series 2020-07-05 15:00:51.000000000 +0000 @@ -4,3 +4,4 @@ 040_nnheader.patch 050_symlink.patch 060_mailcap.patch +070_duckduckgo.patch diff -Nru w3m-el-1.4.632+0.20181112/debian/watch w3m-el-1.4.632+0.20181112/debian/watch --- w3m-el-1.4.632+0.20181112/debian/watch 2007-11-25 01:56:30.000000000 +0000 +++ w3m-el-1.4.632+0.20181112/debian/watch 2020-07-05 15:20:20.000000000 +0000 @@ -1,3 +1,4 @@ -version=3 -opts="uversionmangle=s/beta/~beta/;s/rc/~rc/" \ -http://emacs-w3m.namazu.org/ emacs-w3m-([0-9]+\..*)\.tar\.gz debian uupdate +version=4 +opts="filenamemangle=s%(?:.*/)?w3m-el-snapshot_(\d[\d.+a-z]*)\.orig\.tar\.([a-z]+)%w3m-el-$1.tar.$2%" \ +https://packages.debian.org/source/stable/w3m-el-snapshot \ +(?:.*/)?w3m-el-snapshot_(\d[\d.+a-z]*)\.orig\.tar\.[a-z]+ debian uupdate