[med-svn] [Git][med-team/clonalframe][master] 4 commits: More easy way to propagate Debian build

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / clonalframe


Commits:
aa2160b4 by Andreas Tille at 2018-12-01T06:00:25Z
More easy way to propagate Debian build

- - - - -
7ce7a936 by Andreas Tille at 2018-12-01T06:06:11Z
Point Vcs fields to salsa.debian.org

- - - - -
58343c85 by Andreas Tille at 2018-12-01T06:06:11Z
Standards-Version: 4.2.1

- - - - -
d50a2cd2 by Andreas Tille at 2018-12-01T06:07:07Z
Upload to unstable

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+clonalframe (1.2-9) unstable; urgency=medium
+
+  * More easy way to propagate Debian build flags (thanks to Jonas Smedegaard
+    for the hint)
+    Closes: #915009
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.1
+
+ -- Andreas Tille <tille at debian.org>  Sat, 01 Dec 2018 07:06:11 +0100
+
 clonalframe (1.2-8) unstable; urgency=medium
 
   [ Adrian Bunk ]


=====================================
debian/control
=====================================
@@ -6,9 +6,9 @@ Priority: optional
 Build-Depends: debhelper (>= 11~),
                qt5-qmake,
                libgsl-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/clonalframe.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/clonalframe.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/clonalframe
+Vcs-Git: https://salsa.debian.org/med-team/clonalframe.git
 Homepage: http://www.xavierdidelot.xtreemhost.com/clonalframe.htm
 
 Package: clonalframe


=====================================
debian/rules
=====================================
@@ -17,11 +17,5 @@ override_dh_clean:
 	dh_clean
 	rm -rf bin build Makefile
 
-override_dh_auto_build:
-	qmake
-	# did not found a better way to push hardening flags into Makefile
-	sed -i -e "s:CFLAGS *= .*:& $(CFLAGS):" \
-	       -e "s:CXXFLAGS *= .*:& $(CXXFLAGS):" \
-	       -e "s:LFLAGS *= .*:& $(LDFLAGS):" Makefile
-	$(MAKE)
-
+override_dh_auto_configure:
+	QT_SELECT=5 CXXFLAGS="$(CXXFLAGS) -fpermissive" dh_auto_configure



View it on GitLab: https://salsa.debian.org/med-team/clonalframe/compare/583684b68c5655c725aea66c334329a0db989708...d50a2cd27699b43045afc512a088383a40273418

-- 
View it on GitLab: https://salsa.debian.org/med-team/clonalframe/compare/583684b68c5655c725aea66c334329a0db989708...d50a2cd27699b43045afc512a088383a40273418
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/20181201/1935cf4d/attachment-0001.html>