Andreas Tille pushed to branch master at Debian Med / loki
Commits: 4756b023 by Andreas Tille at 2017-10-05T18:20:14+02:00 Standards-Version: 4.1.1 - - - - - ff1e7b11 by Andreas Tille at 2017-10-05T18:20:33+02:00 debhelper 10 - - - - - bca5b7f6 by Andreas Tille at 2017-10-05T18:22:43+02:00 Remove Carleos Artime from Uploaders - - - - - 87c83584 by Andreas Tille at 2017-10-05T18:25:14+02:00 Add fake watch file - - - - - f2d3426d by Andreas Tille at 2017-10-05T18:42:47+02:00 try better hardening (with no real effect) - - - - - fbbd7c03 by Andreas Tille at 2017-10-05T18:45:34+02:00 Do not parse d/changelog in d/rules - - - - - 4f6becad by Andreas Tille at 2018-03-16T21:03:35+01:00 Upload to unstable - - - - - 7 changed files: - debian/changelog - debian/compat - debian/control - debian/copyright - debian/patches/hardening.patch - debian/rules - debian/watch Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -loki (2.4.7.4-7) UNRELEASED; urgency=medium +loki (2.4.7.4-7) unstable; urgency=medium * Moved packaging from SVN to Git - - -- Andreas Tille <[email protected]> Thu, 05 Oct 2017 18:17:59 +0200 + * Standards-Version: 4.1.1 + * debhelper 10 + * Remove Carleos Artime from Uploaders + * Add fake watch file + * Try better hardening (with no real effect) + * Do not parse d/changelog in d/rules + + -- Andreas Tille <[email protected]> Thu, 05 Oct 2017 18:45:39 +0200 loki (2.4.7.4-6) unstable; urgency=medium ===================================== debian/compat ===================================== --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ Source: loki Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Andreas Tille <[email protected]>, - Carleos Artime <[email protected]> +Uploaders: Andreas Tille <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 10) +Standards-Version: 4.1.1 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/loki.git Vcs-Git: https://anonscm.debian.org/git/debian-med/loki.git ===================================== debian/copyright ===================================== --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Loki Upstream-Contact: Simon C. Heath <[email protected]> Source: http://web.archive.org/web/20051220050931/http://loki.homeunix.net/ ===================================== debian/patches/hardening.patch ===================================== --- a/debian/patches/hardening.patch +++ b/debian/patches/hardening.patch @@ -4,11 +4,13 @@ Description: Propagate hardening for linker also into subdirectory utils --- a/utils/Makefile.in +++ b/utils/Makefile.in -@@ -12,7 +12,7 @@ bindir = @bindir@ +@@ -11,8 +11,8 @@ exec_prefix = @exec_prefix@ + bindir = @bindir@ INSTALL_PERM = 755 - CFLAGS = $(MY_CFLAGS) -I../include +-CFLAGS = $(MY_CFLAGS) -I../include -LDFLAGS = ++CFLAGS += $(MY_CFLAGS) -I../include +LDFLAGS := $(LDFLAGS) LIBS = -lm ALL_LIBS = $(LIBS) @@ -22,3 +24,25 @@ Description: Propagate hardening for linker also into subdirectory utils ../bin: mkdir ../bin +--- a/libsrc/Makefile.in ++++ b/libsrc/Makefile.in +@@ -9,7 +9,7 @@ INCLUDES = -I../include/ + #DMALLOC_INC = @DMALLOC_INC@ + #DMALLOC_FLAGS = @DMALLOC_FLAGS@ + +-CFLAGS = $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS) ++CFLAGS += $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS) + + LIB_SRC = io_stuff.c ranlib.c genrand.c ran_xtra.c mkbackup.c strsep.c \ + utils.c remember.c peel_utils.c qsort.c min_deg.c bin_tree.c getopt_long.c +--- a/lokisrc/Makefile.in ++++ b/lokisrc/Makefile.in +@@ -26,7 +26,7 @@ INSTALL_PERM = 755 + #DMALLOC_FLAGS = @DMALLOC_FLAGS@ + + INCLUDES = -I../include +-CFLAGS = $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS) $(MONITOR_FLAGS) ++CFLAGS += $(MY_CFLAGS) $(INCLUDES) $(DMALLOC_FLAGS) $(MONITOR_FLAGS) + ALL_LIBS = $(DMALLOC_LIB) -L. -L../libsrc -lloki -lgen $(LIBS) + + LKLIB_SRC = param_parse.c param_lex.c read_binfiles.c loki_utils.c kinship.c \ ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ # debian/rules for loki using dh # Andreas Tille <[email protected]>, GPL -pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') +include /usr/share/dpkg/default.mk MANPAGES=check_het.1 \ hist.1 \ @@ -14,7 +14,6 @@ MANPAGES=check_het.1 \ prep.1 \ qavg.1 - %: dh $@ @@ -31,7 +30,7 @@ override_dh_auto_install-arch: override_dh_installman-arch: dh_installman -a for man in $(MANPAGES) ; do \ - ln -s loki.1.gz debian/$(pkg)/usr/share/man/man1/$${man}.gz ; \ + ln -s loki.1.gz debian/$(DEB_SOURCE)/usr/share/man/man1/$${man}.gz ; \ done override_dh_auto_build-indep: ===================================== debian/watch ===================================== --- a/debian/watch +++ b/debian/watch @@ -5,3 +5,6 @@ #If you want to download the original source tarball, try the bzipped #version (the link to the gzipped version is broken). +version=4 +opts=dversionmangle=s/.*/0.No-Site/ \ + https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz View it on GitLab: https://salsa.debian.org/med-team/loki/compare/664da899e43177dfb6bdc048c6c400b90446fce3...4f6becad0ed52cfd5474e5c2080fee1a8482a2aa --- View it on GitLab: https://salsa.debian.org/med-team/loki/compare/664da899e43177dfb6bdc048c6c400b90446fce3...4f6becad0ed52cfd5474e5c2080fee1a8482a2aa You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
