kc3-lang/ftgl

diff --git a/debian/changelog b/debian/changelog
index 92db0ca..f59fa3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,50 @@
-ftgl (2.3.0) unstable; urgency=medium
+ftgl (2.3.0-1) experimental; urgency=medium
 
-  * New Upstream Release.
-    (Closes: #531489, #589601, #742469, #760571).
+  * New upstream release
+    - Closes: #531489, #589601, #742469, #760571
+    - drop patch patch-ftglgetlayoutbbox-typo.diff, applied upstream
+    - edit patch fix-pdf-generation to not include Makefile.in, which does
+      not exist in this new release, and Makefile.am which changed slightly
+    - refresh patch patch-relibtoolize-prep.diff
+    - add enable-docs.patch to build docs by default
+  * Add substitute-freetype-config.patch for new versions of freetype
+    which do not ship freetype-config (Closes: #887712)
+  * Add Build-Depends on pkg-config
+
+ -- Manuel A. Fernandez Montecelo <mafm@debian.org>  Sat, 20 Oct 2018 15:54:55 +0200
+
+ftgl (2.1.3~rc5-5) unstable; urgency=medium
+
+  * Add myself to Uploaders
+  * Bump Policy Standards-Version to 4.2.1
+  * Update Vcs-* URLs
+  * Add Homepage field
+  * Drop Conflicts/Replaces on ancient versions of ftgl-dev
+  * Drop unnecessary .dirs files
+  * Switch to debhelper compat level v11 (from 5)
+    - revamp d/rules, reducing it significantly
+  * Add "Rules-Requires-Root: no"
+
+ -- Manuel A. Fernandez Montecelo <mafm@debian.org>  Sun, 30 Sep 2018 17:30:00 +0200
+
+ftgl (2.1.3~rc5-4+nmu1.2) unstable; urgency=medium
+
+  [ Manuel A. Fernandez Montecelo ]
+  * Non-maintainer upload.
+  * Drop transitional package ftgl-dev (Closes: #878529)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Let dh_auto_configure pass cross flags (Closes: #848949)
 
- -- Frank Heckenbach <f.heckenbach@fh-soft.de>  Sun, 14 Oct 2018 21:17:59 +0200
+ -- Manuel A. Fernandez Montecelo <mafm@debian.org>  Wed, 29 Nov 2017 01:08:59 +0100
+
+ftgl (2.1.3~rc5-4+nmu1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add build-arch and build-indep targets, patch by Santiago Vila (Closes:
+    #821983).
+
+ -- Andrey Rahmatullin <wrar@debian.org>  Sat, 26 Nov 2016 22:25:04 +0500
 
 ftgl (2.1.3~rc5-5polyextr~xenial) xenial; urgency=medium
 
@@ -11,6 +52,18 @@ ftgl (2.1.3~rc5-5polyextr~xenial) xenial; urgency=medium
 
  -- Richard Ulrich <richi@paraeasy.ch>  Wed, 19 Oct 2016 20:38:43 +0200
 
+ftgl (2.1.3~rc5-4+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS at generation of pdf doc (Closes: #718100).
+  * Switch to multiarch (Closes: #734159), but don't mark the -dev package
+    as such, as it was not tested as such.
+  * Include debian/watch from Nick Black (Closes: #697863).
+  * Update libtool at build time using dh-autoreconf, in order to fix a
+    build failure on x32 (Daniel Schepler, Closes: #701732).
+
+ -- Yann Dirson <dirson@debian.org>  Sun, 05 Jan 2014 17:20:22 +0100
+
 ftgl (2.1.3~rc5-10polyextr~quantal) quantal; urgency=low
 
   * Added the cmake finder to the debian/install file
@@ -41,6 +94,19 @@ ftgl (2.1.3~rc5-6polyextr~precise) precise; urgency=low
 
  -- Richard Ulrich <richi@paraeasy.ch>  Thu, 26 Jan 2012 21:19:02 +0000
 
+ftgl (2.1.3~rc5-4) unstable; urgency=low
+
+  * drop doxygen and texlive-* (except texlive-fonts-recommended) and
+    add doxygen-latex as a build dependency (Closes: #616215), patch
+    courtesy of Mònica Ramírez Arceda <monica@probeta.net>.
+  * debian/rules: add required libraries to GLUT_LIBS to build with
+    binutils-gold (Closes: #554413).
+  * debian/patches/patch-ftglgetlayoutbbox-typo.diff: fix a typo in the
+    C bindings, courtesy of Wesley Hirsch (Closes: #580451).
+  * Also, I don’t want this package to be orphaned! (Closes: #648650).
+
+ -- Sam Hocevar <sho@debian.org>  Sat, 26 Nov 2011 11:02:46 +0100
+
 ftgl (2.1.3~rc5-5polyextr~precise) precise; urgency=low
 
   * Added build dependency for cmake
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+11
diff --git a/debian/control b/debian/control
index 29b225b..11ea4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,33 @@ Source: ftgl
 Section: libs
 Priority: optional
 Maintainer: Sam Hocevar <sho@debian.org>
-Build-Depends: debhelper (>= 5.0), quilt, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev (>> 2.0.9), freeglut3-dev, libcppunit-dev, doxygen, imagemagick, texlive-latex-base, texlive-base-bin, texlive-font-utils, texlive-latex-recommended, texlive-fonts-recommended, ghostscript, cmake
-Standards-Version: 3.8.3
+Uploaders: Manuel A. Fernandez Montecelo <mafm@debian.org>
+Build-Depends: debhelper (>= 11~),
+ freeglut3-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libfreetype6-dev (>> 2.0.9),
+ libcppunit-dev,
+ doxygen-latex,
+ ghostscript,
+ imagemagick,
+ pkg-config,
+ texlive-fonts-recommended,
+Standards-Version: 4.2.1
+Homepage: https://sourceforge.net/projects/ftgl/
+Vcs-Git: https://salsa.debian.org/ftgl-team/ftgl.git
+Vcs-Browser: https://salsa.debian.org/ftgl-team/ftgl
+Rules-Requires-Root: no
 
 Package: libftgl-dev
 Section: libdevel
 Architecture: any
-Depends: libftgl2 (= ${binary:Version}), libfreetype6-dev (>> 2.0.9), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ftgl-dev (<< 2.3.0)
-Replaces: ftgl-dev (<< 2.3.0)
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ libftgl2 (= ${binary:Version}),
+ libfreetype6-dev (>> 2.0.9),
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
 Description: development files for libftgl
  FTGL binds OpenGL and FreeType together in order to offer and easy to use
  and flexible text rendering library.  It offers several rendering modes:
@@ -20,21 +38,14 @@ Description: development files for libftgl
  compile applications or shared objects that use libftgl.
 
 Package: libftgl2
-Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+Pre-Depends: ${misc:Pre-Depends}
 Description: library to render text in OpenGL using FreeType
  FTGL binds OpenGL and FreeType together in order to offer and easy to use
  and flexible text rendering library.  It offers several rendering modes:
  as polygons, outlines, bitmaps and textures.
  .
  This package contains the shared library for libftgl.
-
-Package: ftgl-dev
-Section: oldlibs
-Architecture: all
-Depends: libftgl-dev, ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package.  If nothing depends on it, this
- package can be safely removed.
-
diff --git a/debian/libftgl-dev.dirs b/debian/libftgl-dev.dirs
deleted file mode 100644
index 101d5aa..0000000
--- a/debian/libftgl-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include/ftgl
-usr/share/doc/ftgl-dev/html
diff --git a/debian/libftgl-dev.examples b/debian/libftgl-dev.examples
index 1acb80a..0fdcb44 100644
--- a/debian/libftgl-dev.examples
+++ b/debian/libftgl-dev.examples
@@ -1,2 +1,2 @@
-demo/simple.cpp
 demo/c-demo.c
+demo/simple.cpp
diff --git a/debian/libftgl-dev.install b/debian/libftgl-dev.install
index 69e1c7e..57e56a0 100644
--- a/debian/libftgl-dev.install
+++ b/debian/libftgl-dev.install
@@ -2,8 +2,6 @@ usr/include
 usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*.pc
-#usr/share/doc/libftgl-dev/html
-#usr/share/doc/libftgl-dev/ftgl.pdf
-#usr/share/doc/libftgl-dev/*.txt
-#/usr/share/cmake-2.8/Modules/FindFTGL.cmake
-#/usr/lib/cmake/FTGL/*.cmake
+usr/share/doc/ftgl/*.txt	usr/share/doc/libftgl-dev
+usr/share/doc/ftgl/ftgl.pdf	usr/share/doc/libftgl-dev
+usr/share/doc/ftgl/html		usr/share/doc/libftgl-dev
diff --git a/debian/libftgl2.dirs b/debian/libftgl2.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libftgl2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/rules b/debian/rules
index 13caa26..bb54a13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,94 +1,16 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# Passing hardcoded GLUT_LIBS necessary to link demo programs and tests.  GLUT
+# doesn't have pkg-config files or other simple mechanisms.
+GLUT_LIBS := -lglut -lGLU -lGL -lm
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+SHLIBVER := 2.1.3~rc5
 
-CFLAGS = -Wall -g
+%:
+	dh $@
 
-DTMPDIR = $(CURDIR)/debian/tmp
+override_dh_auto_build:
+	dh_auto_build -- GLUT_LIBS="$(GLUT_LIBS)"
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	dh_autoreconf
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-	touch $@
-
-build-arch: build
-build-indep: build
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) CFLAGS="$(CFLAGS)" GLUT_LIBS="$(GLUT_LIBS) -lglut -lGLU -lGL -lm"
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	dh_autoreconf_clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) install DESTDIR=$(DTMPDIR)
-#	mv debian/tmp/usr/share/doc/ftgl debian/tmp/usr/share/doc/libftgl-dev
-	dh_install --list-missing --sourcedir=debian/tmp
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installexamples -a
-#	dh_installdebconf -a
-#	dh_installmenu -a
-#	dh_installinfo -a
-	dh_installman -a
-#	dh_undocumented -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -p libftgl2 -V 'libftgl2 (>= 2.3.0)'
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
+override_dh_makeshlibs:
+	dh_makeshlibs -p libftgl2 -V "libftgl2 (>= $(SHLIBVER))"
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)