[med-svn] [Git][med-team/suitename][master] 6 commits: debhelper 11

Andreas Tille gitlab at salsa.debian.org
Tue Jul 3 21:09:47 BST 2018


Andreas Tille pushed to branch master at Debian Med / suitename


Commits:
f5cf2d1b by Andreas Tille at 2018-07-03T21:45:46+02:00
debhelper 11

- - - - -
c83a866f by Andreas Tille at 2018-07-03T21:45:49+02:00
Point Vcs fields to salsa.debian.org

- - - - -
8ba98e77 by Andreas Tille at 2018-07-03T21:45:49+02:00
Standards-Version: 4.1.4

- - - - -
c6d797b7 by Andreas Tille at 2018-07-03T22:02:52+02:00
hardening=+all

- - - - -
903209a1 by Andreas Tille at 2018-07-03T22:05:42+02:00
hardening + debug

- - - - -
fba2cec0 by Andreas Tille at 2018-07-03T22:06:44+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/patches/hardening.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+suitename (0.3.070628-2) unstable; urgency=medium
+
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.1.4
+  * hardening=+all
+
+ -- Andreas Tille <tille at debian.org>  Tue, 03 Jul 2018 22:05:58 +0200
+
 suitename (0.3.070628-1) unstable; urgency=low
 
   * Initial release (Closes: #793192)


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,19 @@
 Source: suitename
-Section: science
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Andreas Tille <tille at debian.org>,
            Michael Prisant <michael.prisant at gmail.com>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/suitename.git
-Vcs-Git: git://anonscm.debian.org/debian-med/suitename.git
+Section: science
+Priority: optional
+Build-Depends: debhelper (>= 11~)
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/suitename
+Vcs-Git: https://salsa.debian.org/med-team/suitename.git
 Homepage: http://kinemage.biochem.duke.edu/software/suitename.php
 
 Package: suitename
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: categorize each suite in an RNA backbone
  Suitename is a program that supports the ROC RNA Ontology Consortium
  consensus RNA backbone nomenclature and conformer-list development.


=====================================
debian/patches/hardening.patch
=====================================
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -4,7 +4,18 @@ Description: Propagate hardening options
 
 --- a/Makefile.linux
 +++ b/Makefile.linux
-@@ -15,7 +15,7 @@ OBJS = suitename.o suitenscrt.o suitenin
+@@ -1,9 +1,7 @@
+ # suitename
+ 
+ ifeq ($(MAKECMDGOALS),debug)
+-CFLAGS = -g
+-else
+-CFLAGS =
++CFLAGS += -g
+ endif
+ 
+ LIBS = -lm 
+@@ -15,7 +13,7 @@ OBJS = suitename.o suitenscrt.o suitenin
  # ---------------------------------------------------------------------
  HEADERS = suitename.h suitenscrt.h suitenutil.h suiteninit.h suiteninpt.h suitenout.h
  suitename: $(OBJS)


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,22 +2,10 @@
 
 # DH_VERBOSE := 1
 
-# some helpful variables - uncomment them if needed
-# shamelessly stolen from http://jmtd.net/log/awk/
-#DEBVERS        := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-#VERSION        := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-#DEBFLAVOR      := $(shell dpkg-parsechangelog | awk '/^Distribution:/ {print $$2}')
-#DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-#DEBIAN_BRANCH  := $(shell awk 'BEGIN{FS="[= ]+"} /debian-branch/ {print $$2}' debian/gbp.conf)
-#GIT_TAG        := $(subst ~,_,$(VERSION))
-
-# alternatively to manually set those variables you can
-#  include /usr/share/cdbs/1/rules/buildvars.mk
-# and use what is set there.  Any hint whether dh might set variables in
-# a similar manner are welcome.
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build --buildsystem=makefile -- -f Makefile.linux suitename
+	dh_auto_build --buildsystem=makefile -- -f Makefile.linux MAKECMDGOALS=debug suitename



View it on GitLab: https://salsa.debian.org/med-team/suitename/compare/67e457a90790251e16c2358fdf5692a60e9639a8...fba2cec06636605a479cd5a7d43c382a8d7672ac

-- 
View it on GitLab: https://salsa.debian.org/med-team/suitename/compare/67e457a90790251e16c2358fdf5692a60e9639a8...fba2cec06636605a479cd5a7d43c382a8d7672ac
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/20180703/3d75a30b/attachment-0001.html>


More information about the debian-med-commit mailing list