Merge lp:~dannf/ubuntu/trusty/partclone/arm64-ftbfs into lp:ubuntu/trusty/partclone

Proposed by dann frazier
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/partclone/arm64-ftbfs
Merge into: lp:ubuntu/trusty/partclone
Diff against target: 773 lines (+691/-4)
8 files modified
.pc/applied-patches (+1/-0)
.pc/fix-autoreconf-warnings.patch/m4/po.m4 (+428/-0)
.pc/fix-autoreconf-warnings.patch/src/Makefile.am (+191/-0)
debian/changelog (+7/-0)
debian/patches/fix-autoreconf-warnings.patch (+55/-0)
debian/patches/series (+1/-0)
m4/po.m4 (+1/-1)
src/Makefile.am (+7/-3)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/partclone/arm64-ftbfs
Reviewer Review Type Date Requested Status
dann frazier Needs Resubmitting
Marc Deslauriers Needs Fixing
Review via email: mp+207755@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the work. Would it make sense to foward that fix to Debian as well?

Revision history for this message
dann frazier (dannf) wrote :

On Wed, Feb 26, 2014 at 4:00 AM, Sebastien Bacher <email address hidden> wrote:
> Thanks for the work. Would it make sense to foward that fix to Debian as well?

It seems to be an Ubuntu-specific issue that automake warnings are
treated as errors here. There's nothing truly arch-specific here.
In fact, without these changes, partclone currently FTBFS on x86 in
trusty as well, while it builds fine in sid.

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Thanks for the merge request.

This package uses the quilt patch system. Please convert your changes to a proper patch, including patch headers.

Thanks!

review: Needs Fixing
19. By dann frazier

This issue is not arch-specific; correct changelog

20. By dann frazier

Use existing quilt system for patch

21. By dann frazier

Add dep-3 headers

Revision history for this message
dann frazier (dannf) wrote :

Thanks for the review. I've converted the patch to quilt and included dep-3 headers.
I've also submitted these changes upstream and included a reference in the dep-3 Forwarded field.

review: Needs Resubmitting
22. By dann frazier

Patches accepted upstream, update DEP-3 headers

Revision history for this message
dann frazier (dannf) wrote :

