Hi Edward,
On 12/20/2015 01:02 PM, aitor_czr wrote:
On 12/19/2015 05:52 PM, Edward Bartolo<[email protected]> wrote:
>> >The command:
>> >edbarx@edbarx-pc:~/netman_from_backup_08.12.2015$ git patch
>> >../rainer_dng-15.12.2015.patch
>
>The right command is this other one:
>
>$ git apply --stat ../rainer_dng-15.12.2015.patch
Hi Aitor,
Thanks for your reply. Git is reporting that the patch is corrupted. I
informed Rainer about that.
Edward
Rainer's patch is not corrupted:
$ git apply --stat ../rainer_dng-15.12.2015.patch
Makefile | 10 +++++++++-
debian/netman-backend.install | 2 +-
debian/rules | 9 ---------
3 files changed, 10 insertions(+), 11 deletions(-)
My bad :)
The above command doen't change nothing. I aplplied the patch by the
following way (in the parent directory):
$ patch < rainer_dng-15.12.2015.patch
can't find file to patch at input line 5
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/Makefile b/Makefile
|index 55df54f..6b263d7 100644
|--- a/Makefile
|+++ b/Makefile
--------------------------
File to patch: netman/Makefile
patching file netman/Makefile
Hunk #1 succeeded at 13 with fuzz 2.
can't find file to patch at input line 25
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/debian/netman-backend.install
|b/debian/netman-backend.install
|index 5028afe..f7832d3 100644
|--- a/debian/netman-backend.install
|+++ b/debian/netman-backend.install
--------------------------
File to patch: netman/debian/netman-backend.install
patching file netman/debian/netman-backend.install
can't find file to patch at input line 32
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/debian/rules b/debian/rules
|index 0e6d2ad..01b984c 100755
|--- a/debian/rules
|+++ b/debian/rules
--------------------------
File to patch: netman/debian/rules
patching file netman/debian/rules
You can generate a patch in the parent directory by the following way:
$ git diff --relative > ../aitor_czr-20.2.2015.patch
By the way. This is the result of the proccess:
$ git-buildpackage -j4 -tc -k465D41B1 --git-export-dir="../build-area"
--git-pristine-tar --git-tag --git-ignore-branch
pristine-tar: successfully generated
/home/aitor/NETMAN_5/build-area/netman_0.1.1-85ee69e.orig.tar.bz2
gbp:info: Exporting 'HEAD' to '/home/aitor/NETMAN_5/build-area/netman-tmp'
gbp:info: Moving '/home/aitor/NETMAN_5/build-area/netman-tmp' to
'/home/aitor/NETMAN_5/build-area/netman-0.1.1-85ee69e'
dpkg-buildpackage -rfakeroot -D -us -uc -i -I -j4 -tc
dpkg-buildpackage: source package netman
dpkg-buildpackage: source version 0.1.1-85ee69e-jessie3
dpkg-buildpackage: source distribution unstable
dpkg-buildpackage: source changed by Aitor Cuadrado Zubizarreta
<[email protected]>
dpkg-source -i -I --before-build netman-0.1.1-85ee69e
dpkg-buildpackage: host architecture amd64
fakeroot debian/rules clean
dh clean --with quilt,python2
dh_testdir
dh_auto_clean
make[1]: Entering directory
'/home/aitor/NETMAN_5/build-area/netman-0.1.1-85ee69e'
Makefile:23: *** missing separator (did you mean TAB instead of 8
spaces?). Stop.
make[1]: Leaving directory
'/home/aitor/NETMAN_5/build-area/netman-0.1.1-85ee69e'
dh_auto_clean: make -j1 distclean returned exit code 2
debian/rules:4: recipe for target 'clean' failed
make: *** [clean] Error 2
dpkg-buildpackage: error: fakeroot debian/rules clean gave error exit
status 2
debuild: fatal error at line 1376:
dpkg-buildpackage -rfakeroot -D -us -uc -i -I -j4 -tc *failed*
gbp:error: 'debuild -i -I -j4 -tc -k465D41B1' failed: it exited with 29
Aitor.
_______________________________________________
Dng mailing list
[email protected]
https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
