Re: [DNG] Apply Rainer's patch to netman.
Hi All, These last few days I couldn't work on netman as I have a painful bacterial upper jaw infection. I couldn't concentrate on the project with all that pain. This is my third day taking antibiotics. Nevertheless, I tried Rainer's patch. Git is saying it is incompatible with my sources. I will take the surest path: that of reading the .diff file and applying the edits by hand where they are applicable. Edward On 20/12/2015, aitor_czr wrote: > Hi, > > On 12/20/2015 07:02 PM, aitor_czr wrote: >> There were spaces instead of tab keys in the Makefile. Fixed it: > > Now we can also replace: > >dh $@ --with quilt,python2 > > by: > >dh $@ > > Aitor. > ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Hi, On 12/20/2015 07:02 PM, aitor_czr wrote: There were spaces instead of tab keys in the Makefile. Fixed it: Now we can also replace: dh $@ --with quilt,python2 by: dh $@ Aitor. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
aitor_czr writes: [...] > There were spaces instead of tab keys in the Makefile. Fixed it: I both determined this and fixed it and meanwhile sent two mails explaining this and two more with the fixed patch. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
On 12/20/2015 02:11 PM, aitor_czr wrote: 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 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 There were spaces instead of tab keys in the Makefile. Fixed it: diff --git a/Makefile b/Makefile index 55df54f..e045055 100644 --- a/Makefile +++ b/Makefile @@ -13,5 +13,13 @@ clean: rm -f lib/*/*.* rm -f backend netman -.PHONY: all clean +INST := install -o root -g root +INST_X := $(INST) -m 0755 +INST_D := $(INST) -m 0644 +install: all +$(INST_X) -d $(DESTDIR) +$(INST_X) netman backend_src/bin/backend $(DESTDIR) +$(INST_D) netman.ico netman.desktop $(DESTDIR) + +.PHONY: all clean install 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 @@ -1 +1 @@ -backend_src/src/backend /usr/lib/netman/bin \ No newline at end of file +backend /usr/lib/netman/bin diff --git a/debian/rules b/debian/rules index 0e6d2ad..01b984c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,11 +3,3 @@ %: dh $@ --with quilt,python2 -override_dh_auto_clean: -dh_auto_clean - -override_dh_auto_configure: -#fpc -MObjFPC -Scghi -Tlinux -vewn -Filib/x86_64-linux -Fl/opt/gnome/lib -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux/gtk2 -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux -Fu/usr/lib/lazarus/1.2.4/components/lazutils/lib/x86_64-linux -Fu/usr/lib/lazarus/1.2.4/packager/units/x86_64-linux -Fu. -FUlib/x86_64-linux -l -dLCL -dLCLgtk2 netman.lpr && cd backend_src/src && gcc -g -I../include core_functions.c file_functions.c backend.c essid_encoder.c -o backend -lazbuild -B netman.lpr && cd backend_src/src && gcc -lm -I../include core_functions.c file_functions.c backend.c essid_encoder.c automated_scanner.c -o backend - -override_dh_auto_build: Cheers, Aitor. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
On Sun, 20 Dec 2015 17:52:49 +0100, Arnt wrote in message <20151220175249.6d049...@nb6.lan>: > On Sun, 20 Dec 2015 16:42:47 +0100, aitor_czr wrote in message > <5676cc77.9030...@gnuinos.org>: > > > > > Hi Arnt, > > > > > > On 12/20/2015 02:21 PM, Arnt Karlsen wrote: > > > On Sun, 20 Dec 2015 13:02:28 +0100, aitor_czr wrote in message > > > <567698d4.1080...@gnuinos.org>: > > > > > >> >You can generate a patch in the parent directory by the > > >> >following way: > > >> > > > >> >$ git diff --relative > ../aitor_czr-20.2.2015.patch > > > ...or $ git diff --relative > ../aitor_czr-$(date +%FT%T-%Z).patch > > > oor ;o) $ git diff --relative > \ > > > ../aitor_czr-$(git log |head -n1 |cut -d" " -f2)-$(date > > > +%FT%T-%Z).patch > > > > > > This generates a patch named: > > > > aitor_czr-2015-12-20T16:34:19-CET.patch > > > > or ;o) > > > > aitor_czr-f1b0bdff4e61d3425ccdd425d2452c8b3c346df4-2015-12-20T16:12:25-CET.patch > > > > Here, $(git log |head -n1 |cut -d" " -f2) is the bizarre hash of 40 > > digits content in: > > > > .git/refs/heads/master [*] > > > > Thanks, > > > > Aitor. > > > > [*] This is being in the master branch. > > > > > > ..and if you reaaally wanna spell it out ;o) $ git diff \ > --relative > ../aitor_czr-$(git log |head |tr [:space:] _ ).patch > ..erm, make that: $ git diff --relative > \ ../aitor_czr-$(git log |head |tr \<\>[:space:] \(\)_ ).patch -- ..med vennlig hilsen = with Kind Regards from Arnt Karlsen ...with a number of polar bear hunters in his ancestry... Scenarios always come in sets of three: best case, worst case, and just in case. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
On Sun, 20 Dec 2015 16:42:47 +0100, aitor_czr wrote in message <5676cc77.9030...@gnuinos.org>: > > Hi Arnt, > > > On 12/20/2015 02:21 PM, Arnt Karlsen wrote: > > On Sun, 20 Dec 2015 13:02:28 +0100, aitor_czr wrote in message > > <567698d4.1080...@gnuinos.org>: > > > >> >You can generate a patch in the parent directory by the following > >> >way: > >> > > >> >$ git diff --relative > ../aitor_czr-20.2.2015.patch > > ...or $ git diff --relative > ../aitor_czr-$(date +%FT%T-%Z).patch > > oor ;o) $ git diff --relative > \ > > ../aitor_czr-$(git log |head -n1 |cut -d" " -f2)-$(date > > +%FT%T-%Z).patch > > > This generates a patch named: > > aitor_czr-2015-12-20T16:34:19-CET.patch > > or ;o) > > aitor_czr-f1b0bdff4e61d3425ccdd425d2452c8b3c346df4-2015-12-20T16:12:25-CET.patch > > Here, $(git log |head -n1 |cut -d" " -f2) is the bizarre hash of 40 > digits content in: > > .git/refs/heads/master [*] > > Thanks, > > Aitor. > > [*] This is being in the master branch. > > ..and if you reaaally wanna spell it out ;o) $ git diff \ --relative > ../aitor_czr-$(git log |head |tr [:space:] _ ).patch -- ..med vennlig hilsen = with Kind Regards from Arnt Karlsen ...with a number of polar bear hunters in his ancestry... Scenarios always come in sets of three: best case, worst case, and just in case. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Hi Arnt, On 12/20/2015 02:21 PM, Arnt Karlsen wrote: On Sun, 20 Dec 2015 13:02:28 +0100, aitor_czr wrote in message <567698d4.1080...@gnuinos.org>: >You can generate a patch in the parent directory by the following way: > >$ git diff --relative > ../aitor_czr-20.2.2015.patch ...or $ git diff --relative > ../aitor_czr-$(date +%FT%T-%Z).patch oor ;o) $ git diff --relative > \ ../aitor_czr-$(git log |head -n1 |cut -d" " -f2)-$(date +%FT%T-%Z).patch This generates a patch named: aitor_czr-2015-12-20T16:34:19-CET.patch or ;o) aitor_czr-f1b0bdff4e61d3425ccdd425d2452c8b3c346df4-2015-12-20T16:12:25-CET.patch Here, $(git log |head -n1 |cut -d" " -f2) is the bizarre hash of 40 digits content in: .git/refs/heads/master [*] Thanks, Aitor. [*] This is being in the master branch. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
aitor_czr writes: > On 12/20/2015 01:02 PM, aitor_czr wrote: On 12/19/2015 05:52 PM, Edward Bartolo 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? Patches are (as I already wrote in the past) commonly generated such that the top-level directory has to be stripped away by patch (as this means people can use different names for 'top-level directories', ie, patch -p1 <../patch assuming the patch file resides above the top-level directory. Further, as I also already wrote, the text in the first mail I sent had the tabs in the Makefile changes expanded to spaces. This means while the patch itself isn't corrupted (as a patch), it will end up corrupting the Makefiles by replacing the leading tabs with spaces. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Edward Bartolo writes: >> On 19/12/2015, aitor_czr wrote: >> Hi Edward, >> >> >> On 12/19/2015 05:52 PM, Edward Bartolo 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. Using copy'n'paste to save the content of the not-reformatted mail to a text file is sufficient to create a 'working' patch-file for me. Same as text attachment. diff --git a/Makefile b/Makefile index 55df54f..4a747ef 100644 --- a/Makefile +++ b/Makefile @@ -13,5 +13,13 @@ clean: rm -f lib/*/*.* rm -f backend netman -.PHONY: all clean +.PHONY: all clean install +INST := install -o root -g root +INST_X := $(INST) -m 0755 +INST_D := $(INST) -m 0644 + +install: all + $(INST_X) -d $(DESTDIR) + $(INST_X) netman backend_src/bin/backend $(DESTDIR) + $(INST_D) netman.ico netman.desktop $(DESTDIR) 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 @@ -1 +1 @@ -backend_src/src/backend /usr/lib/netman/bin \ No newline at end of file +backend /usr/lib/netman/bin diff --git a/debian/rules b/debian/rules index 0e6d2ad..bf3a311 100755 --- a/debian/rules +++ b/debian/rules @@ -2,12 +2,3 @@ %: dh $@ --with quilt,python2 - -override_dh_auto_clean: - dh_auto_clean - -override_dh_auto_configure: - #fpc -MObjFPC -Scghi -Tlinux -vewn -Filib/x86_64-linux -Fl/opt/gnome/lib -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux/gtk2 -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux -Fu/usr/lib/lazarus/1.2.4/components/lazutils/lib/x86_64-linux -Fu/usr/lib/lazarus/1.2.4/packager/units/x86_64-linux -Fu. -FUlib/x86_64-linux -l -dLCL -dLCLgtk2 netman.lpr && cd backend_src/src && gcc -g -I../include core_functions.c file_functions.c backend.c essid_encoder.c -o backend - lazbuild -B netman.lpr && cd backend_src/src && gcc -lm -I../include core_functions.c file_functions.c backend.c essid_encoder.c automated_scanner.c -o backend - -override_dh_auto_build: ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
On Sun, 20 Dec 2015 13:02:28 +0100, aitor_czr wrote in message <567698d4.1080...@gnuinos.org>: > Hi Edward, > > On 12/20/2015 06:14 AM, Edward Bartolo wrote: > >> On 12/19/2015 05:52 PM, Edward Bartolo 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(-) > > You can generate a patch in the parent directory by the following way: > > $ git diff --relative > ../aitor_czr-20.2.2015.patch ...or $ git diff --relative > ../aitor_czr-$(date +%FT%T-%Z).patch oor ;o) $ git diff --relative > \ ../aitor_czr-$(git log |head -n1 |cut -d" " -f2)-$(date +%FT%T-%Z).patch -- ..med vennlig hilsen = with Kind Regards from Arnt Karlsen ...with a number of polar bear hunters in his ancestry... Scenarios always come in sets of three: best case, worst case, and just in case. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Hi Edward, On 12/20/2015 01:02 PM, aitor_czr wrote: On 12/19/2015 05:52 PM, Edward Bartolo 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 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 Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Hi Edward, On 12/19/2015 07:40 PM, aitor_czr wrote: >I also read that the patch can be saved/archived into git, and I think >it is the proper way it should be done. Yes, you can use quilt for that. Forget this last comment. I spoke too quick. Aitor. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Hi Edward, On 12/20/2015 06:14 AM, Edward Bartolo wrote: On 12/19/2015 05:52 PM, Edward Bartolo 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(-) You can generate a patch in the parent directory by the following way: $ git diff --relative > ../aitor_czr-20.2.2015.patch Cheers, Aitor. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
> On 19/12/2015, aitor_czr wrote: > Hi Edward, > > > On 12/19/2015 05:52 PM, Edward Bartolo 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 ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Hi Edward, On 12/19/2015 05:52 PM, Edward Bartolo wrote: Hi, > >I created a .patch file by copying and pasting the patch supplied by >Rainer, read above. I have the fully restored and up to date netman >sources, but I am not sure whether as typed below "git patch" should >actually apply the patch properly. > >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 >I also read that the patch can be saved/archived into git, and I think >it is the proper way it should be done. Yes, you can use quilt for that. I'm busy now and i didn't test the patch. Maybe tomorrow :(( >Can I safely run the command as shown and if possible tell git to >archive/save the patch? > >Edward Aitor. ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
Edward Bartolo writes: > edbarx@edbarx-pc:~/netman_from_backup_08.12.2015$ git apply --check > ../rainer_dng-15.12.2015.patch > error: patch failed: Makefile:13 > error: Makefile: patch does not apply > error: patch failed: debian/rules:2 > error: debian/rules: patch does not apply > > > Checking for patch applicability git states the patch is not applicable. It contains tab characters in various places (ASCII 9) and 'text processing tools', eg, mail readers, are sometime fond of expanding these to some number of spaces. But this must not happen here. Same with tabs restored. NB: This is relevant for Makefiles as a command line in a Makefile must start with a tab (because someone considered that a good idea in 197x ...). diff --git a/Makefile b/Makefile index 55df54f..4a747ef 100644 --- a/Makefile +++ b/Makefile @@ -13,5 +13,13 @@ clean: rm -f lib/*/*.* rm -f backend netman -.PHONY: all clean +.PHONY: all clean install +INST :=install -o root -g root +INST_X := $(INST) -m 0755 +INST_D := $(INST) -m 0644 + +install: all + $(INST_X) -d $(DESTDIR) + $(INST_X) netman backend_src/bin/backend $(DESTDIR) + $(INST_D) netman.ico netman.desktop $(DESTDIR) 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 @@ -1 +1 @@ -backend_src/src/backend /usr/lib/netman/bin \ No newline at end of file +backend /usr/lib/netman/bin diff --git a/debian/rules b/debian/rules index 0e6d2ad..bf3a311 100755 --- a/debian/rules +++ b/debian/rules @@ -2,12 +2,3 @@ %: dh $@ --with quilt,python2 - -override_dh_auto_clean: - dh_auto_clean - -override_dh_auto_configure: - #fpc -MObjFPC -Scghi -Tlinux -vewn -Filib/x86_64-linux -Fl/opt/gnome/lib -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux/gtk2 -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux -Fu/usr/lib/lazarus/1.2.4/components/lazutils/lib/x86_64-linux -Fu/usr/lib/lazarus/1.2.4/packager/units/x86_64-linux -Fu. -FUlib/x86_64-linux -l -dLCL -dLCLgtk2 netman.lpr && cd backend_src/src && gcc -g -I../include core_functions.c file_functions.c backend.c essid_encoder.c -o backend - lazbuild -B netman.lpr && cd backend_src/src && gcc -lm -I../include core_functions.c file_functions.c backend.c essid_encoder.c automated_scanner.c -o backend - -override_dh_auto_build: ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
Re: [DNG] Apply Rainer's patch to netman.
edbarx@edbarx-pc:~/netman_from_backup_08.12.2015$ git apply --check ../rainer_dng-15.12.2015.patch error: patch failed: Makefile:13 error: Makefile: patch does not apply error: patch failed: debian/rules:2 error: debian/rules: patch does not apply Checking for patch applicability git states the patch is not applicable. On 19/12/2015, Edward Bartolo wrote: > On 15/12/2015, Rainer Weikusat wrote: >> Some more remarks on the packaging efforts so far: The rules file in the >> git repository is >> >> -- >> #!/usr/bin/make -f >> >> %: >> dh $@ --with quilt,python2 >> >> override_dh_auto_clean: >> dh_auto_clean >> >> override_dh_auto_configure: >> #fpc -MObjFPC -Scghi -Tlinux -vewn -Filib/x86_64-linux >> -Fl/opt/gnome/lib -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux/gtk2 >> -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux >> -Fu/usr/lib/lazarus/1.2.4/components/lazut >> lazbuild -B netman.lpr && cd backend_src/src && gcc -lm >> -I../include >> core_functions.c file_functions.c backend.c essid_encoder.c >> automated_scanner.c -o backend >> >> override_dh_auto_build: >> >> >> this is as bizarre as it is completely useless. Debhelper will use the >> package Makefile with a target of 'all' in order to build the package >> and with a target of 'install' in order to install it into the staging >> area. None of the overrides is needed. The Makefile doesn't have an >> install target. >> >> With the following changes, the packages get built as intended: >> >> --- >> diff --git a/Makefile b/Makefile >> index 55df54f..6b263d7 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -13,5 +13,13 @@ clean: >> rm -f lib/*/*.* >> rm -f backend netman >> >> -.PHONY: all clean >> +.PHONY: all clean install >> >> +INST :=install -o root -g root >> +INST_X := $(INST) -m 0755 >> +INST_D := $(INST) -m 0644 >> + >> +install: all >> + $(INST_X) -d $(DESTDIR) >> + $(INST_X) netman backend_src/bin/backend $(DESTDIR) >> + $(INST_D) netman.ico netman.desktop $(DESTDIR) >> 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 >> @@ -1 +1 @@ >> -backend_src/src/backend /usr/lib/netman/bin >> \ No newline at end of file >> +backend /usr/lib/netman/bin >> diff --git a/debian/rules b/debian/rules >> index 0e6d2ad..bf3a311 100755 >> --- a/debian/rules >> +++ b/debian/rules >> @@ -2,12 +2,3 @@ >> >> %: >> dh $@ --with quilt,python2 >> - >> -override_dh_auto_clean: >> - dh_auto_clean >> - >> -override_dh_auto_configure: >> - #fpc -MObjFPC -Scghi -Tlinux -vewn -Filib/x86_64-linux >> -Fl/opt/gnome/lib -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux/gtk2 >> -Fu/usr/lib/lazarus/1.2.4/lcl/units/x86_64-linux >> -Fu/usr/lib/lazarus/1.2.4/components/lazut >> - lazbuild -B netman.lpr && cd backend_src/src && gcc -lm >> -I../include >> core_functions.c file_functions.c backend.c essid_encoder.c >> automated_scanner.c -o backend >> - >> -override_dh_auto_build: >> >> >> NB: The backend permissions will need to be fixed up in a maintainer >> script. >> ___ >> Dng mailing list >> Dng@lists.dyne.org >> https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng > > > Hi, > > I created a .patch file by copying and pasting the patch supplied by > Rainer, read above. I have the fully restored and up to date netman > sources, but I am not sure whether as typed below "git patch" should > actually apply the patch properly. > > The command: > edbarx@edbarx-pc:~/netman_from_backup_08.12.2015$ git patch > ../rainer_dng-15.12.2015.patch > > I also read that the patch can be saved/archived into git, and I think > it is the proper way it should be done. > > Can I safely run the command as shown and if possible tell git to > archive/save the patch? > > Edward > ___ Dng mailing list Dng@lists.dyne.org https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