fyi, patches now accepted upstream. dep-3 headers updated.

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2012-11-25 21:09:00 +0000
3+++ .pc/applied-patches 2014-03-26 02:58:34 +0000
4@@ -1,3 +1,4 @@
5 10-configure.ac.patch
6 20-reiserfsclone.patch
7 upstream-translation-changes.patch
8+fix-autoreconf-warnings.patch
9
10=== added directory '.pc/fix-autoreconf-warnings.patch'
11=== added directory '.pc/fix-autoreconf-warnings.patch/m4'
12=== added file '.pc/fix-autoreconf-warnings.patch/m4/po.m4'
13--- .pc/fix-autoreconf-warnings.patch/m4/po.m4 1970-01-01 00:00:00 +0000
14+++ .pc/fix-autoreconf-warnings.patch/m4/po.m4 2014-03-26 02:58:34 +0000
15@@ -0,0 +1,428 @@
16+# po.m4 serial 13 (gettext-0.15)
17+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
18+dnl This file is free software; the Free Software Foundation
19+dnl gives unlimited permission to copy and/or distribute it,
20+dnl with or without modifications, as long as this notice is preserved.
21+dnl
22+dnl This file can can be used in projects which are not available under
23+dnl the GNU General Public License or the GNU Library General Public
24+dnl License but which still want to provide support for the GNU gettext
25+dnl functionality.
26+dnl Please note that the actual code of the GNU gettext library is covered
27+dnl by the GNU Library General Public License, and the rest of the GNU
28+dnl gettext package package is covered by the GNU General Public License.
29+dnl They are *not* in the public domain.
30+
31+dnl Authors:
32+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
33+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
34+
35+AC_PREREQ(2.50)
36+
37+dnl Checks for all prerequisites of the po subdirectory.
38+AC_DEFUN([AM_PO_SUBDIRS],
39+[
40+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
41+ AC_REQUIRE([AC_PROG_INSTALL])dnl
42+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
43+ AC_REQUIRE([AM_NLS])dnl
44+
45+ dnl Perform the following tests also if --disable-nls has been given,
46+ dnl because they are needed for "make dist" to work.
47+
48+ dnl Search for GNU msgfmt in the PATH.
49+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
50+ dnl The second test excludes FreeBSD msgfmt.
51+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
52+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
53+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
54+ :)
55+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
56+
57+ dnl Test whether it is GNU msgfmt >= 0.15.
58+changequote(,)dnl
59+ case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
60+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
61+ *) MSGFMT_015=$MSGFMT ;;
62+ esac
63+changequote([,])dnl
64+ AC_SUBST([MSGFMT_015])
65+changequote(,)dnl
66+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
67+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
68+ *) GMSGFMT_015=$GMSGFMT ;;
69+ esac
70+changequote([,])dnl
71+ AC_SUBST([GMSGFMT_015])
72+
73+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
74+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
75+ dnl The second test excludes FreeBSD xgettext.
76+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
77+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
78+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
79+ :)
80+ dnl Remove leftover from FreeBSD xgettext call.
81+ rm -f messages.po
82+
83+ dnl Test whether it is GNU xgettext >= 0.15.
84+changequote(,)dnl
85+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
86+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
87+ *) XGETTEXT_015=$XGETTEXT ;;
88+ esac
89+changequote([,])dnl
90+ AC_SUBST([XGETTEXT_015])
91+
92+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
93+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
94+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
95+
96+ dnl Installation directories.
97+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
98+ dnl have to define it here, so that it can be used in po/Makefile.
99+ test -n "$localedir" || localedir='${datadir}/locale'
100+ AC_SUBST([localedir])
101+
102+ AC_CONFIG_COMMANDS([po-directories], [[
103+ for ac_file in $CONFIG_FILES; do
104+ # Support "outfile[:infile[:infile...]]"
105+ case "$ac_file" in
106+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
107+ esac
108+ # PO directories have a Makefile.in generated from Makefile.in.in.
109+ case "$ac_file" in */Makefile.in)
110+ # Adjust a relative srcdir.
111+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
112+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
113+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
114+ # In autoconf-2.13 it is called $ac_given_srcdir.
115+ # In autoconf-2.50 it is called $srcdir.
116+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
117+ case "$ac_given_srcdir" in
118+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
119+ /*) top_srcdir="$ac_given_srcdir" ;;
120+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
121+ esac
122+ # Treat a directory as a PO directory if and only if it has a
123+ # POTFILES.in file. This allows packages to have multiple PO
124+ # directories under different names or in different locations.
125+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
126+ rm -f "$ac_dir/POTFILES"
127+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
128+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
129+ POMAKEFILEDEPS="POTFILES.in"
130+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
131+ # on $ac_dir but don't depend on user-specified configuration
132+ # parameters.
133+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
134+ # The LINGUAS file contains the set of available languages.
135+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
136+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
137+ fi
138+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
139+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
140+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
141+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
142+ else
143+ # The set of available languages was given in configure.in.
144+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
145+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
146+ fi
147+ # Compute POFILES
148+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
149+ # Compute UPDATEPOFILES
150+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
151+ # Compute DUMMYPOFILES
152+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
153+ # Compute GMOFILES
154+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
155+ case "$ac_given_srcdir" in
156+ .) srcdirpre= ;;
157+ *) srcdirpre='$(srcdir)/' ;;
158+ esac
159+ POFILES=
160+ UPDATEPOFILES=
161+ DUMMYPOFILES=
162+ GMOFILES=
163+ for lang in $ALL_LINGUAS; do
164+ POFILES="$POFILES $srcdirpre$lang.po"
165+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
166+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
167+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
168+ done
169+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
170+ # environment variable.
171+ INST_LINGUAS=
172+ if test -n "$ALL_LINGUAS"; then
173+ for presentlang in $ALL_LINGUAS; do
174+ useit=no
175+ if test "%UNSET%" != "$LINGUAS"; then
176+ desiredlanguages="$LINGUAS"
177+ else
178+ desiredlanguages="$ALL_LINGUAS"
179+ fi
180+ for desiredlang in $desiredlanguages; do
181+ # Use the presentlang catalog if desiredlang is
182+ # a. equal to presentlang, or
183+ # b. a variant of presentlang (because in this case,
184+ # presentlang can be used as a fallback for messages
185+ # which are not translated in the desiredlang catalog).
186+ case "$desiredlang" in
187+ "$presentlang"*) useit=yes;;
188+ esac
189+ done
190+ if test $useit = yes; then
191+ INST_LINGUAS="$INST_LINGUAS $presentlang"
192+ fi
193+ done
194+ fi
195+ CATALOGS=
196+ if test -n "$INST_LINGUAS"; then
197+ for lang in $INST_LINGUAS; do
198+ CATALOGS="$CATALOGS $lang.gmo"
199+ done
200+ fi
201+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
202+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
203+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
204+ if test -f "$f"; then
205+ case "$f" in
206+ *.orig | *.bak | *~) ;;
207+ *) cat "$f" >> "$ac_dir/Makefile" ;;
208+ esac
209+ fi
210+ done
211+ fi
212+ ;;
213+ esac
214+ done]],
215+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
216+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
217+ # from automake < 1.5.
218+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
219+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
220+ LINGUAS="${LINGUAS-%UNSET%}"
221+ ])
222+])
223+
224+dnl Postprocesses a Makefile in a directory containing PO files.
225+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
226+[
227+ # When this code is run, in config.status, two variables have already been
228+ # set:
229+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
230+ # - LINGUAS is the value of the environment variable LINGUAS at configure
231+ # time.
232+
233+changequote(,)dnl
234+ # Adjust a relative srcdir.
235+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
236+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
237+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
238+ # In autoconf-2.13 it is called $ac_given_srcdir.
239+ # In autoconf-2.50 it is called $srcdir.
240+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
241+ case "$ac_given_srcdir" in
242+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
243+ /*) top_srcdir="$ac_given_srcdir" ;;
244+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
245+ esac
246+
247+ # Find a way to echo strings without interpreting backslash.
248+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
249+ gt_echo='echo'
250+ else
251+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
252+ gt_echo='printf %s\n'
253+ else
254+ echo_func () {
255+ cat <<EOT
256+$*
257+EOT
258+ }
259+ gt_echo='echo_func'
260+ fi
261+ fi
262+
263+ # A sed script that extracts the value of VARIABLE from a Makefile.
264+ sed_x_variable='
265+# Test if the hold space is empty.
266+x
267+s/P/P/
268+x
269+ta
270+# Yes it was empty. Look if we have the expected variable definition.
271+/^[ ]*VARIABLE[ ]*=/{
272+ # Seen the first line of the variable definition.
273+ s/^[ ]*VARIABLE[ ]*=//
274+ ba
275+}
276+bd
277+:a
278+# Here we are processing a line from the variable definition.
279+# Remove comment, more precisely replace it with a space.
280+s/#.*$/ /
281+# See if the line ends in a backslash.
282+tb
283+:b
284+s/\\$//
285+# Print the line, without the trailing backslash.
286+p
287+tc
288+# There was no trailing backslash. The end of the variable definition is
289+# reached. Clear the hold space.
290+s/^.*$//
291+x
292+bd
293+:c
294+# A trailing backslash means that the variable definition continues in the
295+# next line. Put a nonempty string into the hold space to indicate this.
296+s/^.*$/P/
297+x
298+:d
299+'
300+changequote([,])dnl
301+
302+ # Set POTFILES to the value of the Makefile variable POTFILES.
303+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
304+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
305+ # Compute POTFILES_DEPS as
306+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
307+ POTFILES_DEPS=
308+ for file in $POTFILES; do
309+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
310+ done
311+ POMAKEFILEDEPS=""
312+
313+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
314+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
315+ fi
316+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
317+ # The LINGUAS file contains the set of available languages.
318+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
319+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
320+ else
321+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
322+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
323+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
324+ fi
325+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
326+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
327+ # Compute POFILES
328+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
329+ # Compute UPDATEPOFILES
330+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
331+ # Compute DUMMYPOFILES
332+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
333+ # Compute GMOFILES
334+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
335+ # Compute PROPERTIESFILES
336+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
337+ # Compute CLASSFILES
338+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
339+ # Compute QMFILES
340+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
341+ # Compute MSGFILES
342+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
343+ # Compute RESOURCESDLLFILES
344+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
345+ case "$ac_given_srcdir" in
346+ .) srcdirpre= ;;
347+ *) srcdirpre='$(srcdir)/' ;;
348+ esac
349+ POFILES=
350+ UPDATEPOFILES=
351+ DUMMYPOFILES=
352+ GMOFILES=
353+ PROPERTIESFILES=
354+ CLASSFILES=
355+ QMFILES=
356+ MSGFILES=
357+ RESOURCESDLLFILES=
358+ for lang in $ALL_LINGUAS; do
359+ POFILES="$POFILES $srcdirpre$lang.po"
360+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
361+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
362+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
363+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
364+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
365+ QMFILES="$QMFILES $srcdirpre$lang.qm"
366+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
367+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
368+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
369+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
370+ done
371+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
372+ # environment variable.
373+ INST_LINGUAS=
374+ if test -n "$ALL_LINGUAS"; then
375+ for presentlang in $ALL_LINGUAS; do
376+ useit=no
377+ if test "%UNSET%" != "$LINGUAS"; then
378+ desiredlanguages="$LINGUAS"
379+ else
380+ desiredlanguages="$ALL_LINGUAS"
381+ fi
382+ for desiredlang in $desiredlanguages; do
383+ # Use the presentlang catalog if desiredlang is
384+ # a. equal to presentlang, or
385+ # b. a variant of presentlang (because in this case,
386+ # presentlang can be used as a fallback for messages
387+ # which are not translated in the desiredlang catalog).
388+ case "$desiredlang" in
389+ "$presentlang"*) useit=yes;;
390+ esac
391+ done
392+ if test $useit = yes; then
393+ INST_LINGUAS="$INST_LINGUAS $presentlang"
394+ fi
395+ done
396+ fi
397+ CATALOGS=
398+ JAVACATALOGS=
399+ QTCATALOGS=
400+ TCLCATALOGS=
401+ CSHARPCATALOGS=
402+ if test -n "$INST_LINGUAS"; then
403+ for lang in $INST_LINGUAS; do
404+ CATALOGS="$CATALOGS $lang.gmo"
405+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
406+ QTCATALOGS="$QTCATALOGS $lang.qm"
407+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
408+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
409+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
410+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
411+ done
412+ fi
413+
414+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
415+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
416+ # Add dependencies that cannot be formulated as a simple suffix rule.
417+ for lang in $ALL_LINGUAS; do
418+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
419+ cat >> "$ac_file.tmp" <<EOF
420+$frobbedlang.msg: $lang.po
421+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
422+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
423+EOF
424+ done
425+ fi
426+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
427+ # Add dependencies that cannot be formulated as a simple suffix rule.
428+ for lang in $ALL_LINGUAS; do
429+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
430+ cat >> "$ac_file.tmp" <<EOF
431+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
432+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
433+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
434+EOF
435+ done
436+ fi
437+ if test -n "$POMAKEFILEDEPS"; then
438+ cat >> "$ac_file.tmp" <<EOF
439+Makefile: $POMAKEFILEDEPS
440+EOF
441+ fi
442+ mv "$ac_file.tmp" "$ac_file"
443+])
444
445=== added directory '.pc/fix-autoreconf-warnings.patch/src'
446=== added file '.pc/fix-autoreconf-warnings.patch/src/Makefile.am'
447--- .pc/fix-autoreconf-warnings.patch/src/Makefile.am 1970-01-01 00:00:00 +0000
448+++ .pc/fix-autoreconf-warnings.patch/src/Makefile.am 2014-03-26 02:58:34 +0000
449@@ -0,0 +1,191 @@
450+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
451+LDADD = $(LIBINTL)
452+sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg
453+TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
454+
455+BTRFS_SOURCE= btrfs/crc32c.c btrfs/disk-io.c btrfs/extent-tree.c btrfs/inode-map.c btrfs/rbtree.c btrfs/volumes.c btrfs/ctree.c btrfs/extent-cache.c btrfs/file-item.c btrfs/print-tree.c btrfs/root-tree.c btrfs/dir-item.c btrfs/extent_io.c btrfs/inode-item.c btrfs/radix-tree.c btrfs/utils.c btrfs/crc32c.h btrfs/extent-cache.h btrfs/ioctl.h btrfs/print-tree.h btrfs/transaction.h btrfs/volumes.h btrfs/ctree.h btrfs/extent_io.h btrfs/kerncompat.h btrfs/radix-tree.h btrfs/utils.h btrfs/disk-io.h btrfs/hash.h btrfs/list.h btrfs/rbtree.h btrfs/version.h
456+
457+EXFATFS_SOURCE= exfat/byteorder.h exfat/cluster.c exfat/exfatfs.h exfat/exfat.h exfat/io.c exfat/libexfat.a exfat/log.c exfat/lookup.c exfat/mount.c exfat/node.c exfat/time.c exfat/utf.c exfat/utils.c exfat/version.h
458+
459+if ENABLE_STATIC
460+LDFLAGS+=-static
461+endif
462+
463+if ENABLE_TINFO
464+LIBS+=-ltinfo
465+endif
466+
467+if ENABLE_MEMTRACE
468+CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
469+endif
470+
471+if ENABLE_NCURSESW
472+CFLAGS+=-I/usr/include/ncursesw
473+endif
474+
475+version.h: FORCE
476+ $(TOOLBOX) --update-version
477+
478+partclone_info_SOURCES=infoclone.c partclone.c partclone.h fs_common.h
479+
480+partclone_restore_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h restore.c
481+partclone_restore_CFLAGS=-DRESTORE
482+
483+partclone_chkimg_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h chkimg.c
484+
485+partclone_dd_SOURCES=partclone.c partclone.h progress.c progress.h gettext.h ddclone.c
486+
487+if ENABLE_EXTFS
488+sbin_PROGRAMS += partclone.extfs
489+partclone_extfs_SOURCES=main.c partclone.c progress.c extfsclone.c extfsclone.h partclone.h progress.h gettext.h
490+partclone_extfs_CFLAGS=-DEXTFS
491+partclone_extfs_LDADD=-lext2fs -lcom_err -lpthread
492+endif
493+
494+if ENABLE_REISERFS
495+sbin_PROGRAMS += partclone.reiserfs
496+partclone_reiserfs_SOURCES=main.c partclone.c progress.c reiserfsclone.c reiserfsclone.h partclone.h progress.h gettext.h
497+partclone_reiserfs_CFLAGS=-DREISERFS
498+partclone_reiserfs_LDADD=-lreiserfs -ldal
499+endif
500+
501+if ENABLE_REISER4
502+sbin_PROGRAMS += partclone.reiser4
503+partclone_reiser4_SOURCES=main.c partclone.c progress.c reiser4clone.c reiser4clone.h partclone.h progress.h gettext.h
504+partclone_reiser4_CFLAGS=-DREISER4
505+partclone_reiser4_LDADD=-lreiser4 -laal
506+endif
507+
508+if ENABLE_HFSP
509+sbin_PROGRAMS += partclone.hfsp
510+partclone_hfsp_SOURCES=main.c partclone.c progress.c hfsplusclone.c hfsplusclone.h partclone.h progress.h gettext.h
511+partclone_hfsp_CFLAGS=-DHFSPLUS
512+endif
513+
514+if ENABLE_XFS
515+sbin_PROGRAMS += partclone.xfs
516+partclone_xfs_SOURCES=main.c partclone.c progress.c xfsclone.c xfsclone.h partclone.h progress.h gettext.h
517+partclone_xfs_CFLAGS=-DXFS -D_FILE_OFFSET_BITS=64
518+partclone_xfs_LDFLAGS=
519+partclone_xfs_LDADD=-lxfs -lrt -lpthread
520+endif
521+
522+if ENABLE_EXFAT
523+sbin_PROGRAMS += partclone.exfat
524+partclone_exfat_SOURCES=main.c partclone.c progress.c exfatclone.c exfatclone.h partclone.h progress.h gettext.h $(EXFATFS_SOURCE)
525+partclone_exfat_CFLAGS=-DEXFAT -D_FILE_OFFSET_BITS=64
526+endif
527+
528+if ENABLE_FAT
529+sbin_PROGRAMS += partclone.fat
530+partclone_fat_SOURCES=main.c partclone.c progress.c fatclone.c fatclone.h partclone.h progress.h gettext.h
531+partclone_fat_CFLAGS=-DFAT
532+endif
533+
534+sbin_PROGRAMS += partclone.ntfsfixboot
535+partclone_ntfsfixboot_SOURCES=ntfsfixboot.c
536+if ENABLE_NTFS
537+sbin_PROGRAMS += partclone.ntfs
538+partclone_ntfs_SOURCES=main.c partclone.c progress.c ntfsclone-ng.c ntfsclone-ng.h partclone.h progress.h gettext.h
539+if ENABLE_NTFS_3G
540+partclone_ntfs_CFLAGS=-DNTFS3G
541+partclone_ntfs_LDADD=-lntfs-3g
542+else
543+partclone_ntfs_CFLAGS=-DNTFS
544+partclone_ntfs_LDADD=-lntfs
545+endif
546+endif
547+
548+if ENABLE_UFS
549+sbin_PROGRAMS += partclone.ufs
550+partclone_ufs_SOURCES=main.c partclone.c progress.c ufsclone.c ufsclone.h partclone.h progress.h gettext.h
551+partclone_ufs_CFLAGS=-DUFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
552+partclone_ufs_LDADD=-lufs -lbsd
553+endif
554+
555+if ENABLE_VMFS
556+sbin_PROGRAMS += partclone.vmfs
557+partclone_vmfs_SOURCES=main.c partclone.c progress.c vmfsclone.c vmfsclone.h partclone.h progress.h gettext.h
558+partclone_vmfs_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS)
559+partclone_vmfs_LDADD=-lvmfs -luuid
560+
561+sbin_PROGRAMS += partclone.vmfs5
562+partclone_vmfs5_SOURCES=main.c partclone.c progress.c vmfs5clone.c vmfsclone.h partclone.h progress.h gettext.h
563+partclone_vmfs5_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS)
564+partclone_vmfs5_LDADD=-lvmfs -luuid
565+
566+sbin_PROGRAMS += partclone.fstype
567+partclone_fstype_SOURCES=fstype.c
568+partclone_fstype_CFLAGS=-DVMFS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(UUID_CFLAGS)
569+partclone_fstype_LDADD=-lvmfs -luuid
570+
571+endif
572+
573+if ENABLE_JFS
574+sbin_PROGRAMS += partclone.jfs
575+#partclone_jfs_SOURCES=main.c partclone.c progress.c jfs_devices.c jfs_devices.h jfsclone.c jfsclone.h partclone.h progress.h gettext.h
576+partclone_jfs_SOURCES=main.c partclone.c progress.c jfsclone.c jfsclone.h partclone.h progress.h gettext.h
577+partclone_jfs_CFLAGS=-DJFS
578+partclone_jfs_LDADD=-luuid -ljfs
579+endif
580+
581+if ENABLE_BTRFS
582+sbin_PROGRAMS += partclone.btrfs
583+partclone_btrfs_SOURCES=main.c partclone.c progress.c btrfsclone.c btrfsclone.h partclone.h progress.h gettext.h $(BTRFS_SOURCE)
584+partclone_btrfs_CFLAGS=-DBTRFS -D_FILE_OFFSET_BITS=64
585+partclone_btrfs_LDADD=-luuid
586+endif
587+
588+# Extra
589+install-exec-hook:
590+if ENABLE_EXTFS
591+ $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext2
592+ $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext3
593+ $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext4
594+ $(LN_S) -f partclone.extfs $(DESTDIR)$(sbindir)/partclone.ext4dev
595+endif
596+if ENABLE_HFSP
597+ $(LN_S) -f partclone.hfsp $(DESTDIR)$(sbindir)/partclone.hfs+
598+ $(LN_S) -f partclone.hfsp $(DESTDIR)$(sbindir)/partclone.hfsplus
599+endif
600+if ENABLE_NTFS
601+ $(LN_S) -f partclone.ntfsfixboot $(DESTDIR)$(sbindir)/partclone.ntfsreloc
602+endif
603+if ENABLE_FAT
604+ $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat12
605+ $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat16
606+ $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.fat32
607+ $(LN_S) -f partclone.fat $(DESTDIR)$(sbindir)/partclone.vfat
608+endif
609+if ENABLE_VMFS
610+ $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.VMFS_volume_member
611+ $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.vmfs3
612+# $(LN_S) -f partclone.vmfs $(DESTDIR)$(sbindir)/partclone.vmfs5
613+endif
614+
615+uninstall-local:
616+if ENABLE_EXTFS
617+ $(RM) -f $(sbindir)/partclone.ext4dev
618+ $(RM) -f $(sbindir)/partclone.ext4
619+ $(RM) -f $(sbindir)/partclone.ext3
620+ $(RM) -f $(sbindir)/partclone.ext2
621+endif
622+if ENABLE_HFSP
623+ $(RM) -f $(sbindir)/partclone.hfs+
624+ $(RM) -f $(sbindir)/partclone.hfsplus
625+endif
626+if ENABLE_FAT
627+ $(RM) -f $(sbindir)/partclone.fat12
628+ $(RM) -f $(sbindir)/partclone.fat16
629+ $(RM) -f $(sbindir)/partclone.fat32
630+ $(RM) -f $(sbindir)/partclone.vfat
631+endif
632+if ENABLE_NTFS
633+ $(RM) -f $(sbindir)/partclone.ntfsreloc
634+endif
635+
636+if ENABLE_VMFS
637+ $(RM) -f $(sbindir)/partclone.VMFS_volume_member
638+endif
639+
640+FORCE:
641
642=== modified file 'debian/changelog'
643--- debian/changelog 2013-05-30 15:12:54 +0000
644+++ debian/changelog 2014-03-26 02:58:34 +0000
645@@ -1,3 +1,10 @@
646+partclone (0.2.51-1ubuntu3) UNRELEASED; urgency=medium
647+
648+ * Fix autoreconf warnings, currently treated as errors, causing
649+ this package to FTBFS (LP: #1283294)
650+
651+ -- dann frazier <dann.frazier@canonical.com> Fri, 07 Mar 2014 15:14:44 -0700
652+
653 partclone (0.2.51-1ubuntu2) saucy; urgency=low
654
655 * Rebuild against ntfs-3g-841.
656
657=== added file 'debian/patches/fix-autoreconf-warnings.patch'
658--- debian/patches/fix-autoreconf-warnings.patch 1970-01-01 00:00:00 +0000
659+++ debian/patches/fix-autoreconf-warnings.patch 2014-03-26 02:58:34 +0000
660@@ -0,0 +1,55 @@
661+Description: Cleanup automake warnings
662+ These warnings are treated as errors on Ubuntu, causing this package to FTBFS.
663+Author: Thomas Tsai <thomas@nchc.org.tw>, dann frazier <dann.frazier@canonical.com>
664+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/partclone/+bug/1283294
665+Applied-Upstream: https://github.com/Thomas-Tsai/partclone/commit/1809fffe1c94ec9bcf2cfabbd4220e9d5db79cbe, https://github.com/Thomas-Tsai/partclone/commit/e1aa90d14b556078eb14460516c963f259f81395
666+
667+Index: arm64-ftbfs/m4/po.m4
668+===================================================================
669+--- arm64-ftbfs.orig/m4/po.m4 2014-03-07 15:12:28.411951459 -0700
670++++ arm64-ftbfs/m4/po.m4 2014-03-07 15:13:43.020729078 -0700
671+@@ -24,7 +24,7 @@
672+ [
673+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
674+ AC_REQUIRE([AC_PROG_INSTALL])dnl
675+- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
676++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
677+ AC_REQUIRE([AM_NLS])dnl
678+
679+ dnl Perform the following tests also if --disable-nls has been given,
680+Index: arm64-ftbfs/src/Makefile.am
681+===================================================================
682+--- arm64-ftbfs.orig/src/Makefile.am 2014-03-07 15:12:28.411951459 -0700
683++++ arm64-ftbfs/src/Makefile.am 2014-03-07 15:13:43.020729078 -0700
684+@@ -1,3 +1,4 @@
685++AUTOMAKE_OPTIONS = subdir-objects
686+ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
687+ LDADD = $(LIBINTL)
688+ sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg
689+@@ -7,8 +8,11 @@
690+
691+ EXFATFS_SOURCE= exfat/byteorder.h exfat/cluster.c exfat/exfatfs.h exfat/exfat.h exfat/io.c exfat/libexfat.a exfat/log.c exfat/lookup.c exfat/mount.c exfat/node.c exfat/time.c exfat/utf.c exfat/utils.c exfat/version.h
692+
693++AM_CFLAGS =
694++AM_LDFLAGS =
695++
696+ if ENABLE_STATIC
697+-LDFLAGS+=-static
698++AM_LDFLAGS+=-static
699+ endif
700+
701+ if ENABLE_TINFO
702+@@ -16,11 +20,11 @@
703+ endif
704+
705+ if ENABLE_MEMTRACE
706+-CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
707++AM_CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
708+ endif
709+
710+ if ENABLE_NCURSESW
711+-CFLAGS+=-I/usr/include/ncursesw
712++AM_CFLAGS+=-I/usr/include/ncursesw
713+ endif
714+
715+ version.h: FORCE
716
717=== modified file 'debian/patches/series'
718--- debian/patches/series 2012-11-25 21:09:00 +0000
719+++ debian/patches/series 2014-03-26 02:58:34 +0000
720@@ -1,3 +1,4 @@
721 10-configure.ac.patch
722 20-reiserfsclone.patch
723 upstream-translation-changes.patch
724+fix-autoreconf-warnings.patch
725
726=== modified file 'm4/po.m4'
727--- m4/po.m4 2011-06-28 17:18:39 +0000
728+++ m4/po.m4 2014-03-26 02:58:34 +0000
729@@ -24,7 +24,7 @@
730 [
731 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
732 AC_REQUIRE([AC_PROG_INSTALL])dnl
733- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
734+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
735 AC_REQUIRE([AM_NLS])dnl
736
737 dnl Perform the following tests also if --disable-nls has been given,
738
739=== modified file 'src/Makefile.am'
740--- src/Makefile.am 2012-08-19 10:15:44 +0000
741+++ src/Makefile.am 2014-03-26 02:58:34 +0000
742@@ -1,3 +1,4 @@
743+AUTOMAKE_OPTIONS = subdir-objects
744 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
745 LDADD = $(LIBINTL)
746 sbin_PROGRAMS=partclone.info partclone.dd partclone.restore partclone.chkimg
747@@ -7,8 +8,11 @@
748
749 EXFATFS_SOURCE= exfat/byteorder.h exfat/cluster.c exfat/exfatfs.h exfat/exfat.h exfat/io.c exfat/libexfat.a exfat/log.c exfat/lookup.c exfat/mount.c exfat/node.c exfat/time.c exfat/utf.c exfat/utils.c exfat/version.h
750
751+AM_CFLAGS =
752+AM_LDFLAGS =
753+
754 if ENABLE_STATIC
755-LDFLAGS+=-static
756+AM_LDFLAGS+=-static
757 endif
758
759 if ENABLE_TINFO
760@@ -16,11 +20,11 @@
761 endif
762
763 if ENABLE_MEMTRACE
764-CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
765+AM_CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
766 endif
767
768 if ENABLE_NCURSESW
769-CFLAGS+=-I/usr/include/ncursesw
770+AM_CFLAGS+=-I/usr/include/ncursesw
771 endif
772
773 version.h: FORCE

Subscribers

People subscribed via source and target branches

to all changes: