:: Re: [DNG] Apply Rainer's patch to n…
Página Inicial
Delete this message
Reply to this message
Autor: Rainer Weikusat
Data:  
Para: dng
Assunto: Re: [DNG] Apply Rainer's patch to netman.
Edward Bartolo <edbarx@???> 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: