[Reproducible-commits] [dpkg] 14/63: u-a: Move alternative temporary extension to the build system

Jérémy Bobbio lunar at moszumanska.debian.org
Fri Mar 4 17:44:42 UTC 2016


This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit 964f92016dd3d05b80d9500109cd37bd14a737da
Author: Guillem Jover <guillem at debian.org>
Date:   Mon Feb 22 19:47:04 2016 +0100

    u-a: Move alternative temporary extension to the build system
    
    This removes another dpkg-specific string from the code to make life
    easier for downstreams using update-alternatives on non-dpkg based
    systems.
---
 debian/changelog            | 2 ++
 utils/Makefile.am           | 1 +
 utils/update-alternatives.c | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a104805..acd7050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
   * Portability:
     - Move DPKG_ADMINDIR environment variable name out from update-alternatives
       code, to make life easier for non-dpkg-based systems.
+    - Move alternatives temporary extension out from update-alternatives code,
+      to make life easier for non-dpkg-based systems.
   * Perl modules:
     - Add new CTRL_REPO_RELEASE control block type to Dpkg::Control.
     - Add new CTRL_COPYRIGHT_HEADER, CTRL_COPYRIGHT_FILES and
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 39c0dab..48163d1 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -25,6 +25,7 @@ update_alternatives_SOURCES = \
 	update-alternatives.c
 
 update_alternatives_CPPFLAGS = \
+	-DALT_TMP_EXT=\".dpkg-tmp\" \
 	-DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \
 	$(AM_CPPFLAGS)
 
diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index 044de92..76f4671 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -63,8 +63,6 @@ static int opt_skip_auto = 0;
 static int opt_verbose = 0;
 static int opt_force = 0;
 
-#define ALT_TMP_EXT ".dpkg-tmp"
-
 /*
  * Functions.
  */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git



More information about the Reproducible-commits mailing list