hplip: add trisquel distro-name definition for hplip tools.
This commit is contained in:
Luis Guzmán
parent
6183e8282b
commit
2f4bde7002
3 changed files with 323 additions and 1 deletions
|
|
@ -0,0 +1,301 @@
|
||||||
|
diff --git a/installer/distros.dat b/installer/distros.dat
|
||||||
|
index 80588920..66bb81a1 100644
|
||||||
|
--- a/installer/distros.dat
|
||||||
|
+++ b/installer/distros.dat
|
||||||
|
@@ -94,7 +94,7 @@
|
||||||
|
# ****************************************
|
||||||
|
|
||||||
|
[distros]
|
||||||
|
-distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,zorin,mxlinux,elementary
|
||||||
|
+distros=unknown,mepis,debian,suse,mandriva,fedora,redhat,rhel,slackware,gentoo,redflag,ubuntu,xandros,freebsd,linspire,ark,pclinuxos,centos,igos,linuxmint,linpus,gos,boss,lfs,manjarolinux,zorin,mxlinux,elementary,trisquel
|
||||||
|
|
||||||
|
# ****************************************
|
||||||
|
|
||||||
|
@@ -18946,3 +18946,287 @@ packages=automake1.11
|
||||||
|
packages=epm
|
||||||
|
|
||||||
|
# ****************************************
|
||||||
|
+
|
||||||
|
+[trisquel]
|
||||||
|
+index=99
|
||||||
|
+versions=11.0.1,12.0
|
||||||
|
+display_name=Trisquel GNU/Linux
|
||||||
|
+alt_names=trisquel,Trisquel GNU/Linux
|
||||||
|
+display=1
|
||||||
|
+notes=
|
||||||
|
+package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater
|
||||||
|
+package_mgr_cmd=sudo apt-get install --assume-yes $packages_to_install
|
||||||
|
+pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo apt-get update
|
||||||
|
+post_depend_cmd=
|
||||||
|
+hp_libs_remove_cmd= sudo apt-get remove libhpmud0 libsane-hpaio printer-driver-postscript-hp
|
||||||
|
+hplip_remove_cmd=sudo aptitude remove --assume-yes hplip hpijs
|
||||||
|
+su_sudo=sudo
|
||||||
|
+ppd_install=ppd
|
||||||
|
+udev_mode_fix=1
|
||||||
|
+ppd_dir=
|
||||||
|
+fix_ppd_symlink=0
|
||||||
|
+drv_dir=/usr/share/cups/drv/HP
|
||||||
|
+
|
||||||
|
+# ****************************************
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1]
|
||||||
|
+code_name=aramo
|
||||||
|
+supported=1
|
||||||
|
+scan_supported=1
|
||||||
|
+fax_supported=1
|
||||||
|
+pcard_supported=1
|
||||||
|
+network_supported=1
|
||||||
|
+parallel_supported=1
|
||||||
|
+usb_supported=1
|
||||||
|
+packaged_version=3.21.12
|
||||||
|
+release_date=01/01/2022
|
||||||
|
+notes=
|
||||||
|
+ppd_install=drv
|
||||||
|
+udev_mode_fix=1
|
||||||
|
+ppd_dir=/usr/share/ppd/HP
|
||||||
|
+fix_ppd_symlink=0
|
||||||
|
+drv_dir=/usr/share/cups/drv/HP
|
||||||
|
+ui_toolkit=qt5
|
||||||
|
+native_cups=1
|
||||||
|
+acl_rules=1
|
||||||
|
+
|
||||||
|
+libdir_path=/usr/lib
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:cups]
|
||||||
|
+packages=libcups2
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:cups-devel]
|
||||||
|
+packages=libcups2-dev,cups-bsd,cups-client
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:gcc]
|
||||||
|
+packages=build-essential
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:gs]
|
||||||
|
+packages=ghostscript
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libcrypto]
|
||||||
|
+packages=openssl
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libjpeg]
|
||||||
|
+packages=libjpeg-dev
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libatk-adaptor]
|
||||||
|
+packages=libatk-adaptor
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libgail-common]
|
||||||
|
+packages=libgail-common
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libnetsnmp-devel]
|
||||||
|
+packages=libsnmp-dev
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libpthread]
|
||||||
|
+packages=build-essential
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libtool]
|
||||||
|
+packages=libtool,libtool-bin
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libusb]
|
||||||
|
+packages=libusb-1.0-0-dev,libusb-0.1-4
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:make]
|
||||||
|
+packages=build-essential
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:ppdev]
|
||||||
|
+packages=
|
||||||
|
+commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:sane]
|
||||||
|
+packages=libsane
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:sane-devel]
|
||||||
|
+packages=libsane-dev
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:scanimage]
|
||||||
|
+packages=sane-utils
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:xsane]
|
||||||
|
+packages=gtk2-engines-pixbuf,xsane
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:dbus]
|
||||||
|
+packages=libdbus-1-dev
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:cups-image]
|
||||||
|
+packages=libcupsimage2-dev
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:cups-ddk]
|
||||||
|
+packages=cups
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:policykit]
|
||||||
|
+packages=policykit-1,policykit-1-gnome
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:network]
|
||||||
|
+packages=wget
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:avahi-utils]
|
||||||
|
+packages=avahi-utils
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:libavahi-dev]
|
||||||
|
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-notify2]
|
||||||
|
+packages=python3-notify2
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-pyqt5-dbus]
|
||||||
|
+packages=python3-dbus.mainloop.pyqt5
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-pyqt5]
|
||||||
|
+packages=python3-pyqt5,gtk2-engines-pixbuf
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-dbus]
|
||||||
|
+packages=python3-dbus,python3-gi
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-xml]
|
||||||
|
+packages=python3-lxml
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-devel]
|
||||||
|
+packages=python3-dev
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-pil]
|
||||||
|
+packages=python3-pil
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:python3-reportlab]
|
||||||
|
+packages=python3-reportlab
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:automake]
|
||||||
|
+packages=automake1.11
|
||||||
|
+
|
||||||
|
+[trisquel:11.0.1:epm]
|
||||||
|
+packages=epm
|
||||||
|
+
|
||||||
|
+# ****************************************
|
||||||
|
+
|
||||||
|
+[trisquel:12.0]
|
||||||
|
+code_name=ecne
|
||||||
|
+supported=1
|
||||||
|
+scan_supported=1
|
||||||
|
+fax_supported=1
|
||||||
|
+pcard_supported=1
|
||||||
|
+network_supported=1
|
||||||
|
+parallel_supported=1
|
||||||
|
+usb_supported=1
|
||||||
|
+packaged_version=3.23.12
|
||||||
|
+release_date=01/01/2022
|
||||||
|
+notes=
|
||||||
|
+ppd_install=drv
|
||||||
|
+udev_mode_fix=1
|
||||||
|
+ppd_dir=/usr/share/ppd/HP
|
||||||
|
+fix_ppd_symlink=0
|
||||||
|
+drv_dir=/usr/share/cups/drv/HP
|
||||||
|
+ui_toolkit=qt5
|
||||||
|
+native_cups=1
|
||||||
|
+acl_rules=1
|
||||||
|
+
|
||||||
|
+libdir_path=/usr/lib
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:cups]
|
||||||
|
+packages=libcups2t64
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:cups-devel]
|
||||||
|
+packages=libcups2-dev,cups-bsd,cups-client
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:gcc]
|
||||||
|
+packages=build-essential
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:gs]
|
||||||
|
+packages=ghostscript
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libcrypto]
|
||||||
|
+packages=openssl
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libjpeg]
|
||||||
|
+packages=libjpeg-dev
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libatk-adaptor]
|
||||||
|
+packages=libatk-adaptor
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libgail-common]
|
||||||
|
+packages=libgail-common
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libnetsnmp-devel]
|
||||||
|
+packages=libsnmp-dev
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libpthread]
|
||||||
|
+packages=build-essential
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libtool]
|
||||||
|
+packages=libtool,libtool-bin
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libusb]
|
||||||
|
+packages=libusb-1.0-0-dev,libusb-0.1-4
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:make]
|
||||||
|
+packages=build-essential
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:ppdev]
|
||||||
|
+packages=
|
||||||
|
+commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:sane]
|
||||||
|
+packages=libsane1
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:sane-devel]
|
||||||
|
+packages=libsane-dev
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:scanimage]
|
||||||
|
+packages=sane-utils
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:xsane]
|
||||||
|
+packages=gtk2-engines-pixbuf,xsane
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:dbus]
|
||||||
|
+packages=libdbus-1-dev
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:cups-image]
|
||||||
|
+packages=libcupsimage2-dev
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:cups-ddk]
|
||||||
|
+packages=cups
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:policykit]
|
||||||
|
+packages=policykit-1,policykit-1-gnome
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:network]
|
||||||
|
+packages=wget
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:avahi-utils]
|
||||||
|
+packages=avahi-utils
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:libavahi-dev]
|
||||||
|
+packages=libavahi-client-dev,libavahi-core-dev,libavahi-common-dev
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-notify2]
|
||||||
|
+packages=python3-notify2
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-pyqt5-dbus]
|
||||||
|
+packages=python3-dbus.mainloop.pyqt5
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-pyqt5]
|
||||||
|
+packages=python3-pyqt5,gtk2-engines-pixbuf
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-dbus]
|
||||||
|
+packages=python3-dbus,python3-gi
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-xml]
|
||||||
|
+packages=python3-lxml
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-devel]
|
||||||
|
+packages=python3-dev
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-pil]
|
||||||
|
+packages=python3-pil
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:python3-reportlab]
|
||||||
|
+packages=python3-reportlab
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:automake]
|
||||||
|
+packages=automake1.11
|
||||||
|
+
|
||||||
|
+[trisquel:12.0:epm]
|
||||||
|
+packages=epm
|
||||||
|
+
|
||||||
|
+# ****************************************
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
diff --git a/installer/core_install.py b/installer/core_install.py
|
||||||
|
index 1c8af23e..9595b2c7 100644
|
||||||
|
--- a/installer/core_install.py
|
||||||
|
+++ b/installer/core_install.py
|
||||||
|
@@ -644,6 +644,11 @@ class CoreInstall(object):
|
||||||
|
ld = distro.linux_distribution(full_distribution_name=False)
|
||||||
|
name = ld[0]
|
||||||
|
ver = ld[1]
|
||||||
|
+ # Ensure variable exists (used below for MX detection)
|
||||||
|
+ try:
|
||||||
|
+ distro_release_name = distro.name(pretty=True) or ""
|
||||||
|
+ except Exception:
|
||||||
|
+ distro_release_name = ""
|
||||||
|
|
||||||
|
found = True
|
||||||
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
#
|
#
|
||||||
# Copyright (C) 2011 MPA
|
# Copyright (C) 2011 MPA
|
||||||
# Copyright (C) 2013-2021 Ruben Rodriguez <ruben@trisquel.info>
|
# Copyright (C) 2013-2021 Ruben Rodriguez <ruben@trisquel.info>
|
||||||
|
# Copyright (C) 2025 Luis Guzmán <ark@switnet.org>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
|
@ -18,7 +19,7 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=3
|
VERSION=4
|
||||||
|
|
||||||
# note, we need version 3.20.6 or higher, the binary plugin requirement
|
# note, we need version 3.20.6 or higher, the binary plugin requirement
|
||||||
# was reworked on that version.
|
# was reworked on that version.
|
||||||
|
|
@ -110,6 +111,10 @@ override_dh_missing:
|
||||||
dh_missing --list-missing
|
dh_missing --list-missing
|
||||||
RULES
|
RULES
|
||||||
|
|
||||||
|
# Change CRLF to LF to avoid issues.
|
||||||
|
sed -i 's/\r$//' installer/distros.dat
|
||||||
|
apply_patch_changes
|
||||||
|
|
||||||
changelog "Removed printers with propietary drivers"
|
changelog "Removed printers with propietary drivers"
|
||||||
|
|
||||||
package
|
package
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue