Merge 1.7 release branch into develop

glpi-project · Dec 21, 2023 · b9f7f88 · b9f7f88
2 parents ce23776 + ba5717b
commit b9f7f88
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -53,6 +53,7 @@ netdiscovery/netinventory:
 * Use new local target API to set expected saving folder
 * Bump NetDiscovery task version to 6.1
 * Bump NetInventory task version to 6.1
+* Updated sysobject.ids
 
 esx:
 * Fix first connection timeout support

diff --git a/Makefile.PL b/Makefile.PL
@@ -14,7 +14,7 @@ include 'Module::AutoInstall';
 abstract 'GLPI unified Agent for UNIX, Linux, Windows and MacOSX';
 license 'gpl';
 repository 'https://github.com/glpi-project/glpi-agent';
-version '1.7-dev';
+version '1.7';
 perl_version '5.008';
 authors 'Teclib Editions';
 

diff --git a/contrib/unix/installer/InstallerVersion.pm b/contrib/unix/installer/InstallerVersion.pm
@@ -1,7 +1,7 @@
 package
     InstallerVersion;
 
-use constant VERSION => "1.7-dev";
+use constant VERSION => "1.8-dev";
 use constant DISTRO  => "linux";
 
 1;
diff --git a/contrib/windows/glpi-agent-deployment.vbs b/contrib/windows/glpi-agent-deployment.vbs
@@ -64,12 +64,12 @@ Dim Setup, SetupArchitecture, SetupLocation, SetupNightlyLocation, SetupOptions,
 ' SetupVersion
 '    Setup version with the pattern <major>.<minor>.<release>[-<package>]
 '
-SetupVersion = "1.6.1"
+SetupVersion = "1.7"
 
 ' When using a nightly built version, uncomment the following SetupVersion definition line
 ' replacing gitABCDEFGH with the most recent git revision found on the nightly builds site
 ' In that case, SetupNightlyLocation will be selected as location in place of SetupLocation
-'SetupVersion = "1.7-gitABCDEFGH"
+'SetupVersion = "1.8-gitABCDEFGH"
 
 ' SetupLocation
 '    Depending on your needs or your environment, you can use either a HTTP or

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+glpi-agent (1:1.7-1) unstable; urgency=medium
+
+  * New upstream release 1.7
+
+ -- Guillaume Bougard <[email protected]>  Thu, 21 Dec 2023 14:56:46 +0100
+
 glpi-agent (1:1.6.1-1) unstable; urgency=medium
 
   * New upstream release 1.6.1

diff --git a/lib/GLPI/Agent/Version.pm b/lib/GLPI/Agent/Version.pm
@@ -3,7 +3,7 @@ package GLPI::Agent::Version;
 use strict;
 use warnings;
 
-our $VERSION = "1.7-dev";
+our $VERSION = "1.7";
 our $PROVIDER = "GLPI";
 our $COMMENTS = [];
 
@@ -31,5 +31,5 @@ agent issue is reported.
 One very useful information should be first defined like in that example:
 
 our $COMMENTS = [
-    "Based on GLPI Agent 1.7-dev"
+    "Based on GLPI Agent 1.7"
 ];
diff --git a/share/sysobject.ids b/share/sysobject.ids
@@ -7297,6 +7297,13 @@
 20301	IBM	NETWORKING
 20301.1.18.15	IBM	NETWORKING	Flex System Fabric CN4093 10Gb Converged Scalable Switch
 
+20998	Honeywell
+20998.3.1.1.1	Honeywell	PRINTER	PM43
+20998.3.2.1.1	Honeywell	PRINTER	PM43C
+20998.5.1.1.1	Honeywell	PRINTER	PD43
+20998.7.1.1.1	Honeywell	PRINTER	PM42
+20998.10.1.1.1	Honeywell	PRINTER	PX940A
+
 21013	Xirrus	NETWORKING
 21013.1.153	Xirrus	NETWORKING	XR620
 21013.1.157	Xirrus	NETWORKING	XR2436