diff --git a/debian/control b/debian/control index 37b0a7b347..e7b6ee920e 100644 --- a/debian/control +++ b/debian/control @@ -50,13 +50,13 @@ Build-Depends: adwaita-icon-theme-full , wayland-protocols (>= 1.17) [linux-any], xauth , xvfb -Build-Depends-Indep: docbook-xml, - docbook-xsl, +Build-Depends-Indep: docbook-xml , + docbook-xsl , libatk1.0-doc , libcairo2-doc , libglib2.0-doc , libpango1.0-doc , - xsltproc + xsltproc , Rules-Requires-Root: no Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/gnome-team/gtk3 diff --git a/debian/control.in b/debian/control.in index ff3e2c5d5c..769207fbc6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -50,13 +50,13 @@ Build-Depends: adwaita-icon-theme-full , wayland-protocols (>= 1.17) [linux-any], xauth , xvfb -Build-Depends-Indep: docbook-xml, - docbook-xsl, +Build-Depends-Indep: docbook-xml , + docbook-xsl , libatk1.0-doc , libcairo2-doc , libglib2.0-doc , libpango1.0-doc , - xsltproc + xsltproc , Rules-Requires-Root: no Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/gnome-team/gtk3 diff --git a/debian/gtk-3-examples.install b/debian/gtk-3-examples.install index 2ab0c654ca..31fb686510 100644 --- a/debian/gtk-3-examples.install +++ b/debian/gtk-3-examples.install @@ -11,7 +11,3 @@ usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml usr/share/icons/hicolor/*/*/gtk3-demo* usr/share/icons/hicolor/*/*/gtk3-widget-factory* usr/share/installed-tests/gtk+ -usr/share/man/*/gtk3-demo-application.* -usr/share/man/*/gtk3-demo.* -usr/share/man/*/gtk3-icon-browser.* -usr/share/man/*/gtk3-widget-factory.* diff --git a/debian/gtk-3-examples.manpages b/debian/gtk-3-examples.manpages new file mode 100644 index 0000000000..392bef1439 --- /dev/null +++ b/debian/gtk-3-examples.manpages @@ -0,0 +1,4 @@ +usr/share/man/*/gtk3-demo-application.* +usr/share/man/*/gtk3-demo.* +usr/share/man/*/gtk3-icon-browser.* +usr/share/man/*/gtk3-widget-factory.* diff --git a/debian/gtk-update-icon-cache.install b/debian/gtk-update-icon-cache.install index 3c4895f489..0da3f89248 100644 --- a/debian/gtk-update-icon-cache.install +++ b/debian/gtk-update-icon-cache.install @@ -1,3 +1,2 @@ ../../../debian/update-icon-caches usr/sbin/ usr/bin/gtk-update-icon-cache -usr/share/man/man1/gtk-update-icon-cache.1 diff --git a/debian/gtk-update-icon-cache.manpages b/debian/gtk-update-icon-cache.manpages index 7f64d98c33..1b2f405f4b 100644 --- a/debian/gtk-update-icon-cache.manpages +++ b/debian/gtk-update-icon-cache.manpages @@ -1 +1 @@ -debian/update-icon-caches.8 +usr/share/man/man1/gtk-update-icon-cache.1 diff --git a/debian/libgtk-3-bin.install b/debian/libgtk-3-bin.install index f1db600463..98825d4091 100644 --- a/debian/libgtk-3-bin.install +++ b/debian/libgtk-3-bin.install @@ -5,9 +5,3 @@ usr/bin/gtk-launch usr/bin/gtk-query-settings usr/share/gettext/its/gtkbuilder.its usr/share/gettext/its/gtkbuilder.loc -usr/share/man/*/gtk-encode-symbolic-svg.* -usr/share/man/man1/broadwayd.1 -usr/share/man/man1/gtk-builder-tool.1 -usr/share/man/man1/gtk-launch.1 -usr/share/man/man1/gtk-query-immodules-3.0.1 -usr/share/man/man1/gtk-query-settings.1 diff --git a/debian/libgtk-3-bin.manpages b/debian/libgtk-3-bin.manpages new file mode 100644 index 0000000000..99cebba0be --- /dev/null +++ b/debian/libgtk-3-bin.manpages @@ -0,0 +1,6 @@ +usr/share/man/*/gtk-encode-symbolic-svg.* +usr/share/man/man1/broadwayd.1 +usr/share/man/man1/gtk-builder-tool.1 +usr/share/man/man1/gtk-launch.1 +usr/share/man/man1/gtk-query-immodules-3.0.1 +usr/share/man/man1/gtk-query-settings.1 diff --git a/debian/rules b/debian/rules index 9679bba23d..cd8afc4652 100755 --- a/debian/rules +++ b/debian/rules @@ -93,7 +93,6 @@ configure_flags_deb = \ -Dbroadway_backend=true \ -Dinstalled_tests=true \ -Dintrospection=true \ - -Dman=true \ -Dprint_backends=cups,file \ $(NULL) @@ -109,6 +108,12 @@ else configure_flags_deb += -Dwayland_backend=false endif +ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) +configure_flags_deb += -Dman=true +else +configure_flags_deb += -Dman=false +endif + ifeq ($(filter %-doc,$(built_binaries)),) configure_flags_deb += -Dgtk_doc=false else @@ -269,6 +274,9 @@ override_dh_installdocs: dh_installdocs -p$(DOC_PKG) --doc-main-package=$(DOC_PKG) AUTHORS -X.in dh_installdocs --remaining-packages -A AUTHORS +override_dh_installman: + dh_installman --sourcedir=debian/install/deb + override_dh_makeshlibs: dh_makeshlibs -p$(SHARED_PKG) --add-udeb=$(UDEB_PKG) -X$(MODULES_BASE_PATH) -- -c4 dh_makeshlibs -plibgail-3-0 -- -c4