From 79da670bd1b4f91eebee5c96b19eaf1f33c94777 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 10 Feb 2022 11:17:23 -0800 Subject: [PATCH] Packaging+GitLab CI: Move debian to the packaging directory. We keep our various packaging assets in the "packaging" directory. Move the Debian assets there. dpkg-buildpackage doesn't seem appear to have a "debian directory path" option, but symlinking worked in my test container. --- .gitignore | 3 +++ .gitlab-ci.yml | 2 ++ debian/libwireshark-data.install | 3 --- docbook/wsug_src/WSUG_chapter_build_install.adoc | 2 +- {debian => packaging/debian}/README.Debian | 0 .../debian}/README.Debian.security | 0 {debian => packaging/debian}/changelog | 0 {debian => packaging/debian}/compat | 0 {debian => packaging/debian}/control | 0 {debian => packaging/debian}/copyright | 1 + {debian => packaging/debian}/dirs | 0 {debian => packaging/debian}/ethereal-common.NEWS | 0 {debian => packaging/debian}/headers-check.c | 0 packaging/debian/libwireshark-data.install | 3 +++ .../debian}/libwireshark-dev.install | 0 {debian => packaging/debian}/libwireshark0.install | 0 .../debian}/libwireshark0.lintian-overrides | 0 {debian => packaging/debian}/libwireshark0.symbols | 0 .../debian}/libwiretap-dev.install | 0 {debian => packaging/debian}/libwiretap0.docs | 0 {debian => packaging/debian}/libwiretap0.install | 0 {debian => packaging/debian}/libwiretap0.symbols | 0 {debian => packaging/debian}/libwsutil-dev.install | 0 {debian => packaging/debian}/libwsutil0.install | 0 {debian => packaging/debian}/libwsutil0.symbols | 0 .../debian}/license-text-about-dialog | 0 {debian => packaging/debian}/maxmind_db_paths | 0 .../debian}/patches/09_idl2wrs.patch | 0 .../patches/16_licence_about_location.patch | 0 {debian => packaging/debian}/patches/series | 0 {debian => packaging/debian}/po/POTFILES.in | 0 {debian => packaging/debian}/po/cs.po | 0 {debian => packaging/debian}/po/da.po | 0 {debian => packaging/debian}/po/de.po | 0 {debian => packaging/debian}/po/es.po | 0 {debian => packaging/debian}/po/eu.po | 0 {debian => packaging/debian}/po/fi.po | 0 {debian => packaging/debian}/po/fr.po | 0 {debian => packaging/debian}/po/hu.po | 0 {debian => packaging/debian}/po/id.po | 0 {debian => packaging/debian}/po/it.po | 0 {debian => packaging/debian}/po/ja.po | 0 {debian => packaging/debian}/po/ko.po | 0 {debian => packaging/debian}/po/nl.po | 0 {debian => packaging/debian}/po/pt.po | 0 {debian => packaging/debian}/po/pt_BR.po | 0 {debian => packaging/debian}/po/ru.po | 0 {debian => packaging/debian}/po/sk.po | 0 {debian => packaging/debian}/po/sv.po | 0 {debian => packaging/debian}/po/templates.pot | 0 {debian => packaging/debian}/po/vi.po | 0 {debian => packaging/debian}/postinst | 0 {debian => packaging/debian}/rules | 0 {debian => packaging/debian}/source/format | 0 .../debian}/source/lintian-overrides | 0 {debian => packaging/debian}/templates | 0 {debian => packaging/debian}/tests/control | 0 {debian => packaging/debian}/tests/frame-count.lua | 0 {debian => packaging/debian}/tests/gui | 0 {debian => packaging/debian}/tests/tshark | 0 {debian => packaging/debian}/tshark.docs | 0 {debian => packaging/debian}/tshark.install | 0 .../debian}/tshark.lintian-overrides | 0 {debian => packaging/debian}/tshark.manpages | 0 .../debian}/wireshark-common.config | 0 .../debian}/wireshark-common.install | 0 .../debian}/wireshark-common.lintian-overrides | 0 .../debian}/wireshark-common.manpages | 0 .../debian}/wireshark-common.postinst | 0 .../debian}/wireshark-common.postrm | 0 {debian => packaging/debian}/wireshark-dev.docs | 0 {debian => packaging/debian}/wireshark-dev.install | 0 .../debian}/wireshark-dev.manpages | 0 {debian => packaging/debian}/wireshark-dev.prerm | 0 {debian => packaging/debian}/wireshark-doc.docs | 0 {debian => packaging/debian}/wireshark-qt.docs | 0 {debian => packaging/debian}/wireshark-qt.install | 0 .../debian}/wireshark-qt.lintian-overrides | 0 {debian => packaging/debian}/wireshark-qt.manpages | 0 tools/asn2deb | 14 +++++++------- tools/debian-nightly-package.sh | 5 +++-- tools/idl2deb | 14 +++++++------- tools/make-version.pl | 6 +++--- tools/pre-commit-ignore.conf | 7 ++++--- tools/release-update-debian-soversions.sh | 6 +++--- 85 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 debian/libwireshark-data.install rename {debian => packaging/debian}/README.Debian (100%) rename {debian => packaging/debian}/README.Debian.security (100%) rename {debian => packaging/debian}/changelog (100%) rename {debian => packaging/debian}/compat (100%) rename {debian => packaging/debian}/control (100%) rename {debian => packaging/debian}/copyright (99%) rename {debian => packaging/debian}/dirs (100%) rename {debian => packaging/debian}/ethereal-common.NEWS (100%) rename {debian => packaging/debian}/headers-check.c (100%) create mode 100644 packaging/debian/libwireshark-data.install rename {debian => packaging/debian}/libwireshark-dev.install (100%) rename {debian => packaging/debian}/libwireshark0.install (100%) rename {debian => packaging/debian}/libwireshark0.lintian-overrides (100%) rename {debian => packaging/debian}/libwireshark0.symbols (100%) rename {debian => packaging/debian}/libwiretap-dev.install (100%) rename {debian => packaging/debian}/libwiretap0.docs (100%) rename {debian => packaging/debian}/libwiretap0.install (100%) rename {debian => packaging/debian}/libwiretap0.symbols (100%) rename {debian => packaging/debian}/libwsutil-dev.install (100%) rename {debian => packaging/debian}/libwsutil0.install (100%) rename {debian => packaging/debian}/libwsutil0.symbols (100%) rename {debian => packaging/debian}/license-text-about-dialog (100%) rename {debian => packaging/debian}/maxmind_db_paths (100%) rename {debian => packaging/debian}/patches/09_idl2wrs.patch (100%) rename {debian => packaging/debian}/patches/16_licence_about_location.patch (100%) rename {debian => packaging/debian}/patches/series (100%) rename {debian => packaging/debian}/po/POTFILES.in (100%) rename {debian => packaging/debian}/po/cs.po (100%) rename {debian => packaging/debian}/po/da.po (100%) rename {debian => packaging/debian}/po/de.po (100%) rename {debian => packaging/debian}/po/es.po (100%) rename {debian => packaging/debian}/po/eu.po (100%) rename {debian => packaging/debian}/po/fi.po (100%) rename {debian => packaging/debian}/po/fr.po (100%) rename {debian => packaging/debian}/po/hu.po (100%) rename {debian => packaging/debian}/po/id.po (100%) rename {debian => packaging/debian}/po/it.po (100%) rename {debian => packaging/debian}/po/ja.po (100%) rename {debian => packaging/debian}/po/ko.po (100%) rename {debian => packaging/debian}/po/nl.po (100%) rename {debian => packaging/debian}/po/pt.po (100%) rename {debian => packaging/debian}/po/pt_BR.po (100%) rename {debian => packaging/debian}/po/ru.po (100%) rename {debian => packaging/debian}/po/sk.po (100%) rename {debian => packaging/debian}/po/sv.po (100%) rename {debian => packaging/debian}/po/templates.pot (100%) rename {debian => packaging/debian}/po/vi.po (100%) rename {debian => packaging/debian}/postinst (100%) rename {debian => packaging/debian}/rules (100%) rename {debian => packaging/debian}/source/format (100%) rename {debian => packaging/debian}/source/lintian-overrides (100%) rename {debian => packaging/debian}/templates (100%) rename {debian => packaging/debian}/tests/control (100%) rename {debian => packaging/debian}/tests/frame-count.lua (100%) rename {debian => packaging/debian}/tests/gui (100%) rename {debian => packaging/debian}/tests/tshark (100%) rename {debian => packaging/debian}/tshark.docs (100%) rename {debian => packaging/debian}/tshark.install (100%) rename {debian => packaging/debian}/tshark.lintian-overrides (100%) rename {debian => packaging/debian}/tshark.manpages (100%) rename {debian => packaging/debian}/wireshark-common.config (100%) rename {debian => packaging/debian}/wireshark-common.install (100%) rename {debian => packaging/debian}/wireshark-common.lintian-overrides (100%) rename {debian => packaging/debian}/wireshark-common.manpages (100%) rename {debian => packaging/debian}/wireshark-common.postinst (100%) rename {debian => packaging/debian}/wireshark-common.postrm (100%) rename {debian => packaging/debian}/wireshark-dev.docs (100%) rename {debian => packaging/debian}/wireshark-dev.install (100%) rename {debian => packaging/debian}/wireshark-dev.manpages (100%) rename {debian => packaging/debian}/wireshark-dev.prerm (100%) rename {debian => packaging/debian}/wireshark-doc.docs (100%) rename {debian => packaging/debian}/wireshark-qt.docs (100%) rename {debian => packaging/debian}/wireshark-qt.install (100%) rename {debian => packaging/debian}/wireshark-qt.lintian-overrides (100%) rename {debian => packaging/debian}/wireshark-qt.manpages (100%) diff --git a/.gitignore b/.gitignore index 4cf0c515d3..c326407ae4 100644 --- a/.gitignore +++ b/.gitignore @@ -151,6 +151,9 @@ compile_commands.json # Qt Creator CMakeLists.txt.user* +# Debian packaging +debian/ + # Misc # ######## .vagrant diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6688b47b26..fefa715a65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,6 +221,7 @@ Debian Stable APT Package: rules: !reference [.if-merged] image: registry.gitlab.com/wireshark/wireshark-containers/debian-stable-dev script: + - ln --symbolic --no-dereference --force packaging/debian - perl tools/make-version.pl --set-release # Shared GitLab runners limit the log size to 4M, so reduce verbosity. See # https://gitlab.com/gitlab-com/support-forum/issues/2790 @@ -303,6 +304,7 @@ Ubuntu APT Package: script: # build-ubuntu puts us in `build`. - cd .. + - ln --symbolic --no-dereference --force packaging/debian - CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ MAKE=ninja dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast - mkdir ubuntu-packages - mv ../*.deb ubuntu-packages/ diff --git a/debian/libwireshark-data.install b/debian/libwireshark-data.install deleted file mode 100644 index b717c62e2a..0000000000 --- a/debian/libwireshark-data.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/share/wireshark/* -etc/wireshark/init.lua -debian/maxmind_db_paths /usr/share/wireshark diff --git a/docbook/wsug_src/WSUG_chapter_build_install.adoc b/docbook/wsug_src/WSUG_chapter_build_install.adoc index 230718e099..df766ca530 100644 --- a/docbook/wsug_src/WSUG_chapter_build_install.adoc +++ b/docbook/wsug_src/WSUG_chapter_build_install.adoc @@ -331,7 +331,7 @@ Apt should take care of all of the dependency issues for you. ==== By installing Wireshark packages non-root, users won’t gain rights automatically to capture packets. To allow non-root users to capture packets follow the -procedure described in {wireshark-code-file-url}debian/README.Debian +procedure described in {wireshark-code-file-url}packaging/debian/README.Debian (file:///usr/share/doc/wireshark-common/README.Debian.gz[/usr/share/doc/wireshark-common/README.Debian.gz]) ==== diff --git a/debian/README.Debian b/packaging/debian/README.Debian similarity index 100% rename from debian/README.Debian rename to packaging/debian/README.Debian diff --git a/debian/README.Debian.security b/packaging/debian/README.Debian.security similarity index 100% rename from debian/README.Debian.security rename to packaging/debian/README.Debian.security diff --git a/debian/changelog b/packaging/debian/changelog similarity index 100% rename from debian/changelog rename to packaging/debian/changelog diff --git a/debian/compat b/packaging/debian/compat similarity index 100% rename from debian/compat rename to packaging/debian/compat diff --git a/debian/control b/packaging/debian/control similarity index 100% rename from debian/control rename to packaging/debian/control diff --git a/debian/copyright b/packaging/debian/copyright similarity index 99% rename from debian/copyright rename to packaging/debian/copyright index 2c960ba6ef..b03692784e 100644 --- a/debian/copyright +++ b/packaging/debian/copyright @@ -9,6 +9,7 @@ Comment: Wireshark and the "fin" logo are trademarks of Gerald Combs. License: GPL-2+ Files: debian/* + packaging/debian/* Copyright: 1998-2008 Frederic Peters 2005-2009 Joost Yervante Damad 2009-2017 Balint Reczey diff --git a/debian/dirs b/packaging/debian/dirs similarity index 100% rename from debian/dirs rename to packaging/debian/dirs diff --git a/debian/ethereal-common.NEWS b/packaging/debian/ethereal-common.NEWS similarity index 100% rename from debian/ethereal-common.NEWS rename to packaging/debian/ethereal-common.NEWS diff --git a/debian/headers-check.c b/packaging/debian/headers-check.c similarity index 100% rename from debian/headers-check.c rename to packaging/debian/headers-check.c diff --git a/packaging/debian/libwireshark-data.install b/packaging/debian/libwireshark-data.install new file mode 100644 index 0000000000..db23b3d876 --- /dev/null +++ b/packaging/debian/libwireshark-data.install @@ -0,0 +1,3 @@ +usr/share/wireshark/* +etc/wireshark/init.lua +packaging/debian/maxmind_db_paths /usr/share/wireshark diff --git a/debian/libwireshark-dev.install b/packaging/debian/libwireshark-dev.install similarity index 100% rename from debian/libwireshark-dev.install rename to packaging/debian/libwireshark-dev.install diff --git a/debian/libwireshark0.install b/packaging/debian/libwireshark0.install similarity index 100% rename from debian/libwireshark0.install rename to packaging/debian/libwireshark0.install diff --git a/debian/libwireshark0.lintian-overrides b/packaging/debian/libwireshark0.lintian-overrides similarity index 100% rename from debian/libwireshark0.lintian-overrides rename to packaging/debian/libwireshark0.lintian-overrides diff --git a/debian/libwireshark0.symbols b/packaging/debian/libwireshark0.symbols similarity index 100% rename from debian/libwireshark0.symbols rename to packaging/debian/libwireshark0.symbols diff --git a/debian/libwiretap-dev.install b/packaging/debian/libwiretap-dev.install similarity index 100% rename from debian/libwiretap-dev.install rename to packaging/debian/libwiretap-dev.install diff --git a/debian/libwiretap0.docs b/packaging/debian/libwiretap0.docs similarity index 100% rename from debian/libwiretap0.docs rename to packaging/debian/libwiretap0.docs diff --git a/debian/libwiretap0.install b/packaging/debian/libwiretap0.install similarity index 100% rename from debian/libwiretap0.install rename to packaging/debian/libwiretap0.install diff --git a/debian/libwiretap0.symbols b/packaging/debian/libwiretap0.symbols similarity index 100% rename from debian/libwiretap0.symbols rename to packaging/debian/libwiretap0.symbols diff --git a/debian/libwsutil-dev.install b/packaging/debian/libwsutil-dev.install similarity index 100% rename from debian/libwsutil-dev.install rename to packaging/debian/libwsutil-dev.install diff --git a/debian/libwsutil0.install b/packaging/debian/libwsutil0.install similarity index 100% rename from debian/libwsutil0.install rename to packaging/debian/libwsutil0.install diff --git a/debian/libwsutil0.symbols b/packaging/debian/libwsutil0.symbols similarity index 100% rename from debian/libwsutil0.symbols rename to packaging/debian/libwsutil0.symbols diff --git a/debian/license-text-about-dialog b/packaging/debian/license-text-about-dialog similarity index 100% rename from debian/license-text-about-dialog rename to packaging/debian/license-text-about-dialog diff --git a/debian/maxmind_db_paths b/packaging/debian/maxmind_db_paths similarity index 100% rename from debian/maxmind_db_paths rename to packaging/debian/maxmind_db_paths diff --git a/debian/patches/09_idl2wrs.patch b/packaging/debian/patches/09_idl2wrs.patch similarity index 100% rename from debian/patches/09_idl2wrs.patch rename to packaging/debian/patches/09_idl2wrs.patch diff --git a/debian/patches/16_licence_about_location.patch b/packaging/debian/patches/16_licence_about_location.patch similarity index 100% rename from debian/patches/16_licence_about_location.patch rename to packaging/debian/patches/16_licence_about_location.patch diff --git a/debian/patches/series b/packaging/debian/patches/series similarity index 100% rename from debian/patches/series rename to packaging/debian/patches/series diff --git a/debian/po/POTFILES.in b/packaging/debian/po/POTFILES.in similarity index 100% rename from debian/po/POTFILES.in rename to packaging/debian/po/POTFILES.in diff --git a/debian/po/cs.po b/packaging/debian/po/cs.po similarity index 100% rename from debian/po/cs.po rename to packaging/debian/po/cs.po diff --git a/debian/po/da.po b/packaging/debian/po/da.po similarity index 100% rename from debian/po/da.po rename to packaging/debian/po/da.po diff --git a/debian/po/de.po b/packaging/debian/po/de.po similarity index 100% rename from debian/po/de.po rename to packaging/debian/po/de.po diff --git a/debian/po/es.po b/packaging/debian/po/es.po similarity index 100% rename from debian/po/es.po rename to packaging/debian/po/es.po diff --git a/debian/po/eu.po b/packaging/debian/po/eu.po similarity index 100% rename from debian/po/eu.po rename to packaging/debian/po/eu.po diff --git a/debian/po/fi.po b/packaging/debian/po/fi.po similarity index 100% rename from debian/po/fi.po rename to packaging/debian/po/fi.po diff --git a/debian/po/fr.po b/packaging/debian/po/fr.po similarity index 100% rename from debian/po/fr.po rename to packaging/debian/po/fr.po diff --git a/debian/po/hu.po b/packaging/debian/po/hu.po similarity index 100% rename from debian/po/hu.po rename to packaging/debian/po/hu.po diff --git a/debian/po/id.po b/packaging/debian/po/id.po similarity index 100% rename from debian/po/id.po rename to packaging/debian/po/id.po diff --git a/debian/po/it.po b/packaging/debian/po/it.po similarity index 100% rename from debian/po/it.po rename to packaging/debian/po/it.po diff --git a/debian/po/ja.po b/packaging/debian/po/ja.po similarity index 100% rename from debian/po/ja.po rename to packaging/debian/po/ja.po diff --git a/debian/po/ko.po b/packaging/debian/po/ko.po similarity index 100% rename from debian/po/ko.po rename to packaging/debian/po/ko.po diff --git a/debian/po/nl.po b/packaging/debian/po/nl.po similarity index 100% rename from debian/po/nl.po rename to packaging/debian/po/nl.po diff --git a/debian/po/pt.po b/packaging/debian/po/pt.po similarity index 100% rename from debian/po/pt.po rename to packaging/debian/po/pt.po diff --git a/debian/po/pt_BR.po b/packaging/debian/po/pt_BR.po similarity index 100% rename from debian/po/pt_BR.po rename to packaging/debian/po/pt_BR.po diff --git a/debian/po/ru.po b/packaging/debian/po/ru.po similarity index 100% rename from debian/po/ru.po rename to packaging/debian/po/ru.po diff --git a/debian/po/sk.po b/packaging/debian/po/sk.po similarity index 100% rename from debian/po/sk.po rename to packaging/debian/po/sk.po diff --git a/debian/po/sv.po b/packaging/debian/po/sv.po similarity index 100% rename from debian/po/sv.po rename to packaging/debian/po/sv.po diff --git a/debian/po/templates.pot b/packaging/debian/po/templates.pot similarity index 100% rename from debian/po/templates.pot rename to packaging/debian/po/templates.pot diff --git a/debian/po/vi.po b/packaging/debian/po/vi.po similarity index 100% rename from debian/po/vi.po rename to packaging/debian/po/vi.po diff --git a/debian/postinst b/packaging/debian/postinst similarity index 100% rename from debian/postinst rename to packaging/debian/postinst diff --git a/debian/rules b/packaging/debian/rules similarity index 100% rename from debian/rules rename to packaging/debian/rules diff --git a/debian/source/format b/packaging/debian/source/format similarity index 100% rename from debian/source/format rename to packaging/debian/source/format diff --git a/debian/source/lintian-overrides b/packaging/debian/source/lintian-overrides similarity index 100% rename from debian/source/lintian-overrides rename to packaging/debian/source/lintian-overrides diff --git a/debian/templates b/packaging/debian/templates similarity index 100% rename from debian/templates rename to packaging/debian/templates diff --git a/debian/tests/control b/packaging/debian/tests/control similarity index 100% rename from debian/tests/control rename to packaging/debian/tests/control diff --git a/debian/tests/frame-count.lua b/packaging/debian/tests/frame-count.lua similarity index 100% rename from debian/tests/frame-count.lua rename to packaging/debian/tests/frame-count.lua diff --git a/debian/tests/gui b/packaging/debian/tests/gui similarity index 100% rename from debian/tests/gui rename to packaging/debian/tests/gui diff --git a/debian/tests/tshark b/packaging/debian/tests/tshark similarity index 100% rename from debian/tests/tshark rename to packaging/debian/tests/tshark diff --git a/debian/tshark.docs b/packaging/debian/tshark.docs similarity index 100% rename from debian/tshark.docs rename to packaging/debian/tshark.docs diff --git a/debian/tshark.install b/packaging/debian/tshark.install similarity index 100% rename from debian/tshark.install rename to packaging/debian/tshark.install diff --git a/debian/tshark.lintian-overrides b/packaging/debian/tshark.lintian-overrides similarity index 100% rename from debian/tshark.lintian-overrides rename to packaging/debian/tshark.lintian-overrides diff --git a/debian/tshark.manpages b/packaging/debian/tshark.manpages similarity index 100% rename from debian/tshark.manpages rename to packaging/debian/tshark.manpages diff --git a/debian/wireshark-common.config b/packaging/debian/wireshark-common.config similarity index 100% rename from debian/wireshark-common.config rename to packaging/debian/wireshark-common.config diff --git a/debian/wireshark-common.install b/packaging/debian/wireshark-common.install similarity index 100% rename from debian/wireshark-common.install rename to packaging/debian/wireshark-common.install diff --git a/debian/wireshark-common.lintian-overrides b/packaging/debian/wireshark-common.lintian-overrides similarity index 100% rename from debian/wireshark-common.lintian-overrides rename to packaging/debian/wireshark-common.lintian-overrides diff --git a/debian/wireshark-common.manpages b/packaging/debian/wireshark-common.manpages similarity index 100% rename from debian/wireshark-common.manpages rename to packaging/debian/wireshark-common.manpages diff --git a/debian/wireshark-common.postinst b/packaging/debian/wireshark-common.postinst similarity index 100% rename from debian/wireshark-common.postinst rename to packaging/debian/wireshark-common.postinst diff --git a/debian/wireshark-common.postrm b/packaging/debian/wireshark-common.postrm similarity index 100% rename from debian/wireshark-common.postrm rename to packaging/debian/wireshark-common.postrm diff --git a/debian/wireshark-dev.docs b/packaging/debian/wireshark-dev.docs similarity index 100% rename from debian/wireshark-dev.docs rename to packaging/debian/wireshark-dev.docs diff --git a/debian/wireshark-dev.install b/packaging/debian/wireshark-dev.install similarity index 100% rename from debian/wireshark-dev.install rename to packaging/debian/wireshark-dev.install diff --git a/debian/wireshark-dev.manpages b/packaging/debian/wireshark-dev.manpages similarity index 100% rename from debian/wireshark-dev.manpages rename to packaging/debian/wireshark-dev.manpages diff --git a/debian/wireshark-dev.prerm b/packaging/debian/wireshark-dev.prerm similarity index 100% rename from debian/wireshark-dev.prerm rename to packaging/debian/wireshark-dev.prerm diff --git a/debian/wireshark-doc.docs b/packaging/debian/wireshark-doc.docs similarity index 100% rename from debian/wireshark-doc.docs rename to packaging/debian/wireshark-doc.docs diff --git a/debian/wireshark-qt.docs b/packaging/debian/wireshark-qt.docs similarity index 100% rename from debian/wireshark-qt.docs rename to packaging/debian/wireshark-qt.docs diff --git a/debian/wireshark-qt.install b/packaging/debian/wireshark-qt.install similarity index 100% rename from debian/wireshark-qt.install rename to packaging/debian/wireshark-qt.install diff --git a/debian/wireshark-qt.lintian-overrides b/packaging/debian/wireshark-qt.lintian-overrides similarity index 100% rename from debian/wireshark-qt.lintian-overrides rename to packaging/debian/wireshark-qt.lintian-overrides diff --git a/debian/wireshark-qt.manpages b/packaging/debian/wireshark-qt.manpages similarity index 100% rename from debian/wireshark-qt.manpages rename to packaging/debian/wireshark-qt.manpages diff --git a/tools/asn2deb b/tools/asn2deb index 72d9e4a8a7..926d34e2e5 100755 --- a/tools/asn2deb +++ b/tools/asn2deb @@ -42,21 +42,21 @@ def create_files(version, deb, email, asn, name, iso, rfc): """Create all files for the .deb build process.""" base = asn.lower()[:-5] - if not os.path.isdir("debian"): - os.mkdir("debian") + if not os.path.isdir("packaging/debian"): + os.mkdir("packaging/debian") - create_file("debian/rules", """#!/usr/bin/make -f + create_file("packaging/debian/rules", """#!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -PREFIX=`pwd`/debian/wireshark-asn1-%s +PREFIX=`pwd`/packaging/debian/wireshark-asn1-%s binary-post-install/wireshark-asn1-%s:: rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a """ % (base, base, version), 0o755) - create_file("debian/control", """Source: wireshark-asn1-%s + create_file("packaging/debian/control", """Source: wireshark-asn1-%s Section: net Priority: optional Maintainer: %s <%s> @@ -72,7 +72,7 @@ Description: ASN.1/BER dissector for %s Notation 1) file '%s.asn1'. """ % (base, name, email, base, deb, base, base)) - create_file("debian/changelog", + create_file("packaging/debian/changelog", """wireshark-asn1-%s (0.0.1-1) unstable; urgency=low * Automatically created package. @@ -80,7 +80,7 @@ Description: ASN.1/BER dissector for %s -- %s <%s> %s """ % (base, name, email, rfc + "\n (" + iso + ")")) - create_file("debian/copyright", + create_file("packaging/debian/copyright", """This package has been created automatically be asn2deb on %s for Debian GNU/Linux. diff --git a/tools/debian-nightly-package.sh b/tools/debian-nightly-package.sh index ca56394322..c07185a683 100755 --- a/tools/debian-nightly-package.sh +++ b/tools/debian-nightly-package.sh @@ -17,7 +17,8 @@ fi DIST=$1 VERSION=$(git describe --tags | sed 's/v//;s/-/~/g;s/rc/~rc/') -rm debian/changelog || true +ln --symbolic --no-dereference --force packaging/debian ./debian +rm packaging/debian/changelog || true EDITOR=touch dch -p --package wireshark --create --force-distribution -v${VERSION}~${DIST}1 -D $DIST -sed -i 's/\* Initial release.*/* Nightly build for '${DIST^}'/' debian/changelog +sed -i 's/\* Initial release.*/* Nightly build for '${DIST^}'/' packaging/debian/changelog dpkg-buildpackage -S -d diff --git a/tools/idl2deb b/tools/idl2deb index 72ed6c86db..18f1b05647 100755 --- a/tools/idl2deb +++ b/tools/idl2deb @@ -34,21 +34,21 @@ def create_files(version, deb, email, idl, name, preserve, iso, rfc): """Create all files for the .deb build process.""" base = os.path.basename(idl.lower().split(".idl")[0]) - if not os.path.isdir("debian"): - os.mkdir("debian") + if not os.path.isdir("packaging/debian"): + os.mkdir("packaging/debian") - create_file(preserve, "debian/rules", """#!/usr/bin/make -f + create_file(preserve, "packaging/debian/rules", """#!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -PREFIX=`pwd`/debian/wireshark-giop-%s +PREFIX=`pwd`/packaging/debian/wireshark-giop-%s binary-post-install/wireshark-giop-%s:: rm -f $(PREFIX)/usr/lib/wireshark/plugins/%s/*.a """ % (base, base, version), 0o755) - create_file(preserve, "debian/control", """Source: wireshark-giop-%s + create_file(preserve, "packaging/debian/control", """Source: wireshark-giop-%s Section: net Priority: optional Maintainer: %s <%s> @@ -65,7 +65,7 @@ Description: GIOP dissector for CORBA interface %s in the IDL (Interface Definition Language) file '%s.idl'. """ % (base, name, email, base, deb, base, base)) - create_file(preserve, "debian/changelog", + create_file(preserve, "packaging/debian/changelog", """wireshark-giop-%s (0.0.1-1) unstable; urgency=low * Automatically created package. @@ -73,7 +73,7 @@ Description: GIOP dissector for CORBA interface %s -- %s <%s> %s """ % (base, name, email, rfc)) - create_file(preserve, "debian/copyright", + create_file(preserve, "packaging/debian/copyright", """This package has been created automatically by idl2deb on %s for Debian GNU/Linux. diff --git a/tools/make-version.pl b/tools/make-version.pl index b3074bdc08..7984ec5eba 100755 --- a/tools/make-version.pl +++ b/tools/make-version.pl @@ -506,13 +506,13 @@ sub update_docinfo_asciidoc } } -# Read debian/changelog, then write back out an updated version. +# Read packaging/debian/changelog, then write back out an updated version. sub update_debian_changelog { my $line; my $contents = ""; my $version = ""; - my $filepath = "$src_dir/debian/changelog"; + my $filepath = "$src_dir/packaging/debian/changelog"; open(CHANGELOG, "< $filepath") || die "Can't read $filepath!"; while ($line = ) { @@ -782,7 +782,7 @@ Print the vcs version to standard output Set the major, minor, and micro versions in the top-level CMakeLists.txt, configure.ac, docbook/attributes.adoc, -debian/changelog, and the CMakeLists.txt for all libraries +packaging/debian/changelog, and the CMakeLists.txt for all libraries to the provided version number. =item --set-release, -r diff --git a/tools/pre-commit-ignore.conf b/tools/pre-commit-ignore.conf index db95fb0a0c..a34cbe3273 100644 --- a/tools/pre-commit-ignore.conf +++ b/tools/pre-commit-ignore.conf @@ -9,18 +9,19 @@ # The pathname wildcards allowed are: '*', '?', character set '[abc]' or # negated with '[!abc]'. +cli_main.c doc/packet-PROTOABBREV.c -epan/dissectors/asn1/*/packet-*-template.c epan/dissectors/asn1/*/*asn +epan/dissectors/asn1/*/packet-*-template.c +epan/dissectors/packet-http.c epan/nghttp2/* epan/wmem/wmem_strbuf.c epan/wmem/wmem_strutil.c epan/wslua/init_wslua.c extcap/* image/stock_icons/* -cli_main.c mmdbresolve.c +packaging/* tools/lemon/* wsutil/file_util.h wsutil/strptime.c -epan/dissectors/packet-http.c diff --git a/tools/release-update-debian-soversions.sh b/tools/release-update-debian-soversions.sh index fb2b8895cc..e788d718eb 100755 --- a/tools/release-update-debian-soversions.sh +++ b/tools/release-update-debian-soversions.sh @@ -17,7 +17,7 @@ set -e for i in codecs wireshark wiretap wsutil; do NEW_VERSION=$(grep SOVERSION "$(grep -l lib${i} ./*/CMakeLists.txt)" | sed 's/.*SOVERSION \([0-9]*\).*/\1/') - rename "s/0\\./${NEW_VERSION}./" debian/lib${i}0.* - grep -l -R "lib${i}0" debian/ | xargs sed -i "s/lib${i}0/lib${i}${NEW_VERSION}/" - grep -l -R "lib${i}\\.so\\.0" debian/ | xargs sed -i "s/lib${i}\\.so\\.0/lib${i}.so.${NEW_VERSION}/" + rename "s/0\\./${NEW_VERSION}./" packaging/debian/lib${i}0.* + grep -l -R "lib${i}0" packaging/debian/ | xargs sed -i "s/lib${i}0/lib${i}${NEW_VERSION}/" + grep -l -R "lib${i}\\.so\\.0" packaging/debian/ | xargs sed -i "s/lib${i}\\.so\\.0/lib${i}.so.${NEW_VERSION}/" done