On 15/12/2015, Rainer Weikusat <[email protected]> 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 > [email protected] > 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 [email protected] https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
