kc3-lang/ftgl

diff --git a/debian/changelog b/debian/changelog
index f59fa3f..b58f358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ftgl (2.3.0-3) unstable; urgency=medium
+
+  [ IOhannes m zmölnig ]
+  * Copyright improvements:
+    - d/copyright: convert to standard format 1.0
+    - d/rules: add "licensecheck" target
+    - d/copyright_hints: helper to generate copyright file
+  * d/patches:
+    - document (add headers) to patches enable-docs.patch and
+      substitute-freetype-config.patch
+
+ -- Manuel A. Fernandez Montecelo <mafm@debian.org>  Mon, 19 Nov 2018 00:26:46 +0100
+
+ftgl (2.3.0-2) unstable; urgency=medium
+
+  * Release to unstable
+  * d/watch: Update for new upstream location
+  * d/control: Update Homepage URL
+
+ -- Manuel A. Fernandez Montecelo <mafm@debian.org>  Sun, 18 Nov 2018 23:48:43 +0100
+
 ftgl (2.3.0-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 11ea4f3..7145864 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 11~),
  pkg-config,
  texlive-fonts-recommended,
 Standards-Version: 4.2.1
-Homepage: https://sourceforge.net/projects/ftgl/
+Homepage: https://github.com/frankheckenbach/ftgl
 Vcs-Git: https://salsa.debian.org/ftgl-team/ftgl.git
 Vcs-Browser: https://salsa.debian.org/ftgl-team/ftgl
 Rules-Requires-Root: no
