diff options
Diffstat (limited to 'dilos/core/tdebase')
-rw-r--r-- | dilos/core/tdebase/debian/control | 2 | ||||
-rw-r--r-- | dilos/core/tdebase/debian/kcontrol-trinity.install | 6 | ||||
-rw-r--r-- | dilos/core/tdebase/debian/klipper-trinity.install | 1 | ||||
-rwxr-xr-x | dilos/core/tdebase/debian/rules | 6 | ||||
-rw-r--r-- | dilos/core/tdebase/debian/tdebase-data-trinity.install | 8 | ||||
-rw-r--r-- | dilos/core/tdebase/debian/tdebase-trinity-bin.install | 3 | ||||
-rw-r--r-- | dilos/core/tdebase/debian/twin-trinity.install | 14 | ||||
-rw-r--r-- | dilos/core/tdebase/debian/usermap.pl | 6 |
8 files changed, 22 insertions, 24 deletions
diff --git a/dilos/core/tdebase/debian/control b/dilos/core/tdebase/debian/control index eec4f7d2f..f798124d2 100644 --- a/dilos/core/tdebase/debian/control +++ b/dilos/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev, libcpp [solaris-any] +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libtirpc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev, libcpp [solaris-any] 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/dilos/core/tdebase/debian/kcontrol-trinity.install b/dilos/core/tdebase/debian/kcontrol-trinity.install index 36523c40e..7d69f16f2 100644 --- a/dilos/core/tdebase/debian/kcontrol-trinity.install +++ b/dilos/core/tdebase/debian/kcontrol-trinity.install @@ -5,9 +5,10 @@ debian/tmp/usr/bin/keditfiletype debian/tmp/usr/bin/tdefontinst debian/tmp/usr/bin/tdefontview debian/tmp/usr/bin/klocaldomainurifilterhelper -debian/tmp/usr/bin/tderandrtray -#debian/tmp/usr/bin/tdehwdevicetray debian/tmp/usr/bin/krdb +#debian/tmp/usr/bin/tdehwdevicetray +debian/tmp/usr/bin/tderandrtray +debian/tmp/usr/bin/tdesyndaemon debian/tmp/usr/lib/*/trinity/fontthumbnail.la debian/tmp/usr/lib/*/trinity/fontthumbnail.so debian/tmp/usr/lib/*/trinity/kaccess.la @@ -195,6 +196,7 @@ debian/tmp/usr/share/applications/tde/smbstatus.desktop debian/tmp/usr/share/applications/tde/sound.desktop debian/tmp/usr/share/applications/tde/spellchecking.desktop debian/tmp/usr/share/applications/tde/style.desktop +debian/tmp/usr/share/applications/tde/touchpad.desktop debian/tmp/usr/share/applications/tde/useragent.desktop debian/tmp/usr/share/applications/tde/xserver.desktop debian/tmp/usr/share/applnk/.hidden/energy.desktop diff --git a/dilos/core/tdebase/debian/klipper-trinity.install b/dilos/core/tdebase/debian/klipper-trinity.install index 9bd8f433f..d5e9e42a0 100644 --- a/dilos/core/tdebase/debian/klipper-trinity.install +++ b/dilos/core/tdebase/debian/klipper-trinity.install @@ -6,6 +6,7 @@ debian/tmp/usr/lib/*/trinity/klipper_panelapplet.so debian/tmp/usr/lib/*/trinity/klipper.so debian/tmp/usr/lib/*/libtdeinit_klipper.so debian/tmp/usr/share/applications/tde/klipper.desktop +debian/tmp/usr/share/apps/konqueror/servicemenus/copy-full-path.desktop debian/tmp/usr/share/apps/tdeconf_update/klipper-1-2.pl debian/tmp/usr/share/apps/tdeconf_update/klipper-trinity1.sh debian/tmp/usr/share/apps/tdeconf_update/klipperrc.upd diff --git a/dilos/core/tdebase/debian/rules b/dilos/core/tdebase/debian/rules index dcc4fcba5..fa4356dd8 100755 --- a/dilos/core/tdebase/debian/rules +++ b/dilos/core/tdebase/debian/rules @@ -63,7 +63,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_UPOWER="ON" \ -DWITH_LIBART="ON" \ -DWITH_LIBCONFIG="ON" \ - -DWITH_PCRE="ON" \ + -DWITH_PCRE2="ON" \ -DWITH_KRB5="ON" \ -DCMAKE_C_COMPILER=gcc \ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" @@ -135,9 +135,9 @@ binary-install/tdm-trinity:: install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf binary-install/kcontrol-trinity:: -# mkdir -p debian/kcontrol/etc/udev/rules.d +# mkdir -p debian/$(cdbs_curpkg)/etc/udev/rules.d # chmod +x debian/usermap.pl -# debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules +# debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/$(cdbs_curpkg)/etc/udev/logitechmouse.rules install/klipper-trinity:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc diff --git a/dilos/core/tdebase/debian/tdebase-data-trinity.install b/dilos/core/tdebase/debian/tdebase-data-trinity.install index f67986932..ab8031781 100644 --- a/dilos/core/tdebase/debian/tdebase-data-trinity.install +++ b/dilos/core/tdebase/debian/tdebase-data-trinity.install @@ -17,6 +17,10 @@ debian/tmp/usr/share/apps/kcmcss/template.css debian/tmp/usr/share/apps/kcminput/cursor_large_black.pcf.gz debian/tmp/usr/share/apps/kcminput/cursor_large_white.pcf.gz debian/tmp/usr/share/apps/kcminput/cursor_small_white.pcf.gz +debian/tmp/usr/share/apps/kcminput/pics/mouse0.png +debian/tmp/usr/share/apps/kcminput/pics/mouse1.png +debian/tmp/usr/share/apps/kcminput/pics/mouse2.png +debian/tmp/usr/share/apps/kcminput/pics/mouse3.png debian/tmp/usr/share/apps/kcminput/pics/mouse_lh.png debian/tmp/usr/share/apps/kcminput/pics/mouse_rh.png debian/tmp/usr/share/apps/kcminput/pics/doubleclick_1.png @@ -344,6 +348,9 @@ debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tderesources/common debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook +debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/touchpad/common +debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/touchpad/index.cache.bz2 +debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/touchpad/index.docbook debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -520,6 +527,7 @@ debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-desktop-periphera debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-desktop-personal.png debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-desktop.png debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-system.png +debian/tmp/usr/share/icons/crystalsvg/*/devices/input-touchpad.png debian/tmp/usr/share/icons/crystalsvg/*/devices/laptop.png debian/tmp/usr/share/services/searchproviders/acronym.desktop debian/tmp/usr/share/services/searchproviders/alexa.desktop diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.install b/dilos/core/tdebase/debian/tdebase-trinity-bin.install index 3eeb90965..663130ba3 100644 --- a/dilos/core/tdebase/debian/tdebase-trinity-bin.install +++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.install @@ -36,8 +36,6 @@ debian/tmp/usr/lib/*/trinity/kcminit_startup.la debian/tmp/usr/lib/*/trinity/kcminit_startup.so debian/tmp/usr/lib/*/trinity/kcm_keyboard.la debian/tmp/usr/lib/*/trinity/kcm_keyboard.so -debian/tmp/usr/lib/*/trinity/kcm_khotkeys_init.la -debian/tmp/usr/lib/*/trinity/kcm_khotkeys_init.so debian/tmp/usr/lib/*/trinity/kcm_khotkeys.la debian/tmp/usr/lib/*/trinity/kcm_khotkeys.so debian/tmp/usr/lib/*/trinity/kded_khotkeys.la @@ -104,6 +102,7 @@ debian/tmp/usr/share/doc/tde/HTML/en/kxkb/layout.png debian/tmp/usr/share/doc/tde/HTML/en/kxkb/switching.png debian/tmp/usr/share/doc/tde/HTML/en/kxkb/xkb.png debian/tmp/usr/share/services/kxkb.desktop +debian/tmp/usr/share/services/kded/khotkeys.desktop debian/tmp/usr/share/man/man1/drkonqi.1 debian/tmp/usr/share/man/man1/kblankscrn.kss.1 debian/tmp/usr/share/man/man1/kcheckpass.1 diff --git a/dilos/core/tdebase/debian/twin-trinity.install b/dilos/core/tdebase/debian/twin-trinity.install index 8dc19e80e..a307d00af 100644 --- a/dilos/core/tdebase/debian/twin-trinity.install +++ b/dilos/core/tdebase/debian/twin-trinity.install @@ -74,19 +74,7 @@ debian/tmp/usr/share/apps/twin/eventsrc debian/tmp/usr/share/apps/twin/keramik.desktop debian/tmp/usr/share/apps/twin/laptop.desktop debian/tmp/usr/share/apps/twin/modernsystem.desktop -debian/tmp/usr/share/apps/twin/pics/bluesun.png -debian/tmp/usr/share/apps/twin/pics/close.png -debian/tmp/usr/share/apps/twin/pics/fog-grey.png -debian/tmp/usr/share/apps/twin/pics/fog.png -debian/tmp/usr/share/apps/twin/pics/greenie.dim.png -debian/tmp/usr/share/apps/twin/pics/greenie.light.png -debian/tmp/usr/share/apps/twin/pics/iconify.png -debian/tmp/usr/share/apps/twin/pics/maximizedown.png -debian/tmp/usr/share/apps/twin/pics/maximize.png -debian/tmp/usr/share/apps/twin/pics/menu.png -debian/tmp/usr/share/apps/twin/pics/pindown.png -debian/tmp/usr/share/apps/twin/pics/pinup.png -debian/tmp/usr/share/apps/twin/pics/unknown.png +debian/tmp/usr/share/apps/twin/pics/* debian/tmp/usr/share/apps/twin/plastik.desktop debian/tmp/usr/share/apps/twin/quartz.desktop debian/tmp/usr/share/apps/twin/redmond.desktop diff --git a/dilos/core/tdebase/debian/usermap.pl b/dilos/core/tdebase/debian/usermap.pl index 9c8c61f26..bd87e2d72 100644 --- a/dilos/core/tdebase/debian/usermap.pl +++ b/dilos/core/tdebase/debian/usermap.pl @@ -34,7 +34,7 @@ sub parse_usermap_line { my @rule; while (my ($key, $flag) = each(%flags)) { - hex($match{match_flags}) & $flag and push @rule, qq(SYSFS{$key}=="$match{$key}",); + hex($match{match_flags}) & $flag and push @rule, qq(ATTRS{$key}=="$match{$key}",); } push @rule, ( @@ -47,9 +47,9 @@ sub parse_usermap_line { print join(' ', @rule) . "\n"; } -print "BUS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n"; +print "DRIVERS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n"; print "ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n"; -print "SUBSYSTEM!=\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n"; +print "SUBSYSTEMS!=\"usb\"\, GOTO=\"kcontrol_rules_end\"\n\n"; foreach my $usermap (@ARGV) { open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap"; |