[librecad] 01/02: remove unmaintained docs; use qt's lrelease

Scott Sheridan Howard showard at moszumanska.debian.org
Wed Mar 16 15:04:25 UTC 2016


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

showard pushed a commit to branch master
in repository librecad.

commit 4089b3c579017ecfb5376fa36ff5866aa25a9f85
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed Mar 16 10:50:38 2016 -0400

    remove unmaintained docs; use qt's lrelease
---
 debian/changelog                                 | 11 +++++++++++
 debian/librecad-data.install                     |  1 -
 debian/librecad-data.links                       |  2 --
 debian/patches/remove_qt4_docs_postprocess.patch | 20 ++++++++++++++++++++
 debian/patches/series                            |  1 +
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1c519a..9fe5928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+librecad (2.0.9-2) unstable; urgency=medium
+
+  * debian/patches/remove_qt4_docs_postprocess.patch
+    - Don't ship docs (unmaintained)
+    - use qt5's lrelease
+  * Remove unmainted docs from
+    - debian/librecad-data.links
+    - debian/librecad.install
+
+ -- Scott Howard <showard at debian.org>  Wed, 16 Mar 2016 10:47:25 -0400
+
 librecad (2.0.9-1) unstable; urgency=medium
 
   * New upstream release (LP: #1540925)
diff --git a/debian/librecad-data.install b/debian/librecad-data.install
index 727303e..b3f9dda 100644
--- a/debian/librecad-data.install
+++ b/debian/librecad-data.install
@@ -2,4 +2,3 @@ unix/resources/fonts /usr/share/librecad
 unix/resources/library /usr/share/librecad
 unix/resources/patterns /usr/share/librecad
 unix/resources/qm /usr/share/librecad
-unix/resources/doc /usr/share/doc/librecad
diff --git a/debian/librecad-data.links b/debian/librecad-data.links
deleted file mode 100644
index f656a83..0000000
--- a/debian/librecad-data.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/librecad/doc/LibreCADdoc.qch /usr/share/librecad/doc/LibreCADdoc.qch
-/usr/share/doc/librecad/doc/LibreCADdoc.qhc /usr/share/librecad/doc/LibreCADdoc.qhc
diff --git a/debian/patches/remove_qt4_docs_postprocess.patch b/debian/patches/remove_qt4_docs_postprocess.patch
new file mode 100644
index 0000000..d6a40ec
--- /dev/null
+++ b/debian/patches/remove_qt4_docs_postprocess.patch
@@ -0,0 +1,20 @@
+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 b4feaaa..bcc4c34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 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



More information about the debian-science-commits mailing list