This is an automated email from the git hooks/post-receive script.
hosiet-guest pushed a commit to branch master
in repository fqterm.
commit 75767164f69ffb3ab1172be59ea18005b1f466ca
Author: Boyuan Yang <073plan at gmail.com>
Date: Tue Oct 25 22:44:43 2016 +0800
Prepare new release.
---
debian/changelog | 19 +++++++++++++++++++
debian/control | 26 +++++++++++++++++---------
debian/copyright | 42 +++++++++++++++++++++++++++++-------------
debian/menu | 6 ------
debian/watch | 6 +++---
5 files changed, 68 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 743c671..f567c7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+fqterm (0.9.8.3.r4-1) unstable; urgency=medium
+
+ * Team upload.
+ * Add myself into uploaders list.
+ * New upstream release.
+ - Fix build failure with GCC 6. (Closes: #811872)
+ * Remove LI Daobing from uploader list.
+ Thanks for all your contribution! (Closes: #841806)
+ * Bump Standards-Version to 3.9.8, no change needed.
+ * d/control: Move project homepage from Google Code to GitHub.
+ * d/control: Fix debian/watch file url.
+ * d/control: Make Vcs field canonical.
+ * d/copyright: Update information and grammar fix.
+ * debian: Remove legacy menu file.
+ * debian: Apply `wrap-and-sort -abst'.
+ * d/patches: Drop outdated gcc-4.7 related patch.
+
+ -- Boyuan Yang <073plan at gmail.com> Wed, 26 Oct 2016 00:49:00 +0800
+
fqterm (0.9.6.10-1.1) unstable; urgency=low
* Non maintainer upload.
diff --git a/debian/control b/debian/control
index 2bbf054..b946622 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,26 @@ Section: x11
Priority: optional
Maintainer: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
Uploaders:
- LI Daobing <lidaobing at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), libqt4-dev, cmake,
- libglib2.0-dev, libssl-dev, libx11-dev
-Standards-Version: 3.9.2
-Homepage: http://code.google.com/p/fqterm
-Vcs-Browser: http://git.debian.org/?p=chinese/fqterm.git
-Vcs-Git: git://git.debian.org/git/chinese/fqterm.git
+ Boyuan Yang <073plan at gmail.com>,
+Build-Depends:
+ cdbs,
+ cmake,
+ debhelper (>= 5),
+ libglib2.0-dev,
+ libqt4-dev,
+ libssl-dev (<< 1.1.0),
+ libx11-dev,
+Standards-Version: 3.9.8
+Homepage: https://github.com/mytbk/fqterm
+Vcs-Browser: https://anonscm.debian.org/git/chinese/fqterm.git
+Vcs-Git: https://anonscm.debian.org/git/git/chinese/fqterm.git
Package: fqterm
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: BBS client written in QT4
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: BBS client written in Qt
FQTerm is one of the most widely used BBS client in China, it
supports Telnet/SSH1/SSH2 protocols and can process ANSI control
sequences. It can be used to login BBS sites or *NIX hosts.
diff --git a/debian/copyright b/debian/copyright
index 03ac64b..ed858c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,12 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: fqterm
-Upstream-Source: http://code.google.com/p/fqterm
+Source: https://github.com/mytbk/fqterm
Files: *
Copyright: Copyright 2008 fqterm development group.
-Copyright: more contributors in file "credits".
-License: GPL-2+-BY-OpenSSL
+ 2014-2016, Iru Cai <mytbk920423 at gmail.com>
+ more contributors in file "credits".
+License: GPL-2+ with OpenSSL exception
This package is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
@@ -35,9 +36,8 @@ License: GPL-2+-BY-OpenSSL
Files: debian/*
Copyright: Copyright 2008 LI Daobing <lidaobing at gmail.com>
+ 2016, Boyuan Yang <073plan at gmail.com>
License: GPL-2+
- On Debian systems, the complete text of the version 2 of GNU General
- Public License can be found in file "/usr/share/common-licenses/GPL-2".
Files:
src/protocol/internal/crc32.*
@@ -51,7 +51,7 @@ License: BSD-2
| 2. Redistributions in binary form must reproduce the above copyright
| notice, this list of conditions and the following disclaimer in the
| documentation and/or other materials provided with the distribution.
- |
+ |
| THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
| IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
| OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -65,21 +65,38 @@ License: BSD-2
Files: src/ui/pictureflow.*
Copyright: Copyright 2007 Ariya Hidayat <ariya at kde.org>
-Copyright: Copyright 2008 fqterm development group.
-License: GPL-2+, MIT
+ Copyright 2008 fqterm development group.
+License: GPL-2+ or MIT
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This package is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this package; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
On Debian systems, the complete text of the version 2 of GNU General
Public License can be found in file "/usr/share/common-licenses/GPL-2".
- .
+
+License: MIT
| Permission is hereby granted, free of charge, to any person obtaining a copy
| of this software and associated documentation files (the "Software"), to deal
| in the Software without restriction, including without limitation the rights
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
| copies of the Software, and to permit persons to whom the Software is
| furnished to do so, subject to the following conditions:
-
+ .
| The above copyright notice and this permission notice shall be included in
| all copies or substantial portions of the Software.
-
+ .
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -87,4 +104,3 @@ License: GPL-2+, MIT
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
| THE SOFTWARE.
-
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index caff5d1..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(fqterm):\
- needs="X11"\
- section="Applications/Network/Communication"\
- title="FQTerm"\
- icon="/usr/share/pixmaps/fqterm.xpm"\
- command="/usr/bin/fqterm"
diff --git a/debian/watch b/debian/watch
index 88b5440..9a0a1f1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
-http://code.google.com/p/fqterm/downloads/list \
-http://fqterm.googlecode.com/files/fqterm-([\d.]+)\.tar\.gz
+version=4
+
+opts="" https://github.com/mytbk/fqterm/tags (?:.*?/)?v?(\d[\d.]*)\.(r\d+)\.tar\.gz debian uupdate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git