Merge ~danielky/ubuntu/+source/ocsinventory-agent:applied/ubuntu/jammy into ubuntu/+source/ocsinventory-agent:ubuntu/devel

[Daniel Krambrock]

Closes LP: #2004007 for jammy. This is a backport of a fix from Gregor Herrmann in 2:2.10.0-3

[Sebastien Bacher (seb128)]

Thank you for working on the change!

The merge request targeted the wrong branch and it would have been nice to include a changelog entry referencing to the launchpad bug and make that one compliant with the SRU process. Those help the work on the reviewers and sponsors but aren't blocking issue so I did the tweaks and uploaded

review: Approve

diff --git a/Makefile.PL b/Makefile.PL
index 07892a1..c683b77 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -19,7 +19,7 @@ sub MY::postamble
 install :: all pure_install doc_install
 	$(NOECHO) $(NOOP)';
 
-    $re .= "\n\t[ ! -f run-postinst ] || $^X postinst.pl\n";
+    #$re .= "\n\t[ ! -f run-postinst ] || $^X postinst.pl\n";
 
     return $re;
 }
@@ -86,10 +86,15 @@ if ($ENV{OCS_BUNDLE_RELEASE}) {
 #Ugly hack to include ipdiscover binary compilation and install for Linux systems
 if ($^O =~ /^linux$/i && can_cc()) {
     my $cc=$Config::Config{cc};
+<<<<<<< Makefile.PL
     my $ld=$Config::Config{ldflags};
     my $cf=$Config::Config{ccflags};
     my $op=$Config::Config{optimize};
     system("$cc $cf $ld $op resources/ipdiscover/ipdiscover.c -o ipdiscover");
+=======
+    my $fl=$Config::Config{ccflags};
+    system("$cc $fl `dpkg-buildflags --get CPPFLAGS` `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get LDFLAGS` resources/ipdiscover/ipdiscover.c -o ipdiscover");
+>>>>>>> Makefile.PL
     if (-f 'ipdiscover') {
       install_script 'ipdiscover';
     }
diff --git a/debian/changelog b/debian/changelog
index 6dc8d5d..93e5c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 ocsinventory-agent (2:2.10.0-3) unstable; urgency=medium
 
   * Team upload.
@@ -26,10 +27,18 @@ ocsinventory-agent (2:2.10.0-1) unstable; urgency=medium
   * Update Spanish debconf template.
     Thanks to Camaleón. (Closes: #1003642)
 
+=======
+ocsinventory-agent (2:2.8-2) unstable; urgency=medium
+
+  [ Cyrille Bollu ]
+  * Adds a random sleep in the cron.daily job
+
+>>>>>>> debian/changelog
   [ Debian Janitor ]
   * Remove constraints unnecessary since stretch:
     + Build-Depends: Drop versioned constraint on perl.
     + ocsinventory-agent: Drop versioned constraint on perl in Depends.
+<<<<<<< debian/changelog
   * Update standards version to 4.6.0, no changes needed.
 
   [ Yadd ]
@@ -39,6 +48,10 @@ ocsinventory-agent (2:2.10.0-1) unstable; urgency=medium
   * Add systemd timer
 
  -- Yadd <[e-mail]>  Thu, 24 Nov 2022 15:55:32 +0100
+=======
+
+ -- Cyrille Bollu <[e-mail]>  Fri, 12 Mar 2021 07:43:33 +0100
+>>>>>>> debian/changelog
 
 ocsinventory-agent (2:2.8-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 15a97e2..bfb28ad 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,15 @@ Build-Depends: debhelper-compat (= 13),
                libwww-perl <!nocheck>,
                libxml-simple-perl <!nocheck>,
                perl-xs-dev,
+<<<<<<< debian/control
                perl:native,
                po-debconf
 Standards-Version: 4.6.2
+=======
+               po-debconf,
+               perl:native
+Standards-Version: 4.5.0
+>>>>>>> debian/control
 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/ocsinventory-agent
 Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/ocsinventory-agent.git
 Homepage: https://www.ocsinventory-ng.org/
@@ -29,7 +35,11 @@ Depends: ${misc:Depends},
          libnet-ip-perl,
          libproc-daemon-perl,
          libwww-perl,
+<<<<<<< debian/control
          libxml-simple-perl,
+=======
+         perl,
+>>>>>>> debian/control
          ucf
 Recommends: dmidecode,
             hdparm,
diff --git a/debian/ocsinventory-agent.cron.daily b/debian/ocsinventory-agent.cron.daily
index 7dc9293..db90fb8 100644
--- a/debian/ocsinventory-agent.cron.daily
+++ b/debian/ocsinventory-agent.cron.daily
@@ -17,5 +17,10 @@ fi
 
 # Avoid all UNIX agents contacting the server at the exact same time
 sleep $(( $RANDOM/100 ))
+<<<<<<< debian/ocsinventory-agent.cron.daily
+=======
+
+$PROG > /dev/null 2>&1
+>>>>>>> debian/ocsinventory-agent.cron.daily
 
 $PROG > /dev/null 2>&1
diff --git a/ocsinventory-agent b/ocsinventory-agent
index fc3cb0b..512e482 100755
--- a/ocsinventory-agent
+++ b/ocsinventory-agent
@@ -149,7 +149,7 @@ Turn the verbose mode on. The flag is ignored if B<--debug> is enable.
 
 Do not contact the server more than one time during the PROLOG_FREQ and do
 an exit if there is nothing to do. Useful if you want to start the agent
-script regulary from the crontab but don't want to overload the server.
+script regularly from the crontab but don't want to overload the server.
 
 =item B<-l>, B<--local>=I<DIR>