diff options
Diffstat (limited to 'ubuntu/_base')
12 files changed, 65 insertions, 54 deletions
diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules index 8f95f25f5..ca3408acf 100755 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules +++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules @@ -119,4 +119,4 @@ binary-arch: build install dh_builddeb $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build build-arch clean binary-indep binary-arch binary install diff --git a/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install b/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install index aa5629dfe..fb1838b85 100644 --- a/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install @@ -5,9 +5,10 @@ debian/tmp/opt/trinity/bin/keditfiletype 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/bin/tdehwdevicetray +debian/tmp/opt/trinity/bin/tderandrtray +debian/tmp/opt/trinity/bin/tdesyndaemon debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so debian/tmp/opt/trinity/lib/trinity/kaccess.la @@ -195,6 +196,7 @@ debian/tmp/opt/trinity/share/applications/tde/smbstatus.desktop debian/tmp/opt/trinity/share/applications/tde/sound.desktop debian/tmp/opt/trinity/share/applications/tde/spellchecking.desktop debian/tmp/opt/trinity/share/applications/tde/style.desktop +debian/tmp/opt/trinity/share/applications/tde/touchpad.desktop debian/tmp/opt/trinity/share/applications/tde/useragent.desktop debian/tmp/opt/trinity/share/applications/tde/xserver.desktop debian/tmp/opt/trinity/share/applnk/.hidden/energy.desktop diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.install b/ubuntu/_base/core/tdebase/debian/klipper-trinity.install index 719b878c8..4231a3aae 100644 --- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/klipper-trinity.install @@ -6,6 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so debian/tmp/opt/trinity/lib/trinity/klipper.so debian/tmp/opt/trinity/lib/libtdeinit_klipper.so debian/tmp/opt/trinity/share/applications/tde/klipper.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/copy-full-path.desktop debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-1-2.pl debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-trinity1.sh debian/tmp/opt/trinity/share/apps/tdeconf_update/klipperrc.upd diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index d24d632f0..4a5dcee66 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -116,9 +116,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/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install index 0ab9bc8a8..2ac5be87f 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -17,6 +17,10 @@ debian/tmp/opt/trinity/share/apps/kcmcss/template.css debian/tmp/opt/trinity/share/apps/kcminput/cursor_large_black.pcf.gz debian/tmp/opt/trinity/share/apps/kcminput/cursor_large_white.pcf.gz debian/tmp/opt/trinity/share/apps/kcminput/cursor_small_white.pcf.gz +debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse0.png +debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse1.png +debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse2.png +debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse3.png debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_lh.png debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_rh.png debian/tmp/opt/trinity/share/apps/kcminput/pics/doubleclick_1.png @@ -344,6 +348,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook @@ -520,6 +527,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop-p debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop-personal.png debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop.png debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-system.png +debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/input-touchpad.png debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/laptop.png debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop diff --git a/ubuntu/_base/core/tdebase/debian/usermap.pl b/ubuntu/_base/core/tdebase/debian/usermap.pl index 9c8c61f26..bd87e2d72 100644 --- a/ubuntu/_base/core/tdebase/debian/usermap.pl +++ b/ubuntu/_base/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"; diff --git a/ubuntu/_base/dependencies/pytqt/debian/rules b/ubuntu/_base/dependencies/pytqt/debian/rules index 532bf34bd..0da3e5231 100755 --- a/ubuntu/_base/dependencies/pytqt/debian/rules +++ b/ubuntu/_base/dependencies/pytqt/debian/rules @@ -39,7 +39,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) else CXXFLAGS += -O1 endif -CXXFLAGS += "-I/usr/include/tqt" +CXXFLAGS += "-I/usr/include/tqt" "-I/usr/include/tqt3" PYTHONS := $(shell py3versions -vr) diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules index 7050c5431..c5f7ea68d 100755 --- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules @@ -161,4 +161,4 @@ binary-arch: install-arch $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary configure +.PHONY: build build-arch clean binary-indep binary-arch binary configure diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index 43dd24ff6..b22eb1913 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -1,12 +1,12 @@ usr/include/tqt3/private/* -usr/include/tqt3/ntqaccel.h -usr/include/tqt3/ntqaccessible.h +usr/include/tqt3/tqaccel.h +usr/include/tqt3/tqaccessible.h usr/include/tqt3/tqaction.h usr/include/tqt3/ntqapplication.h usr/include/tqt3/tqasciicache.h usr/include/tqt3/tqasciidict.h -usr/include/tqt3/ntqasyncimageio.h -usr/include/tqt3/ntqasyncio.h +usr/include/tqt3/tqasyncimageio.h +usr/include/tqt3/tqasyncio.h usr/include/tqt3/tqbig5codec.h usr/include/tqt3/tqbitarray.h usr/include/tqt3/tqbitmap.h @@ -18,16 +18,16 @@ usr/include/tqt3/tqcache.h usr/include/tqt3/tqcanvas.h usr/include/tqt3/tqcdestyle.h usr/include/tqt3/tqcheckbox.h -usr/include/tqt3/ntqcleanuphandler.h +usr/include/tqt3/tqcleanuphandler.h usr/include/tqt3/tqclipboard.h usr/include/tqt3/tqcolor.h usr/include/tqt3/tqcolordialog.h usr/include/tqt3/tqcombobox.h usr/include/tqt3/tqcommonstyle.h usr/include/tqt3/tqcompactstyle.h -usr/include/tqt3/ntqconnection.h +usr/include/tqt3/tqconnection.h usr/include/tqt3/tqcstring.h -usr/include/tqt3/ntqcursor.h +usr/include/tqt3/tqcursor.h usr/include/tqt3/tqdatabrowser.h usr/include/tqt3/tqdatastream.h usr/include/tqt3/tqdatatable.h @@ -41,23 +41,23 @@ usr/include/tqt3/tqdialog.h usr/include/tqt3/tqdict.h usr/include/tqt3/tqdir.h usr/include/tqt3/tqdns.h -usr/include/tqt3/ntqdockarea.h -usr/include/tqt3/ntqdockwindow.h +usr/include/tqt3/tqdockarea.h +usr/include/tqt3/tqdockwindow.h usr/include/tqt3/tqdom.h usr/include/tqt3/tqdragobject.h -usr/include/tqt3/ntqdrawutil.h +usr/include/tqt3/tqdrawutil.h usr/include/tqt3/tqdropsite.h usr/include/tqt3/tqeditorfactory.h -usr/include/tqt3/ntqerrormessage.h +usr/include/tqt3/tqerrormessage.h usr/include/tqt3/tqeucjpcodec.h usr/include/tqt3/tqeuckrcodec.h usr/include/tqt3/tqevent.h usr/include/tqt3/tqeventloop.h -usr/include/tqt3/ntqfeatures.h +usr/include/tqt3/tqfeatures.h usr/include/tqt3/tqfile.h usr/include/tqt3/tqfiledialog.h usr/include/tqt3/tqfileinfo.h -usr/include/tqt3/ntqfocusdata.h +usr/include/tqt3/tqfocusdata.h usr/include/tqt3/tqfont.h usr/include/tqt3/tqfontdatabase.h usr/include/tqt3/tqfontdialog.h @@ -70,7 +70,7 @@ usr/include/tqt3/tqgb18030codec.h usr/include/tqt3/tqgbkcodec.h usr/include/tqt3/tqgcache.h usr/include/tqt3/tqgdict.h -usr/include/tqt3/ntqgif.h +usr/include/tqt3/tqgif.h usr/include/tqt3/tqglist.h usr/include/tqt3/tqglobal.h usr/include/tqt3/tqgplugin.h @@ -90,23 +90,23 @@ usr/include/tqt3/tqiconset.h usr/include/tqt3/tqiconview.h usr/include/tqt3/tqimage.h usr/include/tqt3/tqimageformatplugin.h -usr/include/tqt3/ntqinputcontext.h -usr/include/tqt3/ntqinputcontextfactory.h -usr/include/tqt3/ntqinputcontextplugin.h -usr/include/tqt3/ntqinputdialog.h +usr/include/tqt3/tqinputcontext.h +usr/include/tqt3/tqinputcontextfactory.h +usr/include/tqt3/tqinputcontextplugin.h +usr/include/tqt3/tqinputdialog.h usr/include/tqt3/tqintcache.h usr/include/tqt3/tqintdict.h usr/include/tqt3/tqinterlacestyle.h usr/include/tqt3/tqiodevice.h usr/include/tqt3/tqjiscodec.h -usr/include/tqt3/ntqjpegio.h +usr/include/tqt3/tqjpegio.h usr/include/tqt3/tqjpunicode.h -usr/include/tqt3/ntqkeycode.h -usr/include/tqt3/ntqkeysequence.h +usr/include/tqt3/tqkeycode.h +usr/include/tqt3/tqkeysequence.h usr/include/tqt3/tqlabel.h usr/include/tqt3/tqlayout.h usr/include/tqt3/tqlcdnumber.h -usr/include/tqt3/ntqlibrary.h +usr/include/tqt3/tqlibrary.h usr/include/tqt3/tqlineedit.h usr/include/tqt3/tqlistbox.h usr/include/tqt3/tqlistview.h @@ -117,19 +117,19 @@ usr/include/tqt3/tqmap.h usr/include/tqt3/tqmemarray.h usr/include/tqt3/tqmenubar.h usr/include/tqt3/tqmenudata.h -usr/include/tqt3/ntqmessagebox.h -usr/include/tqt3/ntqmetaobject.h +usr/include/tqt3/tqmessagebox.h +usr/include/tqt3/tqmetaobject.h usr/include/tqt3/tqmime.h -usr/include/tqt3/ntqmngio.h +usr/include/tqt3/tqmngio.h usr/include/tqt3/tqmotifstyle.h usr/include/tqt3/tqmotifplusstyle.h usr/include/tqt3/tqmovie.h usr/include/tqt3/tqmultilineedit.h usr/include/tqt3/tqmutex.h -usr/include/tqt3/ntqnamespace.h +usr/include/tqt3/tqnamespace.h usr/include/tqt3/tqnetwork.h usr/include/tqt3/tqnetworkprotocol.h -usr/include/tqt3/ntqnp.h +usr/include/tqt3/tqnp.h usr/include/tqt3/tqobject.h usr/include/tqt3/tqobjectcleanuphandler.h usr/include/tqt3/tqobjectdefs.h @@ -148,9 +148,9 @@ usr/include/tqt3/tqplatinumstyle.h usr/include/tqt3/tqpngio.h usr/include/tqt3/tqpoint.h usr/include/tqt3/tqpointarray.h -usr/include/tqt3/ntqpolygonscanner.h +usr/include/tqt3/tqpolygonscanner.h usr/include/tqt3/tqpopupmenu.h -usr/include/tqt3/ntqprintdialog.h +usr/include/tqt3/tqprintdialog.h usr/include/tqt3/tqprinter.h usr/include/tqt3/tqprocess.h usr/include/tqt3/tqprogressbar.h @@ -163,7 +163,7 @@ usr/include/tqt3/tqptrstack.h usr/include/tqt3/tqptrvector.h usr/include/tqt3/tqpushbutton.h usr/include/tqt3/tqradiobutton.h -usr/include/tqt3/ntqrangecontrol.h +usr/include/tqt3/tqrangecontrol.h usr/include/tqt3/tqrect.h usr/include/tqt3/tqregexp.h usr/include/tqt3/tqregion.h @@ -174,7 +174,7 @@ usr/include/tqt3/tqserversocket.h usr/include/tqt3/tqsessionmanager.h usr/include/tqt3/tqsettings.h usr/include/tqt3/tqsgistyle.h -usr/include/tqt3/ntqshared.h +usr/include/tqt3/tqshared.h usr/include/tqt3/tqsignal.h usr/include/tqt3/tqsignalmapper.h usr/include/tqt3/tqsignalslotimp.h @@ -187,10 +187,10 @@ usr/include/tqt3/tqslider.h usr/include/tqt3/tqsocket.h usr/include/tqt3/tqsocketdevice.h usr/include/tqt3/tqsocketnotifier.h -usr/include/tqt3/ntqsound.h +usr/include/tqt3/tqsound.h usr/include/tqt3/tqspinbox.h -usr/include/tqt3/ntqsplashscreen.h -usr/include/tqt3/ntqsplitter.h +usr/include/tqt3/tqsplashscreen.h +usr/include/tqt3/tqsplitter.h usr/include/tqt3/tqsql.h usr/include/tqt3/tqsqlcursor.h usr/include/tqt3/tqsqldatabase.h @@ -216,7 +216,7 @@ usr/include/tqt3/tqstylefactory.h usr/include/tqt3/tqstyleplugin.h usr/include/tqt3/tqstylesheet.h usr/include/tqt3/tqsyntaxhighlighter.h -usr/include/tqt3/ntqt.h +usr/include/tqt3/tqt3.h usr/include/tqt3/tqt.h usr/include/tqt3/tqtabbar.h usr/include/tqt3/tqtabdialog.h @@ -232,7 +232,7 @@ usr/include/tqt3/tqtextview.h usr/include/tqt3/tqthread.h usr/include/tqt3/tqthreadstorage.h usr/include/tqt3/tqtimer.h -usr/include/tqt3/ntqtl.h +usr/include/tqt3/tqtl.h usr/include/tqt3/tqtoolbar.h usr/include/tqt3/tqtoolbox.h usr/include/tqt3/tqtoolbutton.h @@ -243,12 +243,12 @@ usr/include/tqt3/tqurl.h usr/include/tqt3/tqurlinfo.h usr/include/tqt3/tqurloperator.h usr/include/tqt3/tqutfcodec.h -usr/include/tqt3/ntquuid.h -usr/include/tqt3/ntqvalidator.h +usr/include/tqt3/tquuid.h +usr/include/tqt3/tqvalidator.h usr/include/tqt3/tqvaluelist.h usr/include/tqt3/tqvaluestack.h usr/include/tqt3/tqvaluevector.h -usr/include/tqt3/ntqvariant.h +usr/include/tqt3/tqvariant.h usr/include/tqt3/tqvbox.h usr/include/tqt3/tqvbuttongroup.h usr/include/tqt3/tqvgroupbox.h @@ -259,9 +259,9 @@ usr/include/tqt3/tqwidgetintdict.h usr/include/tqt3/tqwidgetlist.h usr/include/tqt3/tqwidgetplugin.h usr/include/tqt3/tqwidgetstack.h -usr/include/tqt3/ntqwindowdefs.h +usr/include/tqt3/tqwindowdefs.h usr/include/tqt3/tqwindowsstyle.h -usr/include/tqt3/ntqwinexport.h +usr/include/tqt3/tqwinexport.h usr/include/tqt3/tqwizard.h usr/include/tqt3/tqwmatrix.h usr/include/tqt3/tqworkspace.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install index 33303e90c..023c39399 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt.install @@ -1,4 +1,4 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.* usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.* -usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libtqmng.so usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so diff --git a/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc b/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc index e193b495c..6a411f315 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc +++ b/ubuntu/_base/dependencies/tqt3/debian/qt_plugins_3.3rc @@ -1,4 +1,4 @@ [usr] lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e -lib/tqt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e +lib/tqt3/plugins/imageformats/libtqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install index 43dc0a94a..d3cfad18a 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so -usr/include/tqt3/ntqassistantclient.h +usr/include/tqt3/tqassistantclient.h |