[Surfraw-commits] [surfraw] 01/01: 2.3.0 release

jason ryan jasonwryan-guest at moszumanska.debian.org
Fri Feb 2 07:36:04 UTC 2018


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

jasonwryan-guest pushed a commit to branch master
in repository surfraw.

commit 8b7e1d1f4f63d07370953ffc3abe492f943c90a2
Author: Jason Ryan <jasonwryan at gmail.com>
Date:   Sat Jan 27 16:40:54 2018 +1300

    2.3.0 release
---
 COPYING          |  2 +-
 ChangeLog        |  6 ++++++
 Makefile.am      | 18 ++++--------------
 NEWS             | 22 ++++++++++++++++++++++
 README           |  8 ++++----
 configure.in     |  9 +--------
 debian/changelog |  9 +++++++++
 debian/copyright |  8 ++++----
 debian/watch     |  2 +-
 elvi.1sr.IN      |  2 +-
 surfraw.1.IN     |  2 +-
 surfraw.IN       |  2 +-
 surfraw.lsm.in   |  4 ++--
 test/Makefile.am | 53 +++++++++++++++++++++++++----------------------------
 14 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/COPYING b/COPYING
index 2db7b7a..0fdb80e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-  Copyright (c) 2003-2013 The Surfraw-Devel Team
+  Copyright (c) 2003-2018 The Surfraw-Devel Team
                            <surfraw-devel at lists.alioth.debian.org>
   Copyright (c) 2000-2001 Julian Assange <proff at iq.org>
   Copyright (c) 2001 Australian Institute for Collaborative Research