diff --git a/debian/copyright b/debian/copyright
index 7cbfa3f..927a46b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,77 +1,132 @@
-This package was debianized by Sam Hocevar <sam@zoy.org> on Wed, 30 Apr
-2008 12:29:11 +0000.
-
-It was downloaded from <http://ftgl.sf.net/>.
-
-Copyright (c) 2001-2004  Henry Maddocks <henryj@paradise.net.nz>
-              2008  Sam Hocevar <sam@zoy.org>
-              2008  Éric Beets <ericbeets@free.fr>
-
-Licensing information:
-
-    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 AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
-
-test/font_pack/timR12-ISO8859-1.pcf.gz
-
-    Copied from the Debian package xfonts-100dpi
-
-    This package contains the font-adobe-100dpi, font-bh-100dpi,
-    font-bh-lucidatypewriter-100dpi and font-bitstream-100dpi tarballs
-    downloaded from: http://xorg.freedesktop.org/releases/individual/font/
-
-    font-adobe-100dpi:
-      Copyright 1984-1989, 1994 Adobe Systems Incorporated.
-      Copyright 1988, 1994 Digital Equipment Corporation.
-
-      Adobe is a trademark of Adobe Systems Incorporated which may be
-      registered in certain jurisdictions.
-      Permission to use these trademarks is hereby granted only in
-      association with the images described in this file.
-
-      Permission to use, copy, modify, distribute and sell this software
-      and its documentation for any purpose and without fee is hereby
-      granted, provided that the above copyright notices appear in all
-      copies and that both those copyright notices and this permission
-      notice appear in supporting documentation, and that the names of
-      Adobe Systems and Digital Equipment Corporation not be used in
-      advertising or publicity pertaining to distribution of the software
-      without specific, written prior permission.  Adobe Systems and
-      Digital Equipment Corporation make no representations about the
-      suitability of this software for any purpose.  It is provided "as
-      is" without express or implied warranty.
-
-test/font_pack/El_Abogado_Loco.ttf
-
-    Copied from the Debian package fonts-dustin
-
-    This package was debianized by Aurelien Jarno <aurel32@debian.org> on
-    Mon,  7 Apr 2003 00:33:50 +0200.
-
-    All the fonts were downloaded from http://www.dustismo.com
-
-    Upstream Author: Dustin Norlander <dustin@dustismo.com>
-
-    Copyright (C) 2002-2003 Dustin Norlander
-
-    You are free to distribute this software under the terms of the GNU General
-    Public License.  On Debian systems, the complete text of the GNU General Public
-    License can be found in /usr/share/common-licenses/GPL-2 file.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: FTGL
+Upstream-Contact: Frank Heckenbach <f.heckenbach@fh-soft.de>
+Source: https://github.com/frankheckenbach/ftgl
+
+Files: *
+Copyright: 2018, Frank Heckenbach <f.heckenbach@fh-soft.de>
+  2012-2016, Richard Ulrich <richard.ulrich@cubx-software.com>
+  2008-2010, Sam Hocevar <sam@hocevar.net>
+  2008, Sean Morrison <learner@brlcad.org>
+  2008, Éric Beets <ericbeets@free.fr>
+  2008, Daniel Remenak <dtremenak@users.sourceforge.net>
+  2001-2004, Henry Maddocks <ftgl@opengl.geek.nz>
+License: Expat
+
+Files: src/FTFont/FTTriangleExtractorFont.cpp
+ src/FTFont/FTTriangleExtractorFontImpl.h
+ src/FTGL/FTGLTriangleExtractorFont.h
+ src/FTGL/FTTriangleExtractorGlyph.h
+ src/FTGlyph/FTTriangleExtractorGlyph.cpp
+ src/FTGlyph/FTTriangleExtractorGlyphImpl.h
+Copyright: 2011, Richard Ulrich <richi@paraeasy.ch>
+License: Expat
+
+Files: test/*mmgr.*
+Copyright: 2000, Fluid Studios, Inc.
+License: Expat
+
+Files: demo/trackball.?
+Copyright: 1993-1994, Silicon Graphics, Inc.
+License: Expat-SGI
+ Permission to use, copy, modify, and distribute this software for
+ any purpose and without fee is hereby granted, provided that the above
+ copyright notice appear in all copies and that both the copyright notice
+ and this permission notice appear in supporting documentation, and that
+ the name of Silicon Graphics, Inc. not be used in advertising
+ or publicity pertaining to distribution of the software without specific,
+ written prior permission.
+ .
+ THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
+ AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
+ INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
+ FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
+ GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
+ SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
+ KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
+ LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
+ THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: msvc/config.h
+Copyright: 2008, Daniel Remenak <dtremenak@users.sourceforge.net>
+  2008, Jeff Myers <JeffM2501@users.sourceforge.net>
+License: Expat
+
+Files: src/FTUnicode.h
+Copyright: 2008, Daniel Remenak <dtremenak@users.sourceforge.net>
+License: Expat
+
+Files: test/font_pack/El_Abogado_Loco.ttf
+Copyright: 2003, Dustin Norlander. All rights reserved.
+License: GPL-2+
+
+Files: test/font_pack/timR12-ISO8859-1.pcf.gz
+Copyright: 1984-1989, 1994 Adobe Systems Incorporated.
+ 1988, 1994 Digital Equipment Corporation.
+License: Expat-Adobe
+ Adobe is a trademark of Adobe Systems Incorporated which may be
+ registered in certain jurisdictions.
+ Permission to use these trademarks is hereby granted only in
+ association with the images described in this file.
+ .
+ Permission to use, copy, modify, distribute and sell this software
+ and its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notices appear in all
+ copies and that both those copyright notices and this permission
+ notice appear in supporting documentation, and that the names of
+ Adobe Systems and Digital Equipment Corporation not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  Adobe Systems and
+ Digital Equipment Corporation make no representations about the
+ suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+
+
+Files: debian/*
+Copyright: 2017-2018, Manuel A. Fernandez Montecelo <mafm@debian.org>
+ 2018, IOhannes m zmölnig <umlaeute@debian.org>
+ 2008-2011, Sam Hocevar
+License: Expat
+
+License: Expat
+ Herewith is a license. Basically I want you to use this software and if
+ you think this license is preventing you from doing so let me know.
+ .
+ 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER 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.
+
+License: GPL-2+
+ This program 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, or (at your option) any
+ later version.
+ .
+ This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems, the complete text of the GNU General Public License
+ (GPL) version 2 can be found in "/usr/share/common-licenses/GPL-2".
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index bb54a13..a031228 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@
 GLUT_LIBS := -lglut -lGLU -lGL -lm
 
 SHLIBVER := 2.1.3~rc5
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \
+        ^(\./\.git/.*|\./debian/.*|\./\.pc/.*|\./test/font_pack/(El_Abogado_Loco\.ttf|timR12-ISO8859-1\.pcf\.gz)|\./docs/images/.*\.png|\./docs/FTGL_1_3\.gif)$
+
 
 %:
 	dh $@
@@ -14,3 +17,9 @@ override_dh_auto_build:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -p libftgl2 -V "libftgl2 (>= $(SHLIBVER))"
+
+licensecheck:
+	licensecheck -i "$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)" --deb-machine -r . \
+		> debian/copyright_newhints
+	cmp debian/copyright_hints debian/copyright_newhints \
+		&& rm debian/copyright_newhints
diff --git a/debian/watch b/debian/watch
index 1507635..34c3c9b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-version=3
-opts=uversionmangle=s/-/~/ \
-http://sf.net/ftgl/ftgl-([-\d\.rc]+)\.tar\.gz
+version=4
+https://github.com/frankheckenbach/ftgl/tags .*/v(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)