osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use only dpkg-buildpackage for building .debs 

This makes .deb generation not depending on autotools and also removes
debian-package target from autotools-generated Makefile.

Change-Id: Ia684cd310d85906763af1035fddf39c1fbaed984
Reviewed-on: https://code.wireshark.org/review/2052
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Balint Reczey 2014-06-09 14:53:00 +07:00 committed by Gerald Combs
parent 9538d1c433
commit a08cbe7071
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
INSTALL
View File

@ -216,11 +216,10 @@ README.windows for those instructions.
8. Run './wireshark' or './tshark' or ./dumpcap, and make sure things are
working. You must have root privileges in order to capture live data.
9. Run 'make install'. If you're running a system that supports
the Apt, RPM, OSX, or System V Release 4 packaging systems, you can
9./a. Run 'make install'. If you're running a system that supports
the RPM, OSX, or System V Release 4 packaging systems, you can
run one of
make debian-package # Builds a binary package using dpkg
make rpm-package # Builds a binary package using rpm
make srpm-package # Builds a source package using rpm
make svr4-package # Builds a binary package using pkgmk
@ -229,6 +228,16 @@ README.windows for those instructions.
to make an installable package for your system.
9/b. If you 're running a system that supports APT (Debian/Ubuntu/etc.)
run
dpkg-buildpackage -us -uc -rfakeroot
in the source directory right after extracting of checking out
Wireshark's source code. (You don't have to run configure/make/etc.
prior to running dpkg-buildpackage)
If you have trouble with the build or installation process, you can
find assistance on the wireshark-users and wireshark-dev mailing lists.
See http://www.wireshark.org/lists/ for details.

9
Makefile.am
View File

@ -1157,15 +1157,6 @@ rpm-package: dist
false; \
fi
debian-package: debian/rules
@if test x$(HAVE_DPKG_BUILDPACKAGE) = xyes ; then \
rm -f config.h ; \
dpkg-buildpackage -rfakeroot -us -uc ; \
else \
echo "Error: Debian packaging tools not found." ; \
echo "Package build abandoned." ; \
fi
# XXX - This assumes we're building from the source directory.
osx-app: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) packaging/macosx/Info.plist
@if test x$(HAVE_OSX_PACKAGING) = xyes ; then \

3
README.cmake
View File

@ -121,9 +121,6 @@ What needs to be done?
- Build source package (using CPack).
This is obsolete if we decide to release VCS snapshots instead
- Build rpm package (using CPack).
- Build dpkg package (using CPack).
This is obsolete, we should call CMake from debian/rules instead, using dh
(rbalint)
- Add back checkAPI target.
- Test and add support for other platforms (BSDs, OSX,
Solaris, Win32, Win64, ...)