Sfoglia il codice sorgente

scripts/mk: Do not use space before dpkg-parsechangelog -S value

Regression introduced in commit a86454180804ee6b54732697e2105708dfce1b82.

Closes: #718014
Guillem Jover 13 anni fa
parent
commit
1eb8370227
2 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. 2 0
      debian/changelog
  2. 3 3
      scripts/mk/pkg-info.mk

+ 2 - 0
debian/changelog

@@ -5,6 +5,8 @@ dpkg (1.17.1) UNRELEASED; urgency=low
   * Add manpages-it Replaces to dpkg due to new translated man pages.
     Reported by Alessio Gaeta <alga777@gmail.com>. Closes: #717983
   * Reword libdpkg-perl description and only list public modules.
+  * Remove space before value in dpkg-parsechangelog -S option on pkg-info.mk.
+    Closes: #718014
 
  -- Guillem Jover <guillem@debian.org>  Sat, 27 Jul 2013 05:32:21 +0200
 

+ 3 - 3
scripts/mk/pkg-info.mk

@@ -9,9 +9,9 @@
 
 dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
 
-DEB_SOURCE = $(call dpkg_late_eval,DEB_SOURCE,dpkg-parsechangelog -S Source)
-DEB_VERSION = $(call dpkg_late_eval,DEB_VERSION,dpkg-parsechangelog -S Version)
+DEB_SOURCE = $(call dpkg_late_eval,DEB_SOURCE,dpkg-parsechangelog -SSource)
+DEB_VERSION = $(call dpkg_late_eval,DEB_VERSION,dpkg-parsechangelog -SVersion)
 DEB_VERSION_EPOCH_UPSTREAM = $(call dpkg_late_eval,DEB_VERSION_EPOCH_UPSTREAM,echo '$(DEB_VERSION)' | sed -e 's/-[^-]*$$//')
 DEB_VERSION_UPSTREAM_REVISION = $(call dpkg_late_eval,DEB_VERSION_UPSTREAM_REVISION,echo '$(DEB_VERSION)' | sed -e 's/^[0-9]*://')
 DEB_VERSION_UPSTREAM = $(call dpkg_late_eval,DEB_VERSION_UPSTREAM,echo '$(DEB_VERSION_EPOCH_UPSTREAM)' | sed -e 's/^[0-9]*://')
-DEB_DISTRIBUTION = $(call dpkg_late_eval,DEB_DISTRIBUTION,dpkg-parsechangelog -S Distribution)
+DEB_DISTRIBUTION = $(call dpkg_late_eval,DEB_DISTRIBUTION,dpkg-parsechangelog -SDistribution)