[Pkg-wmaker-commits] [wmfrog] 94/145: Merge branch 'debian' into old_debian

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmfrog.

commit 8650661a163c1554cd2109500a5ab32df5f23f27
Merge: 533ffae 501a635
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Mon May 5 21:58:20 2014 -0500

    Merge branch 'debian' into old_debian

 CHANGES                                       |   11 +-
 INSTALL                                       |   31 +-
 Src/Makefile                                  |    2 +-
 Src/weather.pl                                |  220 +++--
 Src/wmFrog.c                                  | 1224 ++++++++++---------------
 Src/wmfrog                                    |  Bin 0 -> 219634 bytes
 debian/changelog                              |   37 +-
 debian/control                                |   10 +-
 debian/copyright                              |   24 +-
 debian/patches/20-weather.pl.patch            |  116 +--
 debian/patches/new-station-lookup-url.patch   |   17 +
 debian/patches/renamed-wmfrog.c.patch         |  696 ++++++++++++++
 debian/patches/series                         |    4 +-
 debian/patches/weather.pl-new-line-skip.patch |   20 +
 debian/watch                                  |    3 +-
 debian/wmfrog.1.pod                           |    4 +-
 16 files changed, 1477 insertions(+), 942 deletions(-)

diff --cc debian/patches/20-weather.pl.patch
index 73aafd0,d0b2f3a..d0b2f3a
mode 100755,100644..100755
--- a/debian/patches/20-weather.pl.patch
+++ b/debian/patches/20-weather.pl.patch
diff --cc debian/watch
index 4207a5e,5711121..5d1d42c
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,2 +1,2 @@@
  version=3
- # http://sf.net/wmfrog/wmfrog-(.+)\.tgz
- http://bitbucket.org/tcolar/wmfrog/downloads .*wmfrog-(.+)\.tgz
 -https://bitbucket.org/tcolar/wmfrog/downloads/wmfrog-(.+)\.tgz
++https://bitbucket.org/tcolar/wmfrog/downloads/wmfrog-(.+)\.tgz

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