[med-svn] [Git][med-team/freemedforms-project][master] 3 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / freemedforms-project


Commits:
9f0bcb0c by Andreas Tille at 2018-09-25T06:31:39Z
debhelper 11

- - - - -
821353fc by Andreas Tille at 2018-09-25T06:34:25Z
Point Vcs fields to salsa.debian.org

- - - - -
ea516fec by Andreas Tille at 2018-09-25T06:34:26Z
Standards-Version: 4.2.1

- - - - -


4 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,9 @@ freemedforms-project (1.0.0-1) UNRELEASED; urgency=medium
   * New upstream version (patches applied upstream)
   * Fix watch file
   * Try to build with Qt5
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
 
  -- Andreas Tille <tille at debian.org>  Sun, 10 Sep 2017 21:51:37 +0200
 


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Eric Maeker <eric.maeker at gmail.com>,
            Thorsten Alteholz <debian at alteholz.de>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                qtbase5-dev,
                qttools5-dev-tools,
                libqt5svg5-dev,
@@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 10),
                libopencv-highgui-dev,
                libopencv-objdetect-dev,
                libquazip5-dev
-Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/freemedforms-project.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/freemedforms-project.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/freemedforms-project
+Vcs-Git: https://salsa.debian.org/med-team/freemedforms-project.git
 Homepage: http://www.freemedforms.com/
 
 Package: freemedforms-project
@@ -83,8 +83,6 @@ Description: data for the FreeMedForms EMR
 Package: freemedforms-freedata
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: freemedforms-emr-resources (<< 0.7.4)
-Replaces: freemedforms-emr-resources (<< 0.7.4)
 Description: free extra-data for the FreeMedForms project
  The FreeMedForms project provides a set of medical applications to help
  health professionals in their day-to-day practice. It is developed by an


=====================================
debian/rules
=====================================
@@ -52,7 +52,7 @@ AUTOCONF_MAIN = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(1).pro
 AUTOCONF_SUB = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_SUBPROJECT_CONFIG) $(QMAKE_IPATH) $(1).pro
 
 %:
-	dh $@ --parallel --buildsystem=qmake # --dbg-package=freemedforms-project-dbg
+	dh $@ --buildsystem=qmake # --dbg-package=freemedforms-project-dbg
 
 override_dh_auto_configure:
 	QT_SELECT=$(QT_VERSION) \



View it on GitLab: https://salsa.debian.org/med-team/freemedforms-project/compare/e0e828586e7975968d7f9ff8e8cb2ee94e817b8b...ea516fec62257441ab9008cbf187ccae468d6c28

-- 
View it on GitLab: https://salsa.debian.org/med-team/freemedforms-project/compare/e0e828586e7975968d7f9ff8e8cb2ee94e817b8b...ea516fec62257441ab9008cbf187ccae468d6c28
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180925/983ba446/attachment-0001.html>