diff --git a/ChangeLog b/ChangeLog
index ae2c7f3..3ec3e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-13  Jason Ryan <jasonwryan at gmail.com>
+	* Bump version to 2.3.0
+	* Select Perl version at buildtime (Mark Meyer)
+	* Remove lynx-cur (closes #882286)
+	* Packages the https elvi
+
 2017-06-07  Jason Ryan <jasonwryan at gmail.com>
 
 	* new elvi: wiktionary
diff --git a/Makefile.am b/Makefile.am
index b929c17..0141193 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,7 @@ if OPENSEARCH
 dist_bin_SCRIPTS = opensearch-discover opensearch-genquery
 endif
 devel_extra	= banner prebuild
-if BASHCOMPLETIONS
-noinst_DATA	= surfraw.bookmarks
-else
-noinst_DATA	= surfraw.bookmarks surfraw-bash-completion
-endif
+noinst_DATA	= surfraw-bash-completion surfraw.bookmarks
 man_MANS = surfraw-update-path.1 surfraw.1 elvi.1sr
 if OPENSEARCH
 man_MANS += opensearch-discover.1 opensearch-genquery.1
@@ -20,7 +16,7 @@ debian_extra = debian/NEWS debian/README.Debian debian/changelog debian/compat d
 				debian/surfraw-extra.files debian/surfraw-extra.install debian/watch
 
 EXTRA_DIST	= surfraw.lsm.in surfraw.IN surfraw-update-path.IN\
-                  surfraw.spec.in aclocal.m4 HACKING  \
+          surfraw.spec.in aclocal.m4 HACKING STYLE \
 		  surfraw.1.IN elvi.1sr.IN surfraw.bookmarks links.IN \
 		  surfraw-bash-completion.IN surfraw.conf.IN \
 		  $(devel_extra) $(debian_extra)
@@ -95,7 +91,7 @@ opensearch-genquery.1: opensearch-genquery
 	-rm -f $@
 	pod2man $? > $@
 
-install-data-hook: links surfraw-bash-completion
+install-data-hook: links
 	chmod -x surfraw.conf elvi.1sr surfraw.1
 	mkdir -p $(DESTDIR)@sysconfdir@/xdg/surfraw
 	cp surfraw.conf $(DESTDIR)@sysconfdir@/xdg/surfraw/conf
@@ -108,10 +104,6 @@ if INSTALLSR
 	ln -sf surfraw $(DESTDIR)/@bindir@/sr
 	ln -sf surfraw.1.gz $(DESTDIR)/@mandir@/man1/sr.1.gz
 endif
-if BASHCOMPLETIONS
-	mkdir -p $(DESTDIR)@sysconfdir@/bash_completion.d
-	@cp $(top_srcdir)/surfraw-bash-completion $(DESTDIR)@sysconfdir@/bash_completion.d/surfraw
-endif
 
 uninstall-local: links
 	-rm -f $(DESTDIR)@sysconfdir@/xdg/surfraw/conf
@@ -126,9 +118,7 @@ if INSTALLSR
 	rm -f $(DESTDIR)/@bindir@/sr
 	rm -f $(DESTDIR)/@mandir@/man1/sr.1.gz
 endif
-if BASHCOMPLETIONS
-	-rm -f $(DESTDIR)@sysconfdir@/bash_completion.d/surfraw
-endif
+
 
 submit-lsm: surfraw.lsm
 	mail -s add LSM at qqx.org < $?
diff --git a/NEWS b/NEWS
index 6eac192..e01c79e 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,28 @@
                             Surfin' in the raw!
 
                                   N E W S
+Sat Jan 13 18:55:20 GMT 2018  - surfraw 2.3.0
+
+        * We are moving! This is the last release on Debian's platform.
+          For all future development, please check out
+          https://gitlab.com/surfraw/Surfraw
+
+	    * All elvi now use HTTPS
+          + Elvi for sites that don't work with HTTPS have left the building:
+        	- cablesearch
+	   	    - dmoz
+	   	    - openports
+	   	    - opensearch
+	   	    - pasearch
+	   	    - rhyme
+	   	    - rpmsearch
+	   	    - scicom
+	   	    - scirus
+	   	    - wetandwild
+	   	    - yacy
+	   	    - yubnub
+	    * Select Perl version at buildtime (Mark Meyer)
+	    * Remove lynx-cur (closes #882286)
 
 Tue Dec 10 15:49:46 GMT 2013  - surfraw 2.2.9
 
diff --git a/README b/README
index 7d4ad7b..9a62b45 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
         Surfraw - Shell Users' Revolutionary Front Rage Against the Web
 
-Home Page: http://surfraw.alioth.debian.org
+Home Page: https://gitlab.com/surfraw/Surfraw
 
         ______  _     _  ______   _______  ______   _______  _  _  _
        / _____)(_)   (_)(_____ \ (_______)(_____ \ (_______)(_)(_)(_)
@@ -11,8 +11,8 @@ Home Page: http://surfraw.alioth.debian.org
       (______/  \_____/ |_|   |_||_|      |_|   |_||_|   |_| \_____/
 
    Surfraw - Shell Users' Revolutionary Front Rage Against the Web
-		 New: http://surfraw.alioth.debian.org
-		 Old: http://surfraw.sourceforge.net/
+         New: https://gitlab.com/surfraw/Surfraw
+		 Old: http://surfraw.alioth.debian.org
 
 			       Oh Baybe
 			     I need some
@@ -341,7 +341,7 @@ Global options:
   -version                      Display Surfraw version (2.2.7)
   --                            End of options
 Copyright:
-  Copyright (c) 2003-2013 The Surfraw-Devel Team
+  Copyright (c) 2003-2018 The Surfraw-Devel Team
                            <surfraw-devel at lists.alioth.debian.org>
   Copyright (c) 2000-2001 Julian Assange <proff at iq.org>
   Copyright (c) 2001 Australian Institute for Collaborative Research
diff --git a/configure.in b/configure.in
index c2dbe1f..7dbe05d 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl This is the only place where the package version appears
 dnl (apart from changelogs & NEWS)
-AC_INIT(surfraw, 2.2.9)
+AC_INIT(surfraw, 2.3.0)
 AC_PREREQ(2.54)
 AC_CONFIG_SRCDIR([surfraw.IN])
 
@@ -18,13 +18,6 @@ AC_ARG_ENABLE([opensearch],
 AC_MSG_RESULT([$enable_opensearch])
 AM_CONDITIONAL(OPENSEARCH, test "$enable_opensearch" = "yes")
 
-AC_MSG_CHECKING([wether to install Bash completions])
-AC_ARG_ENABLE([bash-completions],
-        [AS_HELP_STRING([--disable-bash-completions], [disable Bash completions support])],,
-        [enable_bashcompletions=yes])
-AC_MSG_RESULT([$enable_bashcompletions])
-AM_CONDITIONAL(BASHCOMPLETIONS, test "$enable_bashcompletions" = "yes")
-
 AC_MSG_CHECKING([whether to install sr alias])
 AC_ARG_ENABLE([sr],
 	[AS_HELP_STRING([--disable-sr], [disable sr alias])],,
diff --git a/debian/changelog b/debian/changelog
index c45b068..72bea17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+surfraw (2.3.0-1) unstable; urgency=low
+
+  * New upstream version
+  * Select Perl version at buildtime (Mark Meyer)
+  * Remove lynx-cur (Closes: #882286)
+  * Packages the https elvi
+
+ -- Jason Ryan <jasonwryan at gmail.com>  Sat, 13 Jan 2018 18:52:10 +0000
+
 surfraw (2.2.9-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/copyright b/debian/copyright
index fbe1db2..942a750 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: surfraw
 Upstream-Contact: Surfraw-Devel <surfraw-devel at lists.alioth.debian.org>
-Source: http://surfraw.alioth.debian.org/dist/
+Source: https://gitlab.com/surfraw/Surfraw
 Comment:
  This package has initially been debianized by Christian Surchi
  <csurchi at debian.org>  since Sat,  5 Aug 2000 18:59:30 +0200.
@@ -9,11 +9,11 @@ Comment:
  surfraw has originally been developed by Julian Assange <proff at iq.org>,
  and was originally downloaded from ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/
  .
- Since July 2003 its development has continued through the surfraw Alioth
- project, you're welcome to contribute.
+ Since July 2003 its development has continued through the surfraw project,
+ you're welcome to contribute.
 
 Files: *
-Copyright: Copyright (c) 2003-2013 The Surfraw-Devel team
+Copyright: Copyright (c) 2003-2018 The Surfraw-Devel team
            Copyright (c) 2000-2001 Julian Assange <proff at iq.org>
            Copyright (c) 2001 Australian Institute for Collaborative Research
            Copyright (c) 2000 Melbourne Institute for Advanced Study
diff --git a/debian/watch b/debian/watch
index ccee7e0..9d2258e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://surfraw.alioth.debian.org/ dist/surfraw-(.*)\.tar\.gz
+https://gitlab.com/surfraw/Surfraw dist/surfraw-(.*)\.tar\.gz
diff --git a/elvi.1sr.IN b/elvi.1sr.IN
index 589d02d..b2b4bf4 100644
--- a/elvi.1sr.IN
+++ b/elvi.1sr.IN
@@ -162,7 +162,7 @@ man page for surfraw(1) by Christian Surchi.
 
 .SH COPYRIGHT
 
-  Copyright (c) 2003\(hy2013 The Surfraw\-Devel Team
+  Copyright (c) 2003\(hy2018 The Surfraw\-Devel Team
                            <surfraw\-devel at lists.alioth.debian.org>
   Copyright (c) 2000\(hy2001 Julian Assange <proff at iq.org>
   Copyright (c) 2001 Australian Institute for Collaborative Research
diff --git a/surfraw.1.IN b/surfraw.1.IN
index f05b890..7609ced 100644
--- a/surfraw.1.IN
+++ b/surfraw.1.IN
@@ -387,7 +387,7 @@ man page by Christian Surchi.
 
 .SH COPYRIGHT
 
-  Copyright (c) 2003-2013 The Surfraw\-Devel Team
+  Copyright (c) 2003-2018 The Surfraw\-Devel Team
                            <surfraw\-devel at lists.alioth.debian.org>
   Copyright (c) 2000-2001 Julian Assange <proff at iq.org>
   Copyright (c) 2001 Australian Institute for Collaborative Research
diff --git a/surfraw.IN b/surfraw.IN
index 756a474..01130c0 100755
--- a/surfraw.IN
+++ b/surfraw.IN
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Surfraw -- Shell Users' Revolutionary Front Against the World wide web
 #
-#  Copyright (c) 2003-2013 The Surfraw-Devel Team
+#  Copyright (c) 2003-2018 The Surfraw-Devel Team
 #                          <surfraw-devel at lists.alioth.debian.org>
 #  Copyright (c) 2000-2001 Julian Assange, placed into the public domain
 #  Copyright (c) 2000 Melbourne Institute for Advanced Study, placed into the public domain
diff --git a/surfraw.lsm.in b/surfraw.lsm.in
index 4994499..c57cd13 100644
--- a/surfraw.lsm.in
+++ b/surfraw.lsm.in
@@ -9,8 +9,8 @@ Keywords:	surfraw, www, web, search
 Author: 	proff at iq.org (Julian Assange)
 		surfraw-devel at lists.alioth.debian.org (Current surfraw developers)
 Maintained-by:	surfraw-devel at lists.alioth.debian.org
-Primary-site:   http://surfraw.alioth.debian.org
-Original-site:  surfraw.sourceforge.net
+Primary-site: https://gitlab.com/surfraw/Surfraw 
+Original-site: http://surfraw.alioth.debian.org  
 Platforms: shell, perl and sed script
 Copying-policy:	Public Domain
 End
diff --git a/test/Makefile.am b/test/Makefile.am
index 2dd709b..21b72d6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,31 +1,28 @@
-EXTRA_DIST = runtests elviwithouttests README COOKIES W.test S.test		\
-       acronym.test ads.test alioth.test amazon.test archpkg.test		\
-       archwiki.test arxiv.test ask.test aur.test austlii.test			\
-       bbcnews.test bing.test bookfinder.test bugmenot.test			\
-       bugzilla.test cia.test cisco.test cite.test				\
-       cliki.test cnn.test comlaw.test ctan.test currency.test			\
-       cve.test debbugs.test debcodesearch.test debcontents.test		\
-       deblists.test deblogs.test debpackages.test debpkghome.test		\
-       debpts.test debsec.test debvcsbrowse.test debwiki.test			\
-       deja.test deli.test discogs.test duckduckgo.test				\
-       ebay.test etym.test excite.test f5.test finkpkg.test			\
-       foldoc.test freebsd.test freedb.test freshmeat.test			\
-       fsfdir.test gcache.test genbugs.test genportage.test			\
-       github.test gmane.test google.test gutenberg.test imdb.test		\
-       ixquick.test jamendo.test javasun.test jquery.test lastfm.test		\
-       leodict.test l1sp.test lsm.test macports.test mathworld.test		\
-       mdn.test mininova.test musicbrainz.test mysqldoc.test			\
-       netbsd.test ntrs.test openbsd.test openports.test			\
-       opensearch.test oraclesearch.test pasearch.test pgdoc.test		\
-       phpdoc.test pin.test piratebay.test pgpkeys.test priberam.test		\
-       pubmed.test rae.test rfc.test rhyme.test rpmsearch.test			\
-       scholar.test scicom.test scirus.test scpan.test slashdot.test		\
-       slinuxdoc.test sourceforge.test springer.test stack.test			\
-       stockquote.test thesaurus.test translate.test urban.test			\
-       w3css.test w3html.test w3link.test w3rdf.test wayback.test		\
-       webster.test wetandwild.test wikipedia.test wolfram.test			\
-       woffle.test worldwidescience.test yacy.test yahoo.test			\
-       yandex.test youtube.test yubnub.test
+EXTRA_DIST = runtests elviwithouttests README COOKIES W.test S.test			\
+		acronym.test ads.test alioth.test amazon.test archpkg.test			\
+		archwiki.test arxiv.test ask.test aur.test austlii.test				\
+		bbcnews.test bing.test bookfinder.test bugmenot.test				\
+		bugzilla.test cia.test cisco.test cite.test cliki.test cnn.test		\
+		comlaw.test commandlinefu.test ctan.test currency.test cve.test		\
+		debbugs.test debcodesearch.test debcontents.test deblists.test		\
+		deblogs.test debpackages.test debpkghome.test debpts.test			\
+		debsec.test debvcsbrowse.test debwiki.test deja.test discogs.test	\
+		duckduckgo.test ebay.test etym.test excite.test f5.test				\
+		finkpkg.test foldoc.test freebsd.test freedb.test freshmeat.test	\
+		fsfdir.test gcache.test genbugs.test genportage.test github.test	\
+		gmane.test google.test gutenberg.test imdb.test ixquick.test		\
+		jamendo.test javasun.test jquery.test lastfm.test leodict.test		\
+		l1sp.test lsm.test macports.test mathworld.test mdn.test			\
+		mininova.test musicbrainz.test mysqldoc.test netbsd.test			\
+		nlab.test ntrs.test openbsd.test oraclesearch.test pgdoc.test		\
+		phpdoc.test pin.test piratebay.test pgpkeys.test priberam.test		\
+		pubmed.test rae.test rfc.test scholar.test scpan.test searx.test	\
+		slashdot.test slinuxdoc.test sourceforge.test springer.test			\
+		stack.test stockquote.test thesaurus.test translate.test			\
+		urban.test w3css.test w3html.test w3link.test w3rdf.test			\
+		wayback.test webster.test wikipedia.test wiktionary.test			\
+		wolfram.test woffle.test worldwidescience.test yahoo.test			\
+		yandex.test youtube.test
 
 test:
 	./runtests

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



More information about the Surfraw-commits mailing list