On 2016-02-10 17:33:37, Vincent Blut wrote:
> Ok, it’s done. Please could you review and eventually upload if
> everything is good for you? Note that the concerned branch is
> *squeeze-lts* and the chrony-1.24 upstream tarball is in a branch named
> *upstream-1.24*.
Hi!
I have tried to build the package using the git repo here:
git://anonscm.debian.org/collab-maint/chrony.git
For some reason, I can't seem to build the package with
git-buildpackage, or, more precisely, it doesn't pickup the new patch:
$ debdiff chrony_1.24-3+squeeze2_amd64.deb
build-area/chrony_1.24-3+squeeze3_amd64.deb
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
------------------------------------------------
Version: [-1.24-3+squeeze2-] {+1.24-3+squeeze3+}
I tried to build straight from the git repo with pdebuild, no luck there
either:
$ DIST=squeeze ARCH=amd64 pdebuild --pbuilder cowbuilder
W: /home/anarcat/.pbuilderrc does not exist
I: using cowbuilder as pbuilder
dpkg-checkbuilddeps: Unmet build dependencies: texinfo
W: Unmet build-dependency in source
dpkg-buildpackage: source package chrony
dpkg-buildpackage: source version 1.24-3+squeeze3
dpkg-buildpackage: source distribution squeeze-lts
dpkg-buildpackage: source changed by Vincent Blut <vincent.deb...@free.fr>
dpkg-source --before-build chrony
dpkg-checkbuilddeps: Unmet build dependencies: texinfo
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
dpkg-buildpackage: warning: (Use -d flag to override.)
dpkg-buildpackage: warning: this is currently a non-fatal warning with -S, but
will probably become fatal in the future
fakeroot debian/rules clean
dh_testdir
dh_testroot
rm -f build-stamp install-stamp debian/substvars
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || /usr/bin/make distclean
dh_clean
dpkg-source -b chrony
dpkg-source: warning: source directory 'chrony' is not
<sourcepackage>-<upstreamversion> 'chrony-1.24'
dpkg-source: warning: .orig directory name chrony.orig is not
<package>-<upstreamversion> (wanted chrony-1.24.orig)
dpkg-source: info: using source format `1.0'
dpkg-source: info: building chrony using existing chrony_1.24.orig.tar.gz
dpkg-source: info: building chrony in chrony_1.24-3+squeeze3.diff.gz
dpkg-source: warning: executable mode 0744 of '.git/config' will not be
represented in diff
dpkg-source: warning: executable mode 0755 of
'.git/hooks/applypatch-msg.sample' will not be represented in diff
dpkg-source: warning: executable mode 0755 of '.git/hooks/commit-msg.sample'
will not be represented in diff
dpkg-source: warning: executable mode 0755 of '.git/hooks/post-update.sample'
will not be represented in diff
dpkg-source: warning: executable mode 0755 of
'.git/hooks/pre-applypatch.sample' will not be represented in diff
dpkg-source: warning: executable mode 0755 of '.git/hooks/pre-commit.sample'
will not be represented in diff
dpkg-source: warning: executable mode 0755 of '.git/hooks/pre-push.sample' will
not be represented in diff
dpkg-source: warning: executable mode 0755 of '.git/hooks/pre-rebase.sample'
will not be represented in diff
dpkg-source: warning: executable mode 0755 of
'.git/hooks/prepare-commit-msg.sample' will not be represented in diff
dpkg-source: warning: executable mode 0755 of '.git/hooks/update.sample' will
not be represented in diff
dpkg-source: error: cannot represent change to .git/index: binary file contents
changed
dpkg-source: error: cannot represent change to
.git/objects/pack/pack-4029e2b6b072815ff088ae301e0946047c664542.idx: binary
file contents changed
dpkg-source: error: cannot represent change to
.git/objects/pack/pack-4029e2b6b072815ff088ae301e0946047c664542.pack: binary
file contents changed
dpkg-source: warning: the diff modifies the following upstream files:
.git/HEAD
.git/config
.git/description
.git/hooks/applypatch-msg.sample
.git/hooks/commit-msg.sample
.git/hooks/post-update.sample
.git/hooks/pre-applypatch.sample
.git/hooks/pre-commit.sample
.git/hooks/pre-push.sample
.git/hooks/pre-rebase.sample
.git/hooks/prepare-commit-msg.sample
.git/hooks/update.sample
.git/info/exclude
.git/logs/HEAD
.git/logs/refs/heads/master
.git/logs/refs/heads/squeeze-lts
.git/logs/refs/remotes/origin/HEAD
.git/packed-refs
.git/refs/heads/master
.git/refs/heads/squeeze-lts
.git/refs/remotes/origin/HEAD
README
addrfilt.c
chrony.1
chrony.conf
chrony.html
chrony.info
chronyc.1
chronyd.8
client.c
cmdmon.c
faq.html
io_linux.h
ntp_core.c
pktlength.c
version.h
dpkg-source: info: use the '3.0 (quilt)' format to have separate and documented
changes to upstream files, see dpkg-source(1)
dpkg-source: unrepresentable changes to source
dpkg-buildpackage: error: dpkg-source -b chrony gave error exit status 1
... i guess i'm not familiar enough with non-quilt packages to handle
this, but I'd be curious to hear how you build the package from the git
repo.
I'm sorry I can't help further with this now. If you provide a debdiff,
I think I'd be able to review, build and upload the result.
A.
PS: oh, i think i found out:
14_restrict-authentication-of-server-peer-to-specified-key.patch is
missing from debian/applied/series!
--
>From the age of uniformity, from the age of solitude, from the age of
Big Brother, from the age of doublethink - greetings!
- Winston Smith, 1984
