[librecad] 05/05: Updated debian/copyright; Remove .menu in favor of .desktop; Fix Vcs- links

Tue Mar 15 19:07:14 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 a9c9ececfb4e61eb898e9e9ae333f07d8cf7233f
Author: Scott Howard <showard314 at gmail.com>
Date:   Tue Mar 15 15:06:20 2016 -0400

    Updated debian/copyright; Remove .menu in favor of .desktop; Fix Vcs- links
---
 debian/changelog                  | 10 ++++++++--
 debian/control                    | 12 ++++++------
 debian/copyright                  | 21 +--------------------
 debian/librecad.menu              |  6 ------
 debian/patches/debian_build.patch |  6 +++---
 debian/rules                      |  8 +-------
 6 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19bbbfb..f1c519a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 librecad (2.0.9-1) unstable; urgency=medium
 
-  * New upstream release
+  * New upstream release (LP: #1540925)
+    - add dependencies on qt5 packages, use qtchooser by
+      setting QT_SELECT = 5
+  * Updated debian/copyright (new file locations)
+  * Lintian cleaning:
+    - Remove .menu in favor of .desktop
+    - DSV 3.9.7 no changes
+    - Fix Vcs- links (secure and cannonical)
 
  -- Scott Howard <showard at debian.org>  Tue, 15 Mar 2016 12:15:10 -0400
 
@@ -11,7 +18,6 @@ librecad (2.0.8-1) unstable; urgency=medium
   * DSV 3.9.6, no changes
 
  -- Scott Howard <showard at debian.org>  Sat, 29 Aug 2015 22:35:57 -0400
-
 librecad (2.0.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 364cdb5..473b3d0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: graphics
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Scott Howard <showard at debian.org>, Ruben Molina <rmolina at udea.edu.co>
-Build-Depends: debhelper (>= 9), libqt4-dev, qt4-dev-tools, libmuparser-dev,
- imagemagick, librsvg2-bin, libboost-dev, libfreetype6-dev, libicu-dev,
- pkg-config
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9), qtbase5-dev, libqt5svg5-dev, qttools5-dev,
+ qtchooser, qttools5-dev-tools, libmuparser-dev, imagemagick, librsvg2-bin,
+ libboost-dev, libfreetype6-dev, libicu-dev, pkg-config
+Standards-Version: 3.9.7
 Homepage: http://www.librecad.org/
-Vcs-Git: git://git.debian.org/git/debian-science/packages/librecad.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/librecad.git
+Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/librecad.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/librecad.git/
 
 Package: librecad
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index e276fb9..9fde7c3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,26 +25,7 @@ License: GPL-2
     On Debian systems, the complete text of the GNU General Public License 
     version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-Files: dxflib/test/test_creationclass.h dxflib/test/main.cpp dxflib/test/test_creationclass.cpp
-Copyright: 2001, Andrew Mustun <andrew at ribbonsoft.com>
-License: LGPL-2
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Library General Public License as
-    published by the Free Software Foundation.
-    .
-    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 Library General Public License for more details.
-    .
-    You should have received a copy of the GNU Library 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 GNU Library General Public License 
-    version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-
-Files: libraries/jwww/*
+Files: libraries/jwwlib/*
 Copyright: 2010 nemo zero <zeronemo2007 at gmail.com>
 License: GPL-2+
 
diff --git a/debian/librecad.menu b/debian/librecad.menu
deleted file mode 100644
index 435ae91..0000000
--- a/debian/librecad.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(librecad):\
-  needs="X11"\
-  section="Applications/Science/Engineering"\
-  icon="/usr/share/pixmaps/librecad.xpm"\
-  title="LibreCAD"\
-  command="/usr/bin/librecad"
diff --git a/debian/patches/debian_build.patch b/debian/patches/debian_build.patch
index 07ca497..81d1b8f 100644
--- a/debian/patches/debian_build.patch
+++ b/debian/patches/debian_build.patch
@@ -3,9 +3,9 @@ Author: Scott Howard <showard at debian.org>
 
 Index: librecad/libraries/jwwlib/jwwlib.pro
 ===================================================================
---- librecad.orig/libraries/jwwlib/jwwlib.pro	2013-09-13 21:58:52.744258408 -0400
-+++ librecad/libraries/jwwlib/jwwlib.pro	2013-09-13 21:58:52.736258408 -0400
-@@ -20,8 +20,8 @@
+--- librecad.orig/libraries/jwwlib/jwwlib.pro
++++ librecad/libraries/jwwlib/jwwlib.pro
+@@ -20,8 +20,8 @@ GENERATED_DIR = ../../generated/lib/jwwl
  # Use common project definitions.
  include(../../common.pri)
  
diff --git a/debian/rules b/debian/rules
index 96ec5ef..3374dc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,7 @@
 
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 
-# Fixes some FTBFS, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730423
-# and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726989
-XDG_CONFIG_DIRS := $(shell echo $(XDG_CONFIG_DIRS)):/usr/lib/$(DEB_HOST_MULTIARCH)
-export XDF_CONFIG_DIRS
+export QT_SELECT = 5
 
 %:
 	dh $@ --parallel
@@ -25,9 +22,6 @@ override_dh_clean:
            generated/ custom.pro
 
 override_dh_auto_configure:
-	if grep -q precise /etc/lsb-release;\
-	 then echo "CXX_CPP11_FLAG = -std=c++0x" > custom.pro;\
-	fi
 	dh_auto_configure -- librecad.pro
 	cp desktop/librecad* debian
 	cp desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg debian/librecad.svg

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

