[pkg-nagios-changes] [Git][nagios-team/pkg-icinga2][master] 5 commits: Fix jQuery usage in icinga2-classicui. (closes: #867884, #875686)

Bas Couwenberg gitlab at salsa.debian.org
Sat May 5 16:19:54 BST 2018 

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-icinga2


Commits:
cec616af by Bas Couwenberg at 2018-05-05T16:12:04+02:00
Fix jQuery usage in icinga2-classicui. (closes: #867884, #875686)

- - - - -
5e7c8cfb by Bas Couwenberg at 2018-05-05T16:12:04+02:00
Update Swedish debconf translation. Thanks to Jonatan Nyberg. (closes: #873009)

- - - - -
e1539617 by Bas Couwenberg at 2018-05-05T16:12:04+02:00
Change libreadline6 Recommends to libreadline7. (closes: #880488)

- - - - -
87c59b75 by Bas Couwenberg at 2018-05-05T17:01:14+02:00
Add upstream metadata.

- - - - -
03e2c357 by Bas Couwenberg at 2018-05-05T17:01:30+02:00
Set distribution to unstable.

- - - - -


6 changed files:

- debian/changelog
- debian/classicui/menu.html
- debian/control
- debian/icinga2-classicui.links
- debian/po/sv.po
- + debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+icinga2 (2.8.4-1) unstable; urgency=medium
+
+  * Team upload.
+  * Fix jQuery usage in icinga2-classicui.
+    (closes: #867884, #875686)
+  * Update Swedish debconf translation. Thanks to Jonatan Nyberg.
+    (closes: #873009)
+  * Change libreadline6 Recommends to libreadline7.
+    (closes: #880488)
+  * Add upstream metadata.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 May 2018 16:29:11 +0200
+
 icinga2 (2.8.4-1~exp1) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/classicui/menu.html
=====================================
--- a/debian/classicui/menu.html
+++ b/debian/classicui/menu.html
@@ -6,15 +6,17 @@
 	<meta http-equiv="Content-Language" content="en" />
 	<meta name="robots" content="noindex, nofollow" />
 	<link rel="stylesheet" type="text/css" href="stylesheets/menu.css" media="screen, projection" />
-	<link rel="stylesheet" type="text/css" href="jquery-ui/themes/base/jquery.ui.all.css" media="screen, projection" />
+	<link rel="stylesheet" type="text/css" href="jquery-ui/themes/base/all.min.css" media="screen, projection" />
 	<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico" />
-	<script type="text/javascript" src="js/jquery-1.8.0.min.js"></script>
+	<script type="text/javascript" src="jquery/jquery.min.js"></script>
 	<script type="text/javascript" src="js/menu.js"></script>
-	<script type="text/javascript" src="jquery-ui/ui/jquery.ui.core.js"></script>
-	<script type="text/javascript" src="jquery-ui/ui/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="jquery-ui/ui/jquery.ui.menu.js"></script>
-	<script type="text/javascript" src="jquery-ui/ui/jquery.ui.position.js"></script>
-	<script type="text/javascript" src="jquery-ui/ui/jquery.ui.autocomplete.js"></script>
+	<script type="text/javascript" src="jquery-ui/ui/widget.min.js"></script>
+	<script type="text/javascript" src="jquery-ui/ui/unique-id.min.js"></script>
+	<script type="text/javascript" src="jquery-ui/ui/widgets/menu.min.js"></script>
+	<script type="text/javascript" src="jquery-ui/ui/widgets/autocomplete.min.js"></script>
+	<script type="text/javascript" src="jquery-ui/ui/safe-active-element.min.js"></script>
+	<script type="text/javascript" src="jquery-ui/ui/position.min.js"></script>
+	<script type="text/javascript" src="jquery-ui/ui/keycode.min.js"></script>
 </head>
 <body>
 	<div id="menu">


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Depends: icinga2-bin (= ${binary:Version}),
          ${misc:Depends}
 Recommends: icinga2-doc (= ${binary:Version}),
             monitoring-plugins-basic | nagios-plugins-basic,
-            libreadline6
+            libreadline7
 Suggests: icinga2-studio,
           vim-icinga2
 Description: host and network monitoring system


=====================================
debian/icinga2-classicui.links
=====================================
--- a/debian/icinga2-classicui.links
+++ b/debian/icinga2-classicui.links
@@ -1,11 +1,12 @@
 etc/icinga/stylesheets                    etc/icinga2-classicui/stylesheets
 etc/icinga2-classicui/apache2.conf        etc/apache2/conf-available/icinga2-classicui.conf
 usr/lib/cgi-bin/icinga                    usr/lib/cgi-bin/icinga2-classicui
-#usr/share/icinga/htdocs/docs             usr/share/icinga2/classicui/docs
 usr/share/icinga/htdocs/images            usr/share/icinga2/classicui/images
-usr/share/icinga/htdocs/jquery-ui         usr/share/icinga2/classicui/jquery-ui
 usr/share/icinga/htdocs/jquery-ui-addon   usr/share/icinga2/classicui/jquery-ui-addon
 usr/share/icinga/htdocs/js                usr/share/icinga2/classicui/js
 usr/share/icinga/htdocs/main.html         usr/share/icinga2/classicui/main.html
 usr/share/icinga/htdocs/media             usr/share/icinga2/classicui/media
+usr/share/icinga/htdocs/robots.txt        usr/share/icinga2/classicui/robots.txt
 usr/share/icinga/htdocs/ssi               usr/share/icinga2/classicui/ssi
+usr/share/javascript/jquery               usr/share/icinga2/classicui/jquery
+usr/share/javascript/jquery-ui            usr/share/icinga2/classicui/jquery-ui


=====================================
debian/po/sv.po
=====================================
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: icinga2\n"
 "Report-Msgid-Bugs-To: icinga2 at packages.debian.org\n"
 "POT-Creation-Date: 2014-08-18 15:18+0200\n"
-"PO-Revision-Date: 2017-02-17 09:10+0100\n"
+"PO-Revision-Date: 2017-08-23 18:12+0200\n"
 "Last-Translator: Jonatan Nyberg <jonatan at autistici.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Icinga2 ClassicUI administrationslösenord:"
 #. Description
 #: ../icinga2-classicui.templates:2001
 msgid "Please provide the password to be created with the \"icingaadmin\" user."
-msgstr "Ange lösenordet att skapas med \"icingaadmin\"-användaren."
+msgstr "Ange lösenordet som ska skapas med \"icingaadmin\"-användaren."
 
 #. Type: password
 #. Description
@@ -40,7 +40,7 @@ msgstr "Detta är det användarnamn och lösenord som ska användas för att ans
 #. Description
 #: ../icinga2-classicui.templates:3001
 msgid "Re-enter password to verify:"
-msgstr "Återange lösenord för att kontrollera:"
+msgstr "Återange lösenord för att verifiera:"
 
 #. Type: password
 #. Description
@@ -52,19 +52,19 @@ msgstr "Ange samma lösenord igen för att bekräfta att du skrev det rätt."
 #. Description
 #: ../icinga2-classicui.templates:4001
 msgid "Password input error"
-msgstr "Lösenord inmatingsfel"
+msgstr "Inmatingsfel för lösenord"
 
 #. Type: error
 #. Description
 #: ../icinga2-classicui.templates:4001
 msgid "The two passwords you entered were not the same. Please try again."
-msgstr "De två lösenord du angav överensstämde inte. Var god försök igen."
+msgstr "De två lösenorden du angav överensstämde inte. Var god försök igen."
 
 #. Type: boolean
 #. Description
 #: ../icinga2-ido-mysql.templates:2001
 msgid "Enable Icinga 2's ido-mysql feature?"
-msgstr "Aktivera Icinga 2:s ido-mysql funktion?"
+msgstr "Aktivera ido-mysql funktionen för Icinga 2?"
 
 #. Type: boolean
 #. Description
@@ -76,13 +76,13 @@ msgstr "Ange om Icinga 2 ska använda MySQL."
 #. Description
 #: ../icinga2-ido-mysql.templates:2001
 msgid "You may later disable the feature by using the \"icinga2 feature disable ido-mysql\" command."
-msgstr "Du kan senare inaktivera funktionen genom att använda \"icinga2 feature disable ido-mysql\" kommandot."
+msgstr "Du kan senare inaktivera funktionen genom att använda \"icinga2 feature disable ido-mysql\"-kommandot."
 
 #. Type: boolean
 #. Description
 #: ../icinga2-ido-pgsql.templates:2001
 msgid "Enable Icinga 2's ido-pgsql feature?"
-msgstr "Aktivera Icinga 2:s ido-pgsql funktion?"
+msgstr "Aktivera ido-pgsql funktionen för Icinga 2:s?"
 
 #. Type: boolean
 #. Description
@@ -94,4 +94,4 @@ msgstr "Ange om Icinga 2 ska använda PostgreSQL."
 #. Description
 #: ../icinga2-ido-pgsql.templates:2001
 msgid "You may later disable the feature by using the \"icinga2 feature disable ido-pgsql\" command."
-msgstr "Du kan senare inaktivera funktionen genom att använda \"icinga2 feature disable ido-pgsql\" kommandot."
+msgstr "Du kan senare inaktivera funktionen genom att använda \"icinga2 feature disable ido-pgsql\"-kommandot."


=====================================
debian/upstream/metadata
=====================================
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,6 @@
+---
+Bug-Database: https://github.com/Icinga/icinga2/issues
+Bug-Submit: https://github.com/Icinga/icinga2/issues/new
+Name: Icinga 2
+Repository: https://github.com/Icinga/icinga2.git
+Repository-Browse: https://github.com/Icinga/icinga2



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/compare/9c691df896dfea8e48e0b9257fdcd05b4bd653bf...03e2c357d139cf8dd3b8e2f74fb62430a0bcfb83

---
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/compare/9c691df896dfea8e48e0b9257fdcd05b4bd653bf...03e2c357d139cf8dd3b8e2f74fb62430a0bcfb83
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/20180505/beb3e3a9/attachment-0001.html>

More information about the pkg-nagios-changes mailing list