[med-svn] [Git][med-team/epcr][master] 4 commits: d/rules: slight modernization accomodating changes in build tools.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / epcr


Commits:
aa1d5dfc by Étienne Mollier at 2024-07-24T20:46:51+02:00
d/rules: slight modernization accomodating changes in build tools.

Closes: #1076879

- - - - -
5704e6b5 by Étienne Mollier at 2024-07-24T20:55:37+02:00
d/control: declare compliance to standards version 4.7.0.

- - - - -
58e31be3 by Étienne Mollier at 2024-07-24T20:56:08+02:00
d/control: add myself to uploaders.

- - - - -
1886ef47 by Étienne Mollier at 2024-07-24T20:57:04+02:00
ready for upload to unstable.

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+epcr (2.3.12-1-10) unstable; urgency=medium
+
+  * d/rules: slight modernization accomodating changes in build tools.
+    (Closes: #1076879)
+  * d/control: declare compliance to standards version 4.7.0.
+  * d/control: add myself to uploaders.
+
+ -- Étienne Mollier <emollier at debian.org>  Wed, 24 Jul 2024 20:56:51 +0200
+
 epcr (2.3.12-1-9) unstable; urgency=medium
 
   * Standards-Version: 4.5.1 (routine-update)


=====================================
debian/control
=====================================
@@ -2,11 +2,12 @@ Source: epcr
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
            Andreas Tille <tille at debian.org>,
-           Charles Plessy <plessy at debian.org>
+           Charles Plessy <plessy at debian.org>,
+           Étienne Mollier <emollier at debian.org>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.5.1
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/epcr
 Vcs-Git: https://salsa.debian.org/med-team/epcr.git
 Homepage: https://www.ncbi.nlm.nih.gov/tools/epcr/


=====================================
debian/rules
=====================================
@@ -1,17 +1,28 @@
 #!/usr/bin/make -f
-# debian/rules for ncbi-epcr using
 # Andreas Tille <tille at debian.org>, GPL
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 include /usr/share/dpkg/default.mk
 
-VER_MAJOR := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/^\([0-9]\+\)\..*/\1/')
-VER_MINOR := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/^[0-9]\+\.\([0-9]\+\)\..*/\1/')
-VER_BUILD := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/^[0-9]\+\.[0-9]\+\.\(.*\)/\1/')
-
-CFLAGS += -I. -g2 -DDEALLOCATE=0 -DVERSION=\"$(DEB_VERSION_UPSTREAM)\" -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) -DVER_BUILD=$(VER_BUILD) -DSTANDALONE=1
-LDFLAGS += -L.
+VERSION := $(DEB_VERSION_UPSTREAM)
+VER_MAJOR := $(shell echo $(VERSION) | sed 's/^\([0-9]\+\)\..*/\1/')
+VER_MINOR := $(shell echo $(VERSION) | sed 's/^[0-9]\+\.\([0-9]\+\)\..*/\1/')
+VER_BUILD := $(shell \
+	echo $(VERSION) \
+	| sed 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/' \
+)
+
+export DEB_CFLAGS_MAINT_APPEND = \
+	-I. \
+	-g2 \
+	-DDEALLOCATE=0 \
+	-DVERSION=\\\"$(VERSION)\\\" \
+	-DVER_MAJOR=$(VER_MAJOR) \
+	-DVER_MINOR=$(VER_MINOR) \
+	-DVER_BUILD=$(VER_BUILD) \
+	-DSTANDALONE=1
+export DEB_LDFLAGS_MAINT_APPEND = -L.
 
 %:
 	dh $@ --no-parallel



View it on GitLab: https://salsa.debian.org/med-team/epcr/-/compare/3889a1ef1dbef5b9844ad0888a8899e2efe2cfed...1886ef47f5f131b1392cf7292b0d11f90ce6869f

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/epcr/-/compare/3889a1ef1dbef5b9844ad0888a8899e2efe2cfed...1886ef47f5f131b1392cf7292b0d11f90ce6869f
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/20240724/b743071c/attachment-0001.htm>