Resolved merge conflict in debian/changelog

Author: fehlix

bin/mxpi-launcher

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+/usr/bin/mx-packageinstaller
+
+exit 0

debian/changelog

@@ -1,10 +1,17 @@
-mx-packageinstaller (24.12.01) mx; urgency=medium
+mx-packageinstaller (24.12.02) mx; urgency=medium
 
   * Set the application name to fix the Qt translation domain and
     window icon name based on the application name instead of the
     executable file or symlink name
 
- -- fehlix <fehlix@mxlinux.org>  Sun, 29 Dec 2024 17:30:53 -0500
+ -- fehlix <fehlix@mxlinux.org>  Tue, 31 Dec 2024 10:19:35 -0500
+
+mx-packageinstaller (24.12.01) mx; urgency=medium
+
+  * make mxpi-launcher a script rather than a symlink
+  * addresses launch issue from apt-notifier 
+
+ -- Dolphin Oracle <dolphinoracle@gmail.com>  Mon, 30 Dec 2024 16:52:59 -0500
 
 mx-packageinstaller (24.12) mx; urgency=medium
 

debian/install

@@ -6,4 +6,5 @@ mx-packageinstaller.desktop	usr/share/applications
 scripts/helper			usr/lib/mx-packageinstaller
 scripts/mxpi-lib                usr/lib/mx-packageinstaller
 scripts/*.policy		usr/share/polkit-1/actions
+bin/*	usr/bin
 translations/*.qm		usr/share/mx-packageinstaller/locale

debian/rules

@@ -24,4 +24,3 @@ override_dh_shlibdeps:
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_link usr/bin/mx-packageinstaller usr/bin/mxpi-launcher

debs/mx-packageinstaller_24.12.01.dsc

@@ -0,0 +1,17 @@
+Format: 3.0 (native)
+Source: mx-packageinstaller
+Binary: mx-packageinstaller
+Architecture: any
+Version: 24.12.01
+Maintainer: Adrian <adrian@mxlinux.org>
+Standards-Version: 3.9.8
+Vcs-Git: git://github.com/AdrianTM/mx-packageinstaller
+Build-Depends: debhelper (>= 10), qtbase5-dev, qttools5-dev-tools
+Package-List:
+ mx-packageinstaller deb admin optional arch=any
+Checksums-Sha1:
+ 0bce42cb31d0e7f232a46f3cd68c4241ca3f85bb 629568 mx-packageinstaller_24.12.01.tar.xz
+Checksums-Sha256:
+ 0fc43fce1e5b2dbc9e14763376e01d686bf2c43e95985b9b484e5e193879f085 629568 mx-packageinstaller_24.12.01.tar.xz
+Files:
+ 370e171549e47e16c2c6e5e627fbed9c 629568 mx-packageinstaller_24.12.01.tar.xz

debs/mx-packageinstaller_24.12.01.tar.xz

@@ -0,0 +1,32 @@
+Format: 1.8
+Date: Mon, 30 Dec 2024 16:52:59 -0500
+Source: mx-packageinstaller
+Binary: mx-packageinstaller
+Architecture: source amd64
+Version: 24.12.01
+Distribution: mx
+Urgency: medium
+Maintainer: Adrian <adrian@mxlinux.org>
+Changed-By: Dolphin Oracle <dolphinoracle@gmail.com>
+Description:
+ mx-packageinstaller - MX Package Installer
+Changes:
+ mx-packageinstaller (24.12.01) mx; urgency=medium
+ .
+   * make mxpi-launcher a script rather than a symlink
+   * addresses launch issue from apt-notifier
+Checksums-Sha1:
+ 666fa3e0cce2f3c84dc6cfe85c3fcec7cd8cc107 674 mx-packageinstaller_24.12.01.dsc
+ 0bce42cb31d0e7f232a46f3cd68c4241ca3f85bb 629568 mx-packageinstaller_24.12.01.tar.xz
+ 0d706ae85ee527241624dfbbffe439a8a4ddbc5a 10933 mx-packageinstaller_24.12.01_amd64.buildinfo
+ 599dcd34cb7e0e1881a956756d31a41dedc3e4e1 387580 mx-packageinstaller_24.12.01_amd64.deb
+Checksums-Sha256:
+ c6c8bc88736555a24680ede0bb72d9e15a42227ed645ea2a3e89dc6e4ce91f97 674 mx-packageinstaller_24.12.01.dsc
+ 0fc43fce1e5b2dbc9e14763376e01d686bf2c43e95985b9b484e5e193879f085 629568 mx-packageinstaller_24.12.01.tar.xz
+ 5807da86bc944048d5ab8f07e4fa73ad60216c8603e9ec930f42a062ff214283 10933 mx-packageinstaller_24.12.01_amd64.buildinfo
+ 6e2870614fc57cc41b3cc9aa45adb775e1d71ebb376c508c291dd1ba09094aea 387580 mx-packageinstaller_24.12.01_amd64.deb
+Files:
+ e994f66cb1b59317c42ba097599ab217 674 admin optional mx-packageinstaller_24.12.01.dsc
+ 370e171549e47e16c2c6e5e627fbed9c 629568 admin optional mx-packageinstaller_24.12.01.tar.xz
+ 6663bb05a48f11829316197b400527c9 10933 admin optional mx-packageinstaller_24.12.01_amd64.buildinfo
+ f5e6ece8c3a47d39f306c68ac42855af 387580 admin optional mx-packageinstaller_24.12.01_amd64.deb