[librecad] 04/04: removed patches

[Scott Sheridan Howard]

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

showard pushed a commit to branch master
in repository librecad.

commit 86550c8b4702a2812f6ab8899a7e03cb7a0a7c47
Author: Scott Howard <showard314 at gmail.com>
Date:   Sat Sep 17 12:51:03 2016 -0400

    removed patches
---
 .gitignore                                       |  1 +
 debian/changelog                                 |  1 +
 debian/copyright                                 |  9 +++++++--
 debian/patches/boost_gcc6_includes.patch         | 17 -----------------
 debian/patches/remove_qt4_docs_postprocess.patch | 20 --------------------
 debian/patches/series                            |  2 --
 6 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8dae718..363cfb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ vgcore.*
 core.*
 
 .qmake.stash
+.pc
diff --git a/debian/changelog b/debian/changelog
index c8eae6a..7808e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ librecad (2.1.2-1) unstable; urgency=medium
   * New upstream release
     - Updated debian/watch, debian/rules get-orig-source, and
       debian/copyright
+  * Removed all patches except debian_build.patch (accepted upstream)
 
  -- Scott Howard <showard at debian.org>  Sat, 17 Sep 2016 09:53:14 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 52feeae..bdbb306 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,8 +45,9 @@ Files: librecad/res/icons/*.svg
 Copyright: 2010-2016, dellus <dellus at gmx.de>
 License: CC0-1
 
-Files: support/fonts/wqy-unicode.lff
-Copyright: Apache-2.0 or GPL-3+
+Files: librecad/support/fonts/wqy-unicode.lff
+Copyright: 2011, WenQuanYi Project Contributors
+License: Apache-2.0 or GPL-3+
 
 Files: debian/*
 Copyright: 2009, Ruben Molina <rmolina at udea.edu.co>
@@ -194,3 +195,7 @@ License: CC0-1
      d. Affirmer understands and acknowledges that Creative Commons is not a
         party to this document and has no duty or obligation with respect to
         this CC0 or use of the Work.
+
+License: Apache-2.0
+    On Debian systems, the text can be found at
+    /usr/share/common-licenses/Apache-2.0
diff --git a/debian/patches/boost_gcc6_includes.patch b/debian/patches/boost_gcc6_includes.patch
deleted file mode 100644
index e261b10..0000000
--- a/debian/patches/boost_gcc6_includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Don't add /usr/include to system includes
-Author: Scott Howard <showard at debian.org>
-Bug: https://github.com/LibreCAD/LibreCAD/pull/800
-Bug-Qt: https://bugreports.qt.io/browse/QTBUG-53367
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831189
-Index: librecad/librecad/src/boost.pri
-===================================================================
---- librecad.orig/librecad/src/boost.pri
-+++ librecad/librecad/src/boost.pri
-@@ -109,6 +109,7 @@ unix {
-     }
- 
- 
-+    BOOST_INCDIR -= $$QMAKE_DEFAULT_INCDIRS
-     INCLUDEPATH += $${BOOST_INCDIR}
-     HEADERS += $${BOOST_INCDIR}
- 
diff --git a/debian/patches/remove_qt4_docs_postprocess.patch b/debian/patches/remove_qt4_docs_postprocess.patch
deleted file mode 100644
index d6a40ec..0000000
--- a/debian/patches/remove_qt4_docs_postprocess.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Docs are no longer maintained, remove qt4 dependancy
-Author: Scott Howard <showard at debian.org>
-
-diff --git a/scripts/postprocess-unix.sh b/scripts/postprocess-unix.sh
-index 96fb082..f25eca5 100755
---- a/scripts/postprocess-unix.sh
-+++ b/scripts/postprocess-unix.sh
-@@ -11,12 +11,6 @@ SPTDIR="${LCDIR}/support"
- DOCDIR="${SPTDIR}/doc"
- LRELEASE="lrelease"
- 
--[ "$( which lrelease-qt4 )" ] && LRELEASE="lrelease-qt4"
--
--# Generate Help Files
--cd "${DOCDIR}"
--qcollectiongenerator LibreCADdoc.qhcp
--
- cd "${THISDIR}"
- 
- # Postprocess for unix
diff --git a/debian/patches/series b/debian/patches/series
index 0fe2047..b4feaaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-boost_gcc6_includes.patch
 debian_build.patch
-remove_qt4_docs_postprocess.patch

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