From 8ae07e88a99dbd5bce8c44505804abf130ab415a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 29 Apr 2021 10:42:50 +0900 Subject: FOR TESTING ONLY: tdebase without tdehw. Signed-off-by: Michele Calgaro --- debian/_base/core/tdebase/debian/control | 2 +- .../_base/core/tdebase/debian/kcontrol-trinity.install | 6 ------ debian/_base/core/tdebase/debian/rules | 4 ++-- .../core/tdebase/debian/tdebase-data-trinity.install | 3 --- debian/_base/core/tdebase/debian/tdm-trinity.install | 1 - debian/_base/core/tdelibs/debian/rules | 4 ++-- .../core/tdelibs/debian/tdelibs14-trinity-dev.install | 18 ------------------ .../core/tdelibs/debian/tdelibs14-trinity.install | 7 ------- debian/wheezy | 1 + 9 files changed, 6 insertions(+), 40 deletions(-) create mode 120000 debian/wheezy diff --git a/debian/_base/core/tdebase/debian/control b/debian/_base/core/tdebase/debian/control index e49b3b8b7..dd9576a9c 100644 --- a/debian/_base/core/tdebase/debian/control +++ b/debian/_base/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius , Sune Vuorela -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, gawk, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, sharutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libdbus-tqt-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libhal-dev, libhal-storage-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/debian/_base/core/tdebase/debian/kcontrol-trinity.install b/debian/_base/core/tdebase/debian/kcontrol-trinity.install index aa5629dfe..85ca0a9f6 100644 --- a/debian/_base/core/tdebase/debian/kcontrol-trinity.install +++ b/debian/_base/core/tdebase/debian/kcontrol-trinity.install @@ -6,7 +6,6 @@ debian/tmp/opt/trinity/bin/tdefontinst debian/tmp/opt/trinity/bin/tdefontview debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray -debian/tmp/opt/trinity/bin/tdehwdevicetray debian/tmp/opt/trinity/bin/krdb debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so @@ -40,8 +39,6 @@ debian/tmp/opt/trinity/lib/trinity/kcm_fontinst.la debian/tmp/opt/trinity/lib/trinity/kcm_fontinst.so debian/tmp/opt/trinity/lib/trinity/kcm_fonts.la debian/tmp/opt/trinity/lib/trinity/kcm_fonts.so -debian/tmp/opt/trinity/lib/trinity/kcm_hwmanager.la -debian/tmp/opt/trinity/lib/trinity/kcm_hwmanager.so debian/tmp/opt/trinity/lib/trinity/kcm_icons.la debian/tmp/opt/trinity/lib/trinity/kcm_icons.so debian/tmp/opt/trinity/lib/trinity/kcm_info.la @@ -143,7 +140,6 @@ debian/tmp/opt/trinity/share/applications/tde/ebrowsing.desktop debian/tmp/opt/trinity/share/applications/tde/filebrowser.desktop debian/tmp/opt/trinity/share/applications/tde/filetypes.desktop debian/tmp/opt/trinity/share/applications/tde/fonts.desktop -debian/tmp/opt/trinity/share/applications/tde/hwmanager.desktop debian/tmp/opt/trinity/share/applications/tde/icons.desktop debian/tmp/opt/trinity/share/applications/tde/installktheme.desktop debian/tmp/opt/trinity/share/applications/tde/interrupts.desktop @@ -170,8 +166,6 @@ debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop debian/tmp/opt/trinity/share/applications/tde/tdehtml_userinterface.desktop debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop -debian/tmp/opt/trinity/share/applications/tde/tdehwdevicetray.desktop -debian/tmp/opt/trinity/share/autostart/tdehwdevicetray-autostart.desktop debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop debian/tmp/opt/trinity/share/applications/tde/iccconfig.desktop debian/tmp/opt/trinity/share/applications/tde/lanbrowser.desktop diff --git a/debian/_base/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules index b91fc20f1..7d2b0f89c 100755 --- a/debian/_base/core/tdebase/debian/rules +++ b/debian/_base/core/tdebase/debian/rules @@ -54,8 +54,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XRANDR="ON" \ -DWITH_XINERAMA="ON" \ -DWITH_SENSORS="ON" \ - -DWITH_HAL="OFF" \ - -DWITH_TDEHWLIB="ON" \ + -DWITH_HAL="ON" \ + -DWITH_TDEHWLIB="OFF" \ -DWITH_XDMCP="ON" \ -DWITH_XRENDER="ON" \ -DWITH_XTEST="ON" \ diff --git a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install index 5ffe84ca7..0abc74652 100644 --- a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -201,9 +201,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.docbook diff --git a/debian/_base/core/tdebase/debian/tdm-trinity.install b/debian/_base/core/tdebase/debian/tdm-trinity.install index 90c5256de..dc7d5e37f 100644 --- a/debian/_base/core/tdebase/debian/tdm-trinity.install +++ b/debian/_base/core/tdebase/debian/tdm-trinity.install @@ -13,7 +13,6 @@ debian/tmp/opt/trinity/bin/tdm_config debian/tmp/opt/trinity/bin/tdmctl debian/tmp/opt/trinity/bin/tdm_greet debian/tmp/opt/trinity/bin/krootimage -debian/tmp/opt/trinity/bin/tdecryptocardwatcher debian/tmp/opt/trinity/share/apps/tdm/pics/tdelogo.png debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules index 8292b5f73..c80395826 100755 --- a/debian/_base/core/tdelibs/debian/rules +++ b/debian/_base/core/tdelibs/debian/rules @@ -41,8 +41,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_HSPELL="ON" \ -DDEFAULT_SPELL_CHECKER="ASPELL" \ -DWITH_ELFICON="ON" \ - -DWITH_TDEHWLIB="ON" \ - -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_TDEHWLIB="OFF" \ + -DWITH_TDEHWLIB_DAEMONS="OFF" \ -DWITH_LOGINDPOWER="ON" \ -DWITH_UPOWER="ON" \ -DWITH_UDISKS="ON" \ diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install index 949783b12..4a1be6fcd 100644 --- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install +++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install @@ -201,22 +201,6 @@ debian/tmp/opt/trinity/include/kdebugclasses.h debian/tmp/opt/trinity/include/kdebug.h debian/tmp/opt/trinity/include/kdedmodule.h debian/tmp/opt/trinity/include/kde_file.h -debian/tmp/opt/trinity/include/tdebacklightdevice.h -debian/tmp/opt/trinity/include/tdebatterydevice.h -debian/tmp/opt/trinity/include/tdecpudevice.h -debian/tmp/opt/trinity/include/tdecryptographiccarddevice.h -debian/tmp/opt/trinity/include/tdeeventdevice.h -debian/tmp/opt/trinity/include/tdegenericdevice.h -debian/tmp/opt/trinity/include/tdehardwaredevices.h -debian/tmp/opt/trinity/include/tdehwcommontypes.h -debian/tmp/opt/trinity/include/tdeinputdevice.h -debian/tmp/opt/trinity/include/tdemainspowerdevice.h -debian/tmp/opt/trinity/include/tdemonitordevice.h -debian/tmp/opt/trinity/include/tdenetworkconnections.h -debian/tmp/opt/trinity/include/tdenetworkdevice.h -debian/tmp/opt/trinity/include/tderootsystemdevice.h -debian/tmp/opt/trinity/include/tdesensordevice.h -debian/tmp/opt/trinity/include/tdestoragedevice.h debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/kdemacros.h debian/tmp/opt/trinity/include/tde.pot @@ -769,8 +753,6 @@ debian/tmp/opt/trinity/lib/libtdefakes_pic.a debian/tmp/opt/trinity/lib/libtdefakes.so debian/tmp/opt/trinity/lib/libtdefx.la debian/tmp/opt/trinity/lib/libtdefx.so -debian/tmp/opt/trinity/lib/libtdehw.la -debian/tmp/opt/trinity/lib/libtdehw.so debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.la debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.la debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.la diff --git a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install index 14cca82e2..fbe2840fd 100644 --- a/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install +++ b/debian/_base/core/tdelibs/debian/tdelibs14-trinity.install @@ -22,7 +22,6 @@ debian/tmp/opt/trinity/bin/kded debian/tmp/opt/trinity/bin/tdeinit debian/tmp/opt/trinity/bin/tdeinit_shutdown debian/tmp/opt/trinity/bin/tdeinit_wrapper -debian/tmp/opt/trinity/bin/tde_dbus_hardwarecontrol debian/tmp/opt/trinity/bin/kdetcompmgr debian/tmp/opt/trinity/bin/tde-menu debian/tmp/opt/trinity/bin/tdesu_stub @@ -245,8 +244,6 @@ debian/tmp/opt/trinity/lib/libtdefakes.so.14 debian/tmp/opt/trinity/lib/libtdefakes.so.14.0.0 debian/tmp/opt/trinity/lib/libtdefx.so.14 debian/tmp/opt/trinity/lib/libtdefx.so.14.0.0 -debian/tmp/opt/trinity/lib/libtdehw.so.14 -debian/tmp/opt/trinity/lib/libtdehw.so.14.1.0 debian/tmp/opt/trinity/lib/libtdeinit_cupsdconf.so debian/tmp/opt/trinity/lib/libtdeinit_dcopserver.so debian/tmp/opt/trinity/lib/libtdeinit_kaddprinterwizard.so @@ -323,8 +320,4 @@ debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 debian/tmp/opt/trinity/share/services/tdefile_elf.desktop debian/tmp/opt/trinity/lib/trinity/tdefile_elf.so debian/tmp/opt/trinity/lib/trinity/tdefile_elf.la -debian/tmp/opt/trinity/share/apps/tdehwlib/deviceclasses/* -debian/tmp/opt/trinity/share/apps/tdehwlib/pnpdev/* -debian/tmp/etc/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf -debian/tmp/usr/share/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service diff --git a/debian/wheezy b/debian/wheezy new file mode 120000 index 000000000..e7c887a6f --- /dev/null +++ b/debian/wheezy @@ -0,0 +1 @@ +_base \ No newline at end of file -- cgit v1.2.1