summaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
Diffstat (limited to 'installer')
-rw-r--r--installer/core_install.py72
-rw-r--r--installer/distros.dat154
2 files changed, 204 insertions, 22 deletions
diff --git a/installer/core_install.py b/installer/core_install.py
index 36d2ff4c0..063511ae2 100644
--- a/installer/core_install.py
+++ b/installer/core_install.py
@@ -1231,28 +1231,94 @@ class CoreInstall(object):
self.native_cups = self.get_distro_ver_data('native_cups')
if self.native_cups is not None and self.native_cups == 1:
- configure_cmd += ' --enable-hpcups-install --enable-cups-ppd-install --enable-cups-drv-install'
+ configure_cmd += ' --enable-hpcups-install --enable-cups-drv-install --enable-cups-ppd-install --disable-hpijs-install --disable-foomatic-drv-install --disable-foomatic-ppd-install --disable-foomatic-rip-hplip-install'
else:
- configure_cmd += ' --enable-hpijs-install --disable-hpcups-install --enable-foomatic-ppd-install --enable-foomatic-drv-install --disable-cups-drv-install --enable-foomatic-rip-hplip-install'
+ configure_cmd += ' --disable-hpcups-install --disable-cups-drv-install --disable-cups-ppd-install --enable-hpijs-install --enable-foomatic-drv-install --enable-foomatic-ppd-install --enable-foomatic-rip-hplip-install'
self.fax_supported = self.get_distro_ver_data('fax_supported')
if self.fax_supported is None:
configure_cmd += ' --disable-fax-build --disable-dbus-build'
+ else:
+ configure_cmd += ' --enable-fax-build --enable-dbus-build'
self.network_supported = self.get_distro_ver_data('network_supported')
if self.network_supported is None:
- configure_cmd += ' --disable-network-build'
+ configure_cmd += ' --disable-network-build'
+ else:
+ configure_cmd += ' --enable-network-build'
self.scan_supported = self.get_distro_ver_data('scan_supported')
if self.scan_supported is None:
configure_cmd += ' --disable-scan-build'
+ else:
+ configure_cmd += ' --enable-scan-build'
self.policykit = self.get_distro_ver_data('policykit')
if self.policykit is not None and self.policykit == 1:
configure_cmd += ' --enable-policykit'
+ else:
+ configure_cmd += ' --disable-policykit'
+
+ return configure_cmd
+
+ def configure_qt4(self):
+ configure_cmd = './configure'
+ configure_cmd += ' --prefix=/usr'
+ configure_cmd += ' --with-hpppddir=%s' % self.ppd_dir
+
+ if self.bitness == 64:
+ configure_cmd += ' --libdir=/usr/lib64'
+
+ self.ui_toolkit = self.get_distro_ver_data('ui_toolkit')
+ if self.ui_toolkit is not None and self.ui_toolkit == 'qt3':
+ configure_cmd += ' --enable-qt3 --disable-qt4'
+ else:
+ configure_cmd += ' --enable-qt4'
+
+ self.native_cups = self.get_distro_ver_data('native_cups')
+ self.ppd_install = self.get_distro_ver_data('ppd_install')
+ if self.native_cups is not None and self.native_cups == 1:
+ configure_cmd += ' --enable-hpcups-install'
+ if self.ppd_install == 'drv':
+ configure_cmd += ' --enable-cups-drv-install --disable-cups-ppd-install'
+ else:
+ configure_cmd += ' --enable-cups-ppd-install --disable-cups-drv-install'
+ configure_cmd += ' --disable-hpijs-install --disable-foomatic-drv-install --disable-foomatic-ppd-install --disable-foomatic-rip-hplip-install'
+ else:
+ configure_cmd += ' --enable-hpijs-install'
+ if self.ppd_install == 'drv':
+ configure_cmd += ' --enable-foomatic-drv-install --disable-foomatic-ppd-install'
+ else:
+ configure_cmd += ' --enable-foomatic-ppd-install --disable-foomatic-drv-install'
+ configure_cmd += ' --enable-foomatic-rip-hplip-install --disable-hpcups-install --disable-cups-drv-install --disable-cups-ppd-install'
+
+ self.fax_supported = self.get_distro_ver_data('fax_supported')
+ if self.fax_supported is None:
+ configure_cmd += ' --disable-fax-build --disable-dbus-build'
+ else:
+ configure_cmd += ' --enable-fax-build --enable-dbus-build'
+
+ self.network_supported = self.get_distro_ver_data('network_supported')
+ if self.network_supported is None:
+ configure_cmd += ' --disable-network-build'
+ else:
+ configure_cmd += ' --enable-network-build'
+
+ self.scan_supported = self.get_distro_ver_data('scan_supported')
+ if self.scan_supported is None:
+ configure_cmd += ' --disable-scan-build'
+ else:
+ configure_cmd += ' --enable-scan-build'
+
+ self.policykit = self.get_distro_ver_data('policykit')
+ if self.policykit is not None and self.policykit == 1:
+ configure_cmd += ' --enable-policykit'
+ else:
+ configure_cmd += ' --disable-policykit'
return configure_cmd
+
def restart_cups(self):
if os.path.exists('/etc/init.d/cups'):
cmd = self.su_sudo() % '/etc/init.d/cups restart'
diff --git a/installer/distros.dat b/installer/distros.dat
index 344b64574..d188fa6ee 100644
--- a/installer/distros.dat
+++ b/installer/distros.dat
@@ -542,6 +542,7 @@ ui_toolkit=qt4
foomatic_rip_hplip=1
native_cups=1
add_user_to_group=-Alp
+open_mdns_port=/bin/bash ./init-suse-firewall
[suse:10.3:cups]
packages=cups,cups-client
@@ -1915,6 +1916,7 @@ ppd_dir=/usr/share/cups/model/HP
fix_ppd_symlink=0
drv_dir=/usr/share/cups/drv/HP
ui_toolkit=qt3
+native_cups=1
[fedora:8:cups]
packages=cups
@@ -1963,7 +1965,7 @@ packages=PyQt
packages=python-devel
[fedora:8:pyqt4]
-packages=PyQt4
+packages=PyQt
[fedora:8:pyqt4-dbus]
packages=dbus-python
@@ -1996,7 +1998,7 @@ packages=cupsddk,cupsddk-drivers,cupsddk-devel
packages=dbus-python
[fedora:8:dbus]
-packages=dbus-devel,python-gobject
+packages=dbus-devel,pygobject2
[fedora:8:python-ctypes]
packages=python-ctypes
@@ -3654,7 +3656,7 @@ packages=
# ****************************************
[ubuntu]
index=12
-versions=5.04,5.1,6.06,6.10,7.04,7.10,8.04,8.04.1,8.04.2,8.10,9.04,9.10
+versions=5.04,5.1,6.06,6.10,7.04,7.10,8.04,8.04.1,8.04.2,8.10,9.04,9.10,10.04
display_name=Ubuntu
alt_names=kubuntu,edubuntu,xubuntu
display=1
@@ -3663,7 +3665,7 @@ package_mgrs=dpkg,apt-get,synaptic,update-manager,adept,aptitude,adept-updater
package_mgr_cmd=sudo aptitude install --assume-yes $packages_to_install
pre_depend_cmd=sudo dpkg --configure -a,sudo apt-get install --yes --force-yes -f,sudo aptitude update
post_depend_cmd=
-hplip_remove_cmd=sudo apt-get remove --assume-yes hplip hpijs foomatic-db-hpijs
+hplip_remove_cmd=sudo apt-get remove --assume-yes hplip hpijs hplip-cups hplip-data libhpmud0 foomatic-db-hpijs
su_sudo=sudo
ppd_install=ppd
udev_mode_fix=1
@@ -5009,6 +5011,120 @@ packages=policykit,policykit-gnome
[ubuntu:9.10:python-notify]
packages=python-notify
+# ********************
+[ubuntu:10.04]
+code_name=Lucid
+supported=1
+scan_supported=1
+fax_supported=1
+pcard_supported=1
+network_supported=1
+parallel_supported=1
+usb_supported=1
+packaged_version=3.10.2
+release_date=2010
+notes=Enable the universe/multiverse repositories. Also be sure you are using the Ubuntu "Main" Repositories. See: https://help.ubuntu.com/community/Repositories/Ubuntu for more information. Disable the CD-ROM/DVD source if you do not have the Ubuntu installation media inserted in the drive. During the install process you will be added to the lp group, please quit the installer before the setup stage, log out, log back in, and run hp-setup to complete the install.
+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=qt4
+native_cups=1
+acl_rules=1
+add_user_to_group=-a -Glp
+
+[ubuntu:10.04:cups]
+packages=libcups2
+
+[ubuntu:10.04:cups-devel]
+packages=libcups2-dev,cups-bsd,cups-client
+
+[ubuntu:10.04:gcc]
+packages=build-essential
+
+[ubuntu:10.04:gs]
+packages=ghostscript
+
+[ubuntu:10.04:libcrypto]
+packages=openssl
+
+[ubuntu:10.04:libjpeg]
+packages=libjpeg62-dev
+
+[ubuntu:10.04:libnetsnmp-devel]
+packages=libsnmp-dev
+
+[ubuntu:10.04:libpthread]
+packages=build-essential
+
+[ubuntu:10.04:libtool]
+packages=libtool
+
+[ubuntu:10.04:libusb]
+packages=libusb-dev
+
+[ubuntu:10.04:make]
+packages=build-essential
+
+[ubuntu:10.04:pil]
+packages=python-imaging
+
+[ubuntu:10.04:ppdev]
+packages=
+commands=sudo modprobe ppdev,sudo cp -f /etc/modules /etc/modules.hplip,echo ppdev | sudo tee -a /etc/modules
+
+[ubuntu:10.04:pyqt]
+packages=python-qt4
+
+[ubuntu:10.04:python-devel]
+packages=python-dev
+
+[ubuntu:10.04:pyqt4]
+packages=python-qt4
+
+[ubuntu:10.04:pyqt4-dbus]
+packages=python-qt4-dbus
+
+#[ubuntu:10.04:python23]
+#packages=python
+
+[ubuntu:10.04:python2x]
+packages=python
+
+[ubuntu:10.04:reportlab]
+packages=python-reportlab
+
+[ubuntu:10.04:sane]
+packages=libsane
+
+[ubuntu:10.04:sane-devel]
+packages=libsane-dev
+
+[ubuntu:10.04:scanimage]
+packages=sane-utils
+
+[ubuntu:10.04:xsane]
+packages=xsane
+
+[ubuntu:10.04:python-dbus]
+packages=python-dbus,python-gobject
+
+[ubuntu:10.04:dbus]
+packages=libdbus-1-dev
+
+[ubuntu:10.04:cups-image]
+packages=libcupsimage2-dev
+
+[ubuntu:10.04:cups-ddk]
+packages=cups
+
+[ubuntu:10.04:policykit]
+packages=policykit-1,policykit-1-gnome
+
+[ubuntu:10.04:python-notify]
+packages=python-notify
+
# ****************************************
[debian]
index=2
@@ -5384,7 +5500,7 @@ packages=gs-esp
packages=libssl-dev
[debian:4.0:libjpeg]
-packages=libjpeg-dev
+packages=libjpeg62-dev
[debian:4.0:libnetsnmp-devel]
packages=libsnmp9-dev
@@ -5415,7 +5531,7 @@ packages=python-qt3
packages=python-dev
[debian:4.0:python2x]
-packages=python
+packages=python,python-ctypes
[debian:4.0:reportlab]
packages=python-reportlab
@@ -7281,7 +7397,7 @@ usb_supported=1
packaged_version=2.7.12
release_date=2007-4-17
notes=Before proceeding, please add the "contrib", "main", and "updates" installation sources to your URPMI configuration./n Open your browser and go to http://easyurpmi.zarb.org/ and follow the instructions provided and then proceed with the HPLIP install. Also you may wish to turn off the cdrom1-12 media sources to speed up the process.
-ppd_install=drv
+ppd_install=ppd
udev_mode_fix=1
ppd_dir=/usr/share/ppd/HP
fix_ppd_symlink=0
@@ -7311,7 +7427,7 @@ packages=libjpeg62-dev
packages=libsnmp0-devel
[mandriva:2008.0:libpthread]
-packages=glibc-i18ndata-2.4-4mdk,glibc_lsb-2.3.6-1mdk
+packages=glibc-i18ndata,glibc_lsb
[mandriva:2008.0:libtool]
packages=libtool
@@ -7330,7 +7446,7 @@ packages=
commands=su -c "modprobe ppdev"
[mandriva:2008.0:pyqt]
-packages=PyQt
+packages=
[mandriva:2008.0:python-devel]
packages=python-devel
@@ -7357,7 +7473,7 @@ packages=sane
packages=libsane1-devel
[mandriva:2008.0:scanimage]
-packages=sane-utils
+packages=sane-frontends,sane-backends
[mandriva:2008.0:xsane]
packages=xsane
@@ -7371,8 +7487,8 @@ packages=python-dbus,python-gobject
[mandriva:2008.0:dbus]
packages=libdbus-1_3-devel
-[mandriva:2008.0:python-ctypes]
-packages=python-ctypes
+#[mandriva:2008.0:python-ctypes]
+#packages=python-ctypes
[mandriva:2008.0:cups-image]
packages=cups-devel
@@ -7419,7 +7535,7 @@ packages=libjpeg62-dev
packages=libsnmp0-devel
[mandriva:2008.1:libpthread]
-packages=glibc-i18ndata-2.4-4mdk,glibc_lsb-2.3.6-1mdk
+packages=glibc-i18ndata,glibc_lsb
[mandriva:2008.1:libtool]
packages=libtool
@@ -7437,8 +7553,8 @@ packages=python-imaging
packages=
commands=su -c "modprobe ppdev"
-[mandriva:2008.1:pyqt]
-packages=PyQt
+#[mandriva:2008.1:pyqt]
+#packages=PyQt
[mandriva:2008.1:python-devel]
packages=python-devel
@@ -7465,7 +7581,7 @@ packages=sane
packages=libsane1-devel
[mandriva:2008.1:scanimage]
-packages=sane-utils
+packages=sane-frontends,sane-backends
[mandriva:2008.1:xsane]
packages=xsane
@@ -7477,10 +7593,10 @@ packages=cupsddk,cupsddk-drivers
packages=python-dbus,python-gobject
[mandriva:2008.1:dbus]
-packages=libdbus-1_3-devel
+packages=libdbus-1-devel
-[mandriva:2008.1:python-ctypes]
-packages=python-ctypes
+#[mandriva:2008.1:python-ctypes]
+#packages=python-ctypes
[mandriva:2008.1:cups-image]
packages=cups-devel
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 11:33:43 +0000