:: Re: [DNG] Apply Rainer's patch to n…
Top Pagina
Delete this message
Reply to this message
Auteur: Rainer Weikusat
Datum:  
Aan: dng
Onderwerp: Re: [DNG] Apply Rainer's patch to netman.
Edward Bartolo <edbarx@???> writes:
>> On 19/12/2015, aitor_czr <aitor_czr@???> wrote:
>> Hi Edward,
>>
>>
>> On 12/19/2015 05:52 PM, Edward Bartolo <edbarx@???> 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: