Merve v2.9. Conflicts resolved with 'ours'

Author: andypugh

debian/changelog

@@ -10,6 +10,19 @@ linuxcnc (1:2.10.0~pre0) UNRELEASED; urgency=medium
 
  -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com>  Mon, 24 Mar 2025 20:50:08 +0530
 
+linuxcnc (1:2.9.4-2) unstable; urgency=medium
+
+  * Team upload.
+
+  * Adding build dependency on pyqt5.qtweb{engine,kit} to avoid build
+    failures on, as kindly addressed by Adrian <Bunk>. (Closes: #1100882)
+  * Re-applied Petter's change to address usrmerge, kindly pointed out
+    by Michael <Biebl>. (Closes: #1101346, #1073692)
+  * Bumped policy to 4.7.2.
+  * Now truly added Andy to Uploaders.
+
+ -- Steffen Moeller <moeller@debian.org>  Mon, 14 Apr 2025 00:10:01 +0200
+
 linuxcnc (1:2.9.4-1) unstable; urgency=medium
 
   * Team upload.

debian/linuxcnc.install.in

@@ -149,7 +149,7 @@ src/emc/usr_intf/axis/README usr/share/doc/@MAIN_PACKAGE_NAME@/axis
 debian/linuxcnc-uspace.metainfo.xml usr/share/metainfo
 
 debian/extras/etc /
-debian/extras/lib /
+debian/extras/lib /usr
 
 debian/extras/usr/share/icons usr/share
 

docs/src/drivers/mesa_modbus.adoc

@@ -326,8 +326,7 @@ Tx+ to Rx+ and Tx- to Rx-.
 
 Note that there are differing naming standards for Modbus pins.
 Typically Rx+ and TX+ will connect to the B- pin on the modbus device
-and Rx- and Tx- will connect to the A+ pin. (ie, +/- will appear
-reversed.
+and Rx- and Tx- will connect to the A+ pin, i.e., +/- will appear reversed.
 
 
 === Ad-hoc Modbus device access ===

src/hal/drivers/mesa-hostmot2/hm2_pci.c

@@ -395,7 +395,7 @@ static int hm2_plx9054_reset(hm2_lowlevel_io_t *this) {
     control = status | DONE_ENABLE_5I22 | _PROG_ENABLE_5I22;
     rtapi_outl(control, board->ctrl_base_addr + CTRL_STAT_OFFSET_5I22);
 
-    // Turn off /PROGRAM bit and insure that DONE isn't asserted
+    // Turn off /PROGRAM bit and ensure that DONE is not asserted
     rtapi_outl(control & ~_PROGRAM_MASK_5I22, board->ctrl_base_addr + CTRL_STAT_OFFSET_5I22);
 
     status = rtapi_inl(board->ctrl_base_addr + CTRL_STAT_OFFSET_5I22);
@@ -412,7 +412,7 @@ static int hm2_plx9054_reset(hm2_lowlevel_io_t *this) {
 
     // Delay for at least 100 uS. to allow the FPGA to finish its reset
     // sequencing.  3300 reads is at least 100 us, could be as long as a
-    // few ms
+    // few ms.
     for (i = 0; i < 3300; i++) {
         status = rtapi_inl(board->ctrl_base_addr + CTRL_STAT_OFFSET);
     }