[pkg-nagios-changes] [Git][nagios-team/pkg-icinga2][experimental] 2 commits: Apply patch by Louis-Philippe Véronneau to use dh-vim-addon. (closes: #990376)
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri Jul 2 06:43:09 BST 2021
Bas Couwenberg pushed to branch experimental at Debian Nagios Maintainer Group / pkg-icinga2
Commits:
990cd9e2 by Bas Couwenberg at 2021-07-02T07:30:50+02:00
Apply patch by Louis-Philippe Véronneau to use dh-vim-addon. (closes: #990376)
- - - - -
a5d30c12 by Bas Couwenberg at 2021-07-02T07:35:08+02:00
Add patch to update documentation for vim-icinga2.
- - - - -
10 changed files:
- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/vim-icinga2-docs.patch
- debian/rules
- − debian/vim-icinga2.README.Debian
- debian/vim-icinga2.install
- + debian/vim-icinga2.neovim-addon
- + debian/vim-icinga2.vim-addon
- − debian/vim-icinga2.yaml
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+icinga2 (2.12.4-1~exp2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Apply patch by Louis-Philippe Véronneau to use dh-vim-addon.
+ (closes: #990376)
+ * Add patch to update documentation for vim-icinga2.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 02 Jul 2021 07:10:50 +0200
+
icinga2 (2.12.4-1~exp1) experimental; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -10,6 +10,7 @@ Build-Depends: bash-completion,
cmake (>= 2.8.8),
cmake (>= 3.2.2) | pkg-config,
debhelper-compat (= 12),
+ dh-vim-addon,
flex,
g++ (>= 1.96),
libboost-dev,
@@ -206,12 +207,13 @@ Description: host and network monitoring system - PostgreSQL support
Package: vim-icinga2
Architecture: all
-Depends: ${misc:Depends}
-Recommends: vim-addon-manager
+Depends: ${vim-addon:Depends},
+ ${misc:Depends}
Description: syntax highlighting for Icinga 2 config files in VIM
+ Icinga 2 is a general-purpose monitoring application to fit the needs of
+ any size of network. Icinga 1.x was a Nagios fork; this new generation
+ has been rewritten from scratch in C++, with multi-threading and cluster
+ support.
+ .
The vim-icinga2 package provides filetype detection and syntax
highlighting for Icinga 2 config files.
- .
- As per the Debian vim policy, installed addons are not activated
- automatically, but the "vim-addon-manager" tool can be used for this
- purpose.
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
21_config_changes
postgres-checkcommand.patch
+vim-icinga2-docs.patch
=====================================
debian/patches/vim-icinga2-docs.patch
=====================================
@@ -0,0 +1,27 @@
+Description: Update documentation for vim-icinga2.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/990376
+Forwarded: not-needed
+
+--- a/doc/02-installation.md
++++ b/doc/02-installation.md
+@@ -498,7 +498,7 @@ Icinga 2 provides configuration examples
+ The RHEL and SUSE package `icinga2-common` installs these files into `/usr/share/doc/icinga2-common-[x.x.x]/syntax`
+ (where `[x.x.x]` is the version number, e.g. `2.4.3` or `2.4.4`). Sources provide these files in `tools/syntax`.
+ On Debian systems the `icinga2-common` package provides only the Nano configuration file (`/usr/share/nano/icinga2.nanorc`);
+-to obtain the Vim configuration, please install the extra package `vim-icinga2`. The files are located in `/usr/share/vim/addons`.
++to obtain the Vim configuration, please install the extra package `vim-icinga2`. The files are located in `/usr/share/icinga2/vim`.
+
+ ### Configuration Syntax Highlighting using Vim <a id="configuration-syntax-highlighting-vim"></a>
+
+@@ -507,9 +507,7 @@ Install the package `vim-icinga2` with y
+ Debian/Ubuntu:
+
+ ```
+-apt-get install vim-icinga2 vim-addon-manager
+-vim-addon-manager -w install icinga2
+-Info: installing removed addon 'icinga2' to /var/lib/vim/addons
++apt-get install vim-icinga2
+ ```
+
+ RHEL/CentOS 8 and Fedora:
=====================================
debian/rules
=====================================
@@ -14,7 +14,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel mips mipsel powerpc))
endif
%:
- dh $@ --with bash_completion
+ dh $@ --with bash_completion,vim_addon
override_dh_auto_clean:
dh_auto_clean
=====================================
debian/vim-icinga2.README.Debian deleted
=====================================
@@ -1,13 +0,0 @@
-Dear user, this package provides the vim addon for Icinga 2, but it is not enabled
-per default.
-
-If you want to enable it for your user account just execute
-
- vim-addons install icinga2
-
-Similarly, to enable it for all users of this system just execute (as root):
-
- vim-addons -w install icinga2
-
-vim-addons is provided by the vim-addon-manager package, have a look at its
-manpage for more information.
=====================================
debian/vim-icinga2.install
=====================================
@@ -1,3 +1 @@
-debian/vim-icinga2.yaml usr/share/vim/registry
-tools/syntax/vim/ftdetect/icinga2.vim usr/share/vim/addons/ftdetect
-tools/syntax/vim/syntax/icinga2.vim usr/share/vim/addons/syntax
+tools/syntax/vim usr/share/icinga2
=====================================
debian/vim-icinga2.neovim-addon
=====================================
@@ -0,0 +1 @@
+vim-icinga2.vim-addon
\ No newline at end of file
=====================================
debian/vim-icinga2.vim-addon
=====================================
@@ -0,0 +1 @@
+usr/share/icinga2/vim icinga2
=====================================
debian/vim-icinga2.yaml deleted
=====================================
@@ -1,5 +0,0 @@
-addon: icinga2
-description: "Syntax highlighting for Icinga 2"
-files:
- - ftdetect/icinga2.vim
- - syntax/icinga2.vim
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/-/compare/b2236c6df1986e3d7675a37260d9c425cd2b5a83...a5d30c12296bf83e0b16c37044125e49c6e1fd76
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/-/compare/b2236c6df1986e3d7675a37260d9c425cd2b5a83...a5d30c12296bf83e0b16c37044125e49c6e1fd76
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20210702/534e906b/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list