Merge lp:~dannf/ubuntu/trusty/nis/lp1280666 into lp:ubuntu/trusty/nis

Proposed by dann frazier on 2014-02-15
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/nis/lp1280666
Merge into: lp:ubuntu/trusty/nis
Diff against target: 128 lines (+16/-33)
8 files modified
debian/autoreconf (+3/-0)
debian/changelog (+6/-0)
debian/control (+1/-1)
debian/fix-up-autoconf (+0/-27)
debian/rules (+3/-5)
yp-tools-2.9/configure.in (+1/-0)
ypbind-mt-1.20.1/configure.in (+1/-0)
ypserv-2.19/configure.in (+1/-0)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/nis/lp1280666
Reviewer Review Type Date Requested Status
Ubuntu branches 2014-02-15 Pending
Review via email: mp+206592@code.launchpad.net
To post a comment you must log in.
36. By dann frazier on 2014-02-18

use dh_clean instead of manually removing debhelper log

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/autoreconf'
2--- debian/autoreconf 1970-01-01 00:00:00 +0000
3+++ debian/autoreconf 2014-02-18 17:15:45 +0000
4@@ -0,0 +1,3 @@
5+ypbind-mt-1.20.1
6+ypserv-2.19
7+yp-tools-2.9
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2012-06-25 16:55:01 +0000
11+++ debian/changelog 2014-02-18 17:15:45 +0000
12@@ -1,3 +1,9 @@
13+nis (3.17-32ubuntu6) UNRELEASED; urgency=medium
14+
15+ * Use dh-autoreconf to fix FTBFS on arm64 (LP: #1280666)
16+
17+ -- dann frazier <dannf@debian.org> Sat, 15 Feb 2014 13:15:00 -0700
18+
19 nis (3.17-32ubuntu5) quantal; urgency=low
20
21 * debian/preinst: Check for existence of /etc/init.d/nis before
22
23=== modified file 'debian/control'
24--- debian/control 2012-02-28 00:20:56 +0000
25+++ debian/control 2014-02-18 17:15:45 +0000
26@@ -5,7 +5,7 @@
27 XSBC-Original-Maintainer: Mark Brown <broonie@debian.org>
28 Uploaders: Miquel van Smoorenburg <miquels@cistron.nl>
29 Standards-Version: 3.8.1
30-Build-Depends: libgdbm-dev, gcc (>= 2.95), gettext, po-debconf, libslp-dev, libdbus-glib-1-dev, network-manager-dev, file, debhelper (>= 7.3.15ubuntu2)
31+Build-Depends: libgdbm-dev, gcc (>= 2.95), gettext, po-debconf, libslp-dev, libdbus-glib-1-dev, network-manager-dev, file, debhelper (>= 7.3.15ubuntu2), dh-autoreconf
32 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-nis/nis/debian/
33
34 Package: nis
35
36=== removed file 'debian/fix-up-autoconf'
37--- debian/fix-up-autoconf 2004-08-10 01:41:45 +0000
38+++ debian/fix-up-autoconf 1970-01-01 00:00:00 +0000
39@@ -1,27 +0,0 @@
40-#! /bin/sh
41-#
42-# Prevent autoconf and automake if they're installed from
43-# generating new Makefiles and configure scripts by lowering
44-# the timestamps on the master files if they're newer than
45-# the generated files.
46-#
47-
48-find . -name \*.am | while read master
49-do
50- generated=${master%.am}.in
51- if [ -f $generated -a $master -nt $generated ]
52- then
53- echo touch -r $generated $master
54- touch -r $generated $master
55- fi
56-done
57-
58-find . -name configure.in | while read master
59-do
60- generated=${master%.in}
61- if [ -f $generated -a $master -nt $generated ]
62- then
63- echo touch -r $generated $master
64- touch -r $generated $master
65- fi
66-done
67
68=== modified file 'debian/rules'
69--- debian/rules 2012-02-28 00:20:56 +0000
70+++ debian/rules 2014-02-18 17:15:45 +0000
71@@ -34,11 +34,7 @@
72
73 build:
74 # Builds the binary package.
75- #
76- # Kludge to prevent configure from being rebuilt
77- #
78- sh debian/fix-up-autoconf
79- #
80+ dh_autoreconf
81 -(cd $(YPTOOLS) && [ ! -f config.status ] && \
82 CFLAGS=$(CFLAGS) ./configure \
83 --prefix=/usr --mandir=/usr/share/man \
84@@ -77,6 +73,8 @@
85 rm -f build debian/{files,substvars,templates.gen}
86 find . -name '*.bak' -o -name '*~' | xargs -r rm --
87 rm -f */config.cache
88+ dh_autoreconf_clean
89+ dh_clean
90
91 # Architecture independant files.
92 binary-indep: build
93
94=== modified file 'yp-tools-2.9/configure.in'
95--- yp-tools-2.9/configure.in 2005-04-03 12:29:38 +0000
96+++ yp-tools-2.9/configure.in 2014-02-18 17:15:45 +0000
97@@ -4,6 +4,7 @@
98 AC_CONFIG_SRCDIR([src/ypcat.c])
99 AM_CONFIG_HEADER(config.h)
100 AC_PREFIX_DEFAULT(/usr)
101+AM_GNU_GETTEXT_VERSION(0.18.3)
102
103 dnl Set of available languages.
104 ALL_LINGUAS="de"
105
106=== modified file 'ypbind-mt-1.20.1/configure.in'
107--- ypbind-mt-1.20.1/configure.in 2006-11-28 15:27:25 +0000
108+++ ypbind-mt-1.20.1/configure.in 2014-02-18 17:15:45 +0000
109@@ -3,6 +3,7 @@
110 AM_INIT_AUTOMAKE(ypbind-mt, 1.20.1)
111 AM_CONFIG_HEADER(config.h)
112 AC_PREFIX_DEFAULT(/usr)
113+AM_GNU_GETTEXT_VERSION(0.18.3)
114
115 dnl Set of available languages.
116 ALL_LINGUAS="de"
117
118=== modified file 'ypserv-2.19/configure.in'
119--- ypserv-2.19/configure.in 2006-07-10 10:31:56 +0000
120+++ ypserv-2.19/configure.in 2014-02-18 17:15:45 +0000
121@@ -7,6 +7,7 @@
122 AC_CONFIG_SRCDIR([ypserv/ypserv.c])
123 AM_CONFIG_HEADER(config.h)
124 AC_PREFIX_DEFAULT(/usr)
125+AM_GNU_GETTEXT_VERSION(0.18.3)
126
127 AC_SUBST(PACKAGE)
128 AC_SUBST(VERSION)

Subscribers

People subscribed via source and target branches

to all changes: