diff options
69 files changed, 421 insertions, 1320 deletions
diff --git a/debian/_base/applications/internet/ktorrent/debian/control b/debian/_base/applications/internet/ktorrent/debian/control index 3b335272c..b8fed9eb6 100644 --- a/debian/_base/applications/internet/ktorrent/debian/control +++ b/debian/_base/applications/internet/ktorrent/debian/control @@ -2,7 +2,7 @@ Source: ktorrent-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/control b/debian/_base/applications/office/tde-ebook-reader/debian/control index 3ffd947d0..cd9f85394 100644 --- a/debian/_base/applications/office/tde-ebook-reader/debian/control +++ b/debian/_base/applications/office/tde-ebook-reader/debian/control @@ -10,6 +10,7 @@ Standards-Version: 4.7.0 Package: tde-ebook-reader Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: sensible-utils, Description: e-book reader for TDE @@ -33,6 +34,7 @@ Description: e-book reader for TDE Package: libzlcore-tqt Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-data-tqt Description: ZLibrary TQt3-based development library (shared library) This is the core of ZLibrary, the library that tde-ebook-reader is based on. @@ -40,6 +42,7 @@ Description: ZLibrary TQt3-based development library (shared library) Package: libzlcore-data-tqt Section: libs Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, Description: ZLibrary TQt3-based development library (support files) This package contains the support files for the core of ZLibrary, the library @@ -48,6 +51,7 @@ Description: ZLibrary TQt3-based development library (support files) Package: libzltext-tqt Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt, libzltext-data-tqt Description: ZLibrary TQt3-based text model/viewer part (shared library) This package provides text model/viewer part of ZLibrary. @@ -55,6 +59,7 @@ Description: ZLibrary TQt3-based text model/viewer part (shared library) Package: libzltext-data-tqt Section: libs Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, Description: ZLibrary TQt3-based text model/viewer part (support files) This package contains the support files for the text model/viewer part @@ -63,6 +68,7 @@ Description: ZLibrary TQt3-based text model/viewer part (support files) Package: libzlcore-tqt-dev Section: libdevel Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt Description: ZLibrary TQt3-based development library (development files) This package contains development files for the ZLibrary core. @@ -70,6 +76,7 @@ Description: ZLibrary TQt3-based development library (development files) Package: libzltext-tqt-dev Section: libdevel Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, libzltext-tqt Description: ZLibrary TQt3-based text model/viewer part (development files) This package contains development files for the ZLibrary text model/viewer diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install index 4b2f1a823..4f30f38c6 100644 --- a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install +++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install @@ -1,2 +1,2 @@ /usr/include/zlibrary-tqt/core -/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install index f13e427b0..3a6addd23 100644 --- a/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install +++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install @@ -1 +1 @@ -/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so.* +/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so.* diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install index eda8a3beb..95be86c20 100644 --- a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install +++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install @@ -1,2 +1,2 @@ /usr/include/zlibrary-tqt/text -/usr/lib/x86_64-linux-gnu/libzltext-tqt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so diff --git a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install index 5d79675c1..3faed63a9 100644 --- a/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install +++ b/debian/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install @@ -1 +1 @@ -/usr/lib/x86_64-linux-gnu/libzltext-tqt.so.* +/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so.* diff --git a/debian/_base/applications/settings/kmyfirewall/debian/dirs b/debian/_base/applications/settings/kmyfirewall/debian/dirs deleted file mode 100644 index f0312285e..000000000 --- a/debian/_base/applications/settings/kmyfirewall/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -opt/trinity/bin -opt/trinity/share/doc/tde/HTML/en diff --git a/debian/_base/applications/settings/kmyfirewall/debian/install b/debian/_base/applications/settings/kmyfirewall/debian/install deleted file mode 100644 index 311ed806e..000000000 --- a/debian/_base/applications/settings/kmyfirewall/debian/install +++ /dev/null @@ -1,2 +0,0 @@ -debian/kmyfirewall.xpm opt/trinity/share/pixmaps -debian/kmyfirewall-trinity/opt/trinity/share/man/man1/* diff --git a/debian/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop b/debian/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop deleted file mode 100644 index 3a562e7c0..000000000 --- a/debian/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop +++ /dev/null @@ -1,44 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=ServiceType -X-TDE-ServiceType=KMyFirewall/Installer -X-TDE-Library=libkmfinstallerplugin - -Name=KMyFirewall Installer Plugin -Name[bg]=Приставка-инсталатор на KMyFirewall -Name[br]=Lugent stalier KMyFirewall -Name[bs]=KMyFirewall dodatak za instalaciju -Name[ca]=Connector d'instal·lació per a KMyFirewall -Name[cs]=Modul instalátoru KMyFirewall -Name[de]=KMyFirewall Installationsprogramm -Name[el]=Πρόσθετο εγκατάστασης για το KMyFirewall -Name[es]=Complemento de instalación de KMyFirewall -Name[et]=KMyFirewalli paigaldamisplugin -Name[fr]=Module d'installation de KMyFirewall -Name[gl]=Extensión de Instalazón de KMyFirewall -Name[hi]=के-माइ-फायरवाल संस्थापक प्लगइन -Name[hu]=KMyFirewall telepítőmodul -Name[it]=Plugin di installazione di KMyFirewall -Name[ja]=KMyFirewall インストーラ プラグイン -Name[ka]=KMyFirewall დაყენების მოდული -Name[nl]=KMyFirewall Installatieplugin -Name[pa]=KMyFirewall ਇੰਸਟਾਲਰ ਪਲੱਗਿੰਨ -Name[pl]=Wtyczka instalatora KMyFirewall -Name[pt]='Plugin' de Instalação do KMyFirewall -Name[pt_BR]=Plug-in Instaldor par ao KMyFirewall -Name[ru]=KMyFirewall - Модуль установки -Name[sr]=KMyFirewall-ов прикључак за инсталирање -Name[sr@Latn]=KMyFirewall-ov priključak za instaliranje -Name[sv]=Installationsdel för Min brandvägg -Name[ta]=KMyதீச்சுவர் நிறுவுபவரைச் சொருகு -Name[tr]=KMyFirewall Kurulum Eklentisi -Name[uk]=Втулок встановлення KMyFirewall -Name[xx]=xxKMyFirewall Installer Pluginxx -Name[zh_CN]=KMyFirewall 安装程序插件 - -[PropertyDef::X-KMyFirewall-Platform] -Type=TQString - -[PropertyDef::X-KMyFirewall-Language] -Type=TQString - diff --git a/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop deleted file mode 100644 index 57f12ad9c..000000000 --- a/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop +++ /dev/null @@ -1,35 +0,0 @@ -[Desktop Entry] -Type=Application -MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet; -Icon=kmyfirewall -Exec=/opt/trinity/bin/kmyfirewall %u -Terminal=false -Categories=Qt;TDE;System; -Name=KMyFirewall -Name[sv]=Min brandvägg -Name[xx]=xxKMyFirewallxx -GenericName=Firewall Configuration Tool -GenericName[bg]=Настройване на защитна стена -GenericName[es]=Herramienta de configuración de cortafuegos -GenericName[et]=Tulemüüri seadistamistööriist -GenericName[it]=Strumento di configurazione di KMyFirewall -GenericName[nl]=Firewall-configuratieprogramma -GenericName[pt]=Ferramenta de Configuração da Firewall -GenericName[pt_BR]=Ferramenta de Configuração da Firewall -GenericName[sr]=Алат за подешавање заштитног зида -GenericName[sr@Latn]=Алат за подешавање заштитног зида -GenericName[sv]=Verktyg för brandväggsinställning -GenericName[xx]=xxFirewall Configuration Toolxx -Comment=Firewall Configuration Tool -Comment[bg]=Настройване на KMyFirewall -Comment[es]=Herramienta de configuración de cortafuegos -Comment[et]=Tulemüüri seadistamistööriist -Comment[it]=Strumento di configurazione di KMyFirewall -Comment[ms]=Alatan Tetapan Firewall -Comment[nl]=Firewall-configuratieprogramma -Comment[pt]=Ferramenta de Configuração da Firewall -Comment[pt_BR]=Ferramenta de Configuração da Firewall -Comment[sr]=Алат за подешавање заштитног зида -Comment[sr@Latn]=Алат за подешавање заштитног зида -Comment[sv]=Verktyg för inställning av brandvägg -Comment[xx]=xxFirewall Configuration Toolxx diff --git a/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm b/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm deleted file mode 100644 index 3d58b81ff..000000000 --- a/debian/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm +++ /dev/null @@ -1,369 +0,0 @@ -/* XPM */ -static char * kmyfirewall_xpm[] = { -"32 32 334 2", -" c None", -". c #FE0000", -"+ c #E60000", -"@ c #E10000", -"# c #EA0000", -"$ c #EF0000", -"% c #E40000", -"& c #DA0000", -"* c #D70000", -"= c #DC0000", -"- c #F50F0F", -"; c #F02525", -"> c #EE4949", -", c #EB6C6C", -"' c #F89999", -") c #FBAFAF", -"! c #FDC4C4", -"~ c #FDCACA", -"{ c #FCC2C2", -"] c #FBB2B2", -"^ c #F59494", -"/ c #E87272", -"( c #DD4343", -"_ c #D42929", -": c #EF0808", -"< c #ED5858", -"[ c #F29191", -"} c #F7BCBC", -"| c #FBC8C8", -"1 c #FCCCCC", -"2 c #FDCCCC", -"3 c #FECCCC", -"4 c #FBC9C9", -"5 c #F6B7B7", -"6 c #ED9999", -"7 c #D54D4D", -"8 c #BF1313", -"9 c #E82525", -"0 c #EB7F7F", -"a c #F8CCCC", -"b c #FACCCC", -"c c #FBCCCC", -"d c #F9CCCC", -"e c #F6C6C6", -"f c #E58E8E", -"g c #B91A1A", -"h c #DE0000", -"i c #E46969", -"j c #F4BEBE", -"k c #F8C9C9", -"l c #F9C9C9", -"m c #FAC9C9", -"n c #FCC9C9", -"o c #FDC9C9", -"p c #FECBCB", -"q c #FECFCF", -"r c #FEC9C9", -"s c #F7C9C9", -"t c #F5C5C5", -"u c #D55C5C", -"v c #AF0A0A", -"w c #CC0000", -"x c #EEA4A4", -"y c #F3B5B5", -"z c #F5B5B5", -"A c #F7B5B5", -"B c #F9B5B5", -"C c #FAB5B5", -"D c #FBB5B5", -"E c #FCB5B5", -"F c #FDC3C3", -"G c #FFF1F1", -"H c #FDB9B9", -"I c #F6B5B5", -"J c #F4B5B5", -"K c #F2B5B5", -"L c #E88B8B", -"M c #C81818", -"N c #9E0000", -"O c #EE0000", -"P c #C90000", -"Q c #EB9393", -"R c #F0A2A2", -"S c #F2A2A2", -"T c #F4A2A2", -"U c #F6A2A2", -"V c #F7A2A2", -"W c #F9A2A2", -"X c #FAA2A2", -"Y c #FCBDBD", -"Z c #FFF5F5", -"` c #FCB3B3", -" . c #F8A2A2", -".. c #F5A2A2", -"+. c #F3A2A2", -"@. c #F1A2A2", -"#. c #EFA2A2", -"$. c #E57D7D", -"%. c #CC1616", -"&. c #B00000", -"*. c #8F0000", -"=. c #F20000", -"-. c #D20000", -";. c #C30000", -">. c #C80000", -",. c #DC4747", -"'. c #E97C7C", -"). c #ED8282", -"!. c #EF8282", -"~. c #F28282", -"{. c #F48282", -"]. c #F68888", -"^. c #F9A6A6", -"/. c #FDD9D9", -"(. c #FFFFFF", -"_. c #FDE4E4", -":. c #F89898", -"<. c #F48484", -"[. c #F38282", -"}. c #F08282", -"|. c #EE8282", -"1. c #EC8282", -"2. c #E97F7F", -"3. c #D83E3E", -"4. c #C80505", -"5. c #BD0000", -"6. c #A20000", -"7. c #C50000", -"8. c #D11111", -"9. c #DE4343", -"0. c #E86969", -"a. c #EB6969", -"b. c #EE6969", -"c. c #F06969", -"d. c #F37878", -"e. c #FBCECE", -"f. c #FFF7F7", -"g. c #FEF2F2", -"h. c #F69999", -"i. c #F59999", -"j. c #EF7070", -"k. c #EC6969", -"l. c #EA6969", -"m. c #E66666", -"n. c #DF4B4B", -"o. c #CD0B0B", -"p. c #C60000", -"q. c #BF0000", -"r. c #B40000", -"s. c #7C0000", -"t. c #D40000", -"u. c #C70000", -"v. c #CD0000", -"w. c #D20101", -"x. c #DB1E1E", -"y. c #E13535", -"z. c #E74343", -"A. c #E94646", -"B. c #F06C6C", -"C. c #FCE4E4", -"D. c #FFFCFC", -"E. c #FACECE", -"F. c #FAD8D8", -"G. c #EC6363", -"H. c #E54141", -"I. c #E13838", -"J. c #D81A1A", -"K. c #D00404", -"L. c #CA0000", -"M. c #BB0000", -"N. c #940000", -"O. c #FD0000", -"P. c #D00000", -"Q. c #D50202", -"R. c #D90808", -"S. c #DF1414", -"T. c #E21D1D", -"U. c #EA4F4F", -"V. c #FBDCDC", -"W. c #FFFEFE", -"X. c #FDEFEF", -"Y. c #EC7171", -"Z. c #DD1212", -"`. c #D90909", -" + c #D30101", -".+ c #CF0000", -"++ c #A10000", -"@+ c #6C0000", -"#+ c #E70000", -"$+ c #BE0000", -"%+ c #CB0000", -"&+ c #CE0000", -"*+ c #D30000", -"=+ c #D60000", -"-+ c #DC1010", -";+ c #EA6565", -">+ c #E53B3B", -",+ c #F8C7C7", -"'+ c #FCEBEB", -")+ c #DA1111", -"!+ c #D50303", -"~+ c #D10000", -"{+ c #C00000", -"]+ c #BC0000", -"^+ c #AD0000", -"/+ c #7B0000", -"(+ c #DB0000", -"_+ c #D50000", -":+ c #DD2828", -"<+ c #F7CACA", -"[+ c #F6BCBC", -"}+ c #E45656", -"|+ c #E04545", -"1+ c #C10000", -"2+ c #B30000", -"3+ c #810000", -"4+ c #E25050", -"5+ c #FBE7E7", -"6+ c #F9DFDF", -"7+ c #BA0000", -"8+ c #840000", -"9+ c #E76A6A", -"0+ c #FDF4F4", -"a+ c #FEFAFA", -"b+ c #FEF8F8", -"c+ c #C40000", -"d+ c #C20000", -"e+ c #E66B6B", -"f+ c #FDF3F3", -"g+ c #F2A7A7", -"h+ c #EA7777", -"i+ c #F5C7C7", -"j+ c #830000", -"k+ c #D90000", -"l+ c #E66767", -"m+ c #ED8989", -"n+ c #E34848", -"o+ c #F1A8A8", -"p+ c #DD0000", -"q+ c #E44C4C", -"r+ c #FBE0E0", -"s+ c #FBE5E5", -"t+ c #E64E4E", -"u+ c #E23535", -"v+ c #F2A5A5", -"w+ c #FADCDC", -"x+ c #F8D6D6", -"y+ c #DB2020", -"z+ c #D50404", -"A+ c #740000", -"B+ c #D80000", -"C+ c #E75858", -"D+ c #EF8989", -"E+ c #F3A3A3", -"F+ c #EA5E5E", -"G+ c #DF0D0D", -"H+ c #DE0B0B", -"I+ c #E33232", -"J+ c #F7C6C6", -"K+ c #EF9B9B", -"L+ c #DB1818", -"M+ c #620000", -"N+ c #E00C0C", -"O+ c #F29696", -"P+ c #E52727", -"Q+ c #EC5E5E", -"R+ c #F28F8F", -"S+ c #E20D0D", -"T+ c #E00000", -"U+ c #EE7A7A", -"V+ c #DF0B0B", -"W+ c #900000", -"X+ c #420000", -"Y+ c #E20000", -"Z+ c #E30404", -"`+ c #F18080", -" @ c #EC4646", -".@ c #E61010", -"+@ c #EA3434", -"@@ c #E50404", -"#@ c #EF6B6B", -"$@ c #E51717", -"%@ c #630000", -"&@ c #E80000", -"*@ c #E90000", -"=@ c #EC2020", -"-@ c #FCD4D4", -";@ c #EB1010", -">@ c #EE3434", -",@ c #FAC7C7", -"'@ c #FEF3F3", -")@ c #F69898", -"!@ c #9D0000", -"~@ c #EC0000", -"{@ c #ED0000", -"]@ c #F34C4C", -"^@ c #FCCDCD", -"/@ c #FCDBDB", -"(@ c #F24F4F", -"_@ c #F89D9D", -":@ c #FFF9F9", -"<@ c #F78A8A", -"[@ c #F02424", -"}@ c #700000", -"|@ c #F30000", -"1@ c #F40000", -"2@ c #F40C0C", -"3@ c #FA7676", -"4@ c #FA7C7C", -"5@ c #F51C1C", -"6@ c #F73F3F", -"7@ c #F62525", -"8@ c #6F0000", -"9@ c #F80000", -"0@ c #F70000", -"a@ c #F80404", -"b@ c #F80808", -"c@ c #DF0000", -"d@ c #960000", -"e@ c #710000", -"f@ c #9A0000", -"g@ c #F00000", -"h@ c #A80000", -"i@ c #800000", -"j@ c #F10000", -"k@ c #F90000", -"l@ c #FC0000", -"m@ c #660000", -"n@ c #750000", -"o@ c #8D0000", -"p@ c #980000", -"q@ c #A00000", -"r@ c #9C0000", -"s@ c #690000", -" ", -" . + @ # $ % & * = ", -" - ; > , ' ) ! ~ { ] ^ / ( _ ", -" : < [ } | 1 2 3 3 2 2 1 4 5 6 7 8 ", -" 9 0 a b c 1 2 3 3 3 3 2 2 c b d e f g ", -" h i j k l m n o o p q r o n 4 m l s t u v ", -" h w x y z A B C D E F G H E C B A I J K L M N ", -" O P P Q R S T U V W X Y Z ` X .V ..+.@.#.$.%.&.*. ", -" =.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6. ", -" % 7.;.>.8.9.0.a.b.c.d.e.f.(.g.h.i.j.k.l.m.n.o.p.q.r.s. ", -" t.5.;.u.v.w.x.y.z.A.B.C.(.(.D.E.F.G.H.I.J.K.L.p.q.M.N. ", -" O.;.5.;.u.w P.Q.R.S.T.U.V.(.(.(.W.X.Y.Z.`. +.+P 7.q.M.++@+ ", -" #+M.$+;.u.%+&+*+=+-+;+>+,+(.(.(.(.(.'+)+!+~+v.P 7.{+]+^+/+ ", -" (+M.q.;.u.%+&+-._+:+<+[+'+(.(.(.(.(.(.}+|+P.v.P 7.1+5.2+3+ ", -" t.$+1+7.u.%+&+~+t.4+5+(.(.(.(.(.(.(.(.(.6+.+v.P u.;.{+7+8+ ", -" t.1+;.p.>.%+&+~+*+9+0+(.(.(.(.a+b+(.(.(.6+.+v.L.u.c+d+$+8+ ", -" _+7.p.P %+&+P.-.e+f+(.(.(.(.(.g+h+(.(.(.i+~+.+v.L.u.p.{+j+ ", -" k+>.L.w &+P.~+t.l+(.(.(.(.(.(.m+n+(.(.(.o+-.~+.+v.%+P {+3+ ", -" p+&+.+~+-.*+_+* q+(.(.r+'+r+s+t+u+v+w+(.x+y+z+*+-..+&+M.A+ ", -" (+*+*+t._+* B+& C+(.(.D+z E+F+G+H+I+J+(.D.K+L+=+_+*+*+&.M+ ", -" t.k+(+(+p+p+N+O+(.(.P+Q+R+S+T+@ T+G.(.(.U+V+= (+& k+W+X+ ", -" P.(+T+T+@ Y+Z+`+(.(. @.@+@@@% % % #@(.X.$@Y+@ T+T+_+%@ ", -" ~++ #+&@&@*@=@-@D.h.;@# # # # >@,@'@)@&@&@#+#+h !@ ", -" $+@ ~@~@~@{@{@]@^@/@(@{@{@{@{@_@:@<@[@{@~@~@~@p.}@ ", -" $+Y+|@1@|@1@1@2@3@4@1@1@1@5@6@7@1@1@1@1@=.(+8@ ", -" $+$ 9@0@0@9@9@a@b@9@9@9@9@9@9@0@0@0@0@c@d@ ", -" ^+B+9@O.O.O.O.O.O.O.O.O.O.O.O.O.|@*+e@ ", -" f@;.$ . . . . . . . . . . . g@h@A+ ", -" i@2+.+&@j@k@l@9@j@Y+&+N m@ ", -" n@o@p@q@6.r@N.i@s@X+ ", -" ", -" "}; diff --git a/debian/_base/core/tdebase/debian/control b/debian/_base/core/tdebase/debian/control index 6f2808d73..46af0db93 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 <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], libsensors-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, 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, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev +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], libsensors-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, 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, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-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..fb1838b85 100644 --- a/debian/_base/core/tdebase/debian/kcontrol-trinity.install +++ b/debian/_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/debian/_base/core/tdebase/debian/klipper-trinity.install b/debian/_base/core/tdebase/debian/klipper-trinity.install index 719b878c8..4231a3aae 100644 --- a/debian/_base/core/tdebase/debian/klipper-trinity.install +++ b/debian/_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/debian/_base/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules index e86e0401a..0a1bed051 100755 --- a/debian/_base/core/tdebase/debian/rules +++ b/debian/_base/core/tdebase/debian/rules @@ -64,7 +64,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_UPOWER="ON" \ -DWITH_LIBART="ON" \ -DWITH_LIBCONFIG="ON" \ - -DWITH_PCRE="ON" \ + -DWITH_PCRE2="ON" \ -DWITH_KRB5="ON" DEB_FIXPERMS_EXCLUDE := \ @@ -118,9 +118,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/debian/_base/core/tdebase/debian/tdebase-data-trinity.install b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install index 0ab9bc8a8..2ac5be87f 100644 --- a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/debian/_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/debian/_base/core/tdebase/debian/twin-trinity.install b/debian/_base/core/tdebase/debian/twin-trinity.install index 52c59c4a7..f9b6061d4 100644 --- a/debian/_base/core/tdebase/debian/twin-trinity.install +++ b/debian/_base/core/tdebase/debian/twin-trinity.install @@ -74,19 +74,7 @@ debian/tmp/opt/trinity/share/apps/twin/eventsrc debian/tmp/opt/trinity/share/apps/twin/keramik.desktop debian/tmp/opt/trinity/share/apps/twin/laptop.desktop debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop -debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png -debian/tmp/opt/trinity/share/apps/twin/pics/close.png -debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png -debian/tmp/opt/trinity/share/apps/twin/pics/fog.png -debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png -debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png -debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png -debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png -debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png -debian/tmp/opt/trinity/share/apps/twin/pics/menu.png -debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png -debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png -debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png +debian/tmp/opt/trinity/share/apps/twin/pics/* debian/tmp/opt/trinity/share/apps/twin/plastik.desktop debian/tmp/opt/trinity/share/apps/twin/quartz.desktop debian/tmp/opt/trinity/share/apps/twin/redmond.desktop diff --git a/debian/_base/core/tdebase/debian/usermap.pl b/debian/_base/core/tdebase/debian/usermap.pl index 9c8c61f26..bd87e2d72 100644 --- a/debian/_base/core/tdebase/debian/usermap.pl +++ b/debian/_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/debian/_base/core/tdelibs/debian/control b/debian/_base/core/tdelibs/debian/control index 5dcd2a7f0..1ffbf9cca 100644 --- a/debian/_base/core/tdelibs/debian/control +++ b/debian/_base/core/tdelibs/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutil aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, - libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, + libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev, libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, @@ -103,7 +103,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, - libopenexr-dev (>= 1.2.2-3), libpcre3-dev, + libopenexr-dev (>= 1.2.2-3), libpcre2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, libsasl2-dev, libxcomposite-dev, libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev, diff --git a/debian/_base/dependencies/pytqt/debian/rules b/debian/_base/dependencies/pytqt/debian/rules index 532bf34bd..0da3e5231 100755 --- a/debian/_base/dependencies/pytqt/debian/rules +++ b/debian/_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/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules index 7050c5431..c5f7ea68d 100755 --- a/debian/_base/dependencies/sip4-tqt/debian/rules +++ b/debian/_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/debian/_base/dependencies/tqt3/debian/control b/debian/_base/dependencies/tqt3/debian/control index 36266f44e..a0f53d3a9 100644 --- a/debian/_base/dependencies/tqt3/debian/control +++ b/debian/_base/dependencies/tqt3/debian/control @@ -2,7 +2,7 @@ Source: tqt-x11-free 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>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libnsl-dev | libc6-dev (<<2.32~), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install index 9cd19fa94..b22eb1913 100644 --- a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -1,34 +1,33 @@ usr/include/tqt3/private/* -usr/include/tqt3/ntqabstractlayout.h -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 usr/include/tqt3/tqbrush.h usr/include/tqt3/tqbuffer.h -usr/include/tqt3/ntqbutton.h -usr/include/tqt3/ntqbuttongroup.h +usr/include/tqt3/tqbutton.h +usr/include/tqt3/tqbuttongroup.h usr/include/tqt3/tqcache.h usr/include/tqt3/tqcanvas.h -usr/include/tqt3/ntqcdestyle.h -usr/include/tqt3/ntqcheckbox.h -usr/include/tqt3/ntqcleanuphandler.h +usr/include/tqt3/tqcdestyle.h +usr/include/tqt3/tqcheckbox.h +usr/include/tqt3/tqcleanuphandler.h usr/include/tqt3/tqclipboard.h usr/include/tqt3/tqcolor.h usr/include/tqt3/tqcolordialog.h -usr/include/tqt3/ntqcombobox.h -usr/include/tqt3/ntqcommonstyle.h -usr/include/tqt3/ntqcompactstyle.h -usr/include/tqt3/ntqconnection.h +usr/include/tqt3/tqcombobox.h +usr/include/tqt3/tqcommonstyle.h +usr/include/tqt3/tqcompactstyle.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 @@ -36,102 +35,101 @@ usr/include/tqt3/tqdataview.h usr/include/tqt3/tqdatetime.h usr/include/tqt3/tqdatetimeedit.h usr/include/tqt3/tqdeepcopy.h -usr/include/tqt3/ntqdesktopwidget.h -usr/include/tqt3/ntqdial.h -usr/include/tqt3/ntqdialog.h +usr/include/tqt3/tqdesktopwidget.h +usr/include/tqt3/tqdial.h +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/ntqevent.h -usr/include/tqt3/ntqeventloop.h -usr/include/tqt3/ntqfeatures.h +usr/include/tqt3/tqevent.h +usr/include/tqt3/tqeventloop.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 usr/include/tqt3/tqfontinfo.h usr/include/tqt3/tqfontmetrics.h -usr/include/tqt3/ntqframe.h +usr/include/tqt3/tqframe.h usr/include/tqt3/tqftp.h -usr/include/tqt3/ntqgarray.h +usr/include/tqt3/tqgarray.h usr/include/tqt3/tqgb18030codec.h usr/include/tqt3/tqgbkcodec.h -usr/include/tqt3/ntqgcache.h -usr/include/tqt3/ntqgdict.h -usr/include/tqt3/ntqgeneric.h -usr/include/tqt3/ntqgif.h -usr/include/tqt3/ntqglist.h -usr/include/tqt3/ntqglobal.h -usr/include/tqt3/ntqgplugin.h -usr/include/tqt3/ntqgrid.h -usr/include/tqt3/ntqgridview.h -usr/include/tqt3/ntqgroupbox.h -usr/include/tqt3/ntqguardedptr.h -usr/include/tqt3/ntqgvector.h -usr/include/tqt3/ntqhbox.h -usr/include/tqt3/ntqhbuttongroup.h -usr/include/tqt3/ntqheader.h +usr/include/tqt3/tqgcache.h +usr/include/tqt3/tqgdict.h +usr/include/tqt3/tqgif.h +usr/include/tqt3/tqglist.h +usr/include/tqt3/tqglobal.h +usr/include/tqt3/tqgplugin.h +usr/include/tqt3/tqgrid.h +usr/include/tqt3/tqgridview.h +usr/include/tqt3/tqgroupbox.h +usr/include/tqt3/tqguardedptr.h +usr/include/tqt3/tqgvector.h +usr/include/tqt3/tqhbox.h +usr/include/tqt3/tqhbuttongroup.h +usr/include/tqt3/tqheader.h usr/include/tqt3/tqhebrewcodec.h -usr/include/tqt3/ntqhgroupbox.h +usr/include/tqt3/tqhgroupbox.h usr/include/tqt3/tqhostaddress.h usr/include/tqt3/tqhttp.h 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/ntqinterlacestyle.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/ntqlabel.h -usr/include/tqt3/ntqlayout.h -usr/include/tqt3/ntqlcdnumber.h -usr/include/tqt3/ntqlibrary.h -usr/include/tqt3/ntqlineedit.h -usr/include/tqt3/ntqlistbox.h -usr/include/tqt3/ntqlistview.h -usr/include/tqt3/ntqlocale.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/tqlibrary.h +usr/include/tqt3/tqlineedit.h +usr/include/tqt3/tqlistbox.h +usr/include/tqt3/tqlistview.h +usr/include/tqt3/tqlocale.h usr/include/tqt3/tqlocalfs.h usr/include/tqt3/tqmainwindow.h 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/ntqmotifstyle.h -usr/include/tqt3/ntqmotifplusstyle.h +usr/include/tqt3/tqmngio.h +usr/include/tqt3/tqmotifstyle.h +usr/include/tqt3/tqmotifplusstyle.h usr/include/tqt3/tqmovie.h -usr/include/tqt3/ntqmultilineedit.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 @@ -146,53 +144,53 @@ usr/include/tqt3/tqpen.h usr/include/tqt3/tqpicture.h usr/include/tqt3/tqpixmap.h usr/include/tqt3/tqpixmapcache.h -usr/include/tqt3/ntqplatinumstyle.h +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/ntqprogressbar.h -usr/include/tqt3/ntqprogressdialog.h +usr/include/tqt3/tqprogressbar.h +usr/include/tqt3/tqprogressdialog.h usr/include/tqt3/tqptrcollection.h usr/include/tqt3/tqptrdict.h usr/include/tqt3/tqptrlist.h usr/include/tqt3/tqptrqueue.h usr/include/tqt3/tqptrstack.h usr/include/tqt3/tqptrvector.h -usr/include/tqt3/ntqpushbutton.h -usr/include/tqt3/ntqradiobutton.h -usr/include/tqt3/ntqrangecontrol.h +usr/include/tqt3/tqpushbutton.h +usr/include/tqt3/tqradiobutton.h +usr/include/tqt3/tqrangecontrol.h usr/include/tqt3/tqrect.h usr/include/tqt3/tqregexp.h usr/include/tqt3/tqregion.h -usr/include/tqt3/ntqscrollbar.h -usr/include/tqt3/ntqscrollview.h +usr/include/tqt3/tqscrollbar.h +usr/include/tqt3/tqscrollview.h usr/include/tqt3/tqsemaphore.h usr/include/tqt3/tqserversocket.h usr/include/tqt3/tqsessionmanager.h usr/include/tqt3/tqsettings.h -usr/include/tqt3/ntqsgistyle.h -usr/include/tqt3/ntqshared.h +usr/include/tqt3/tqsgistyle.h +usr/include/tqt3/tqshared.h usr/include/tqt3/tqsignal.h usr/include/tqt3/tqsignalmapper.h usr/include/tqt3/tqsignalslotimp.h -usr/include/tqt3/ntqsimplerichtext.h +usr/include/tqt3/tqsimplerichtext.h usr/include/tqt3/tqsize.h usr/include/tqt3/tqsizegrip.h usr/include/tqt3/tqsizepolicy.h usr/include/tqt3/tqsjiscodec.h -usr/include/tqt3/ntqslider.h +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/ntqspinbox.h -usr/include/tqt3/ntqsplashscreen.h -usr/include/tqt3/ntqsplitter.h +usr/include/tqt3/tqsound.h +usr/include/tqt3/tqspinbox.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 @@ -217,13 +215,13 @@ usr/include/tqt3/tqstyle.h usr/include/tqt3/tqstylefactory.h usr/include/tqt3/tqstyleplugin.h usr/include/tqt3/tqstylesheet.h -usr/include/tqt3/ntqsyntaxhighlighter.h -usr/include/tqt3/ntqt.h +usr/include/tqt3/tqsyntaxhighlighter.h +usr/include/tqt3/tqt3.h usr/include/tqt3/tqt.h -usr/include/tqt3/ntqtabbar.h -usr/include/tqt3/ntqtabdialog.h -usr/include/tqt3/ntqtable.h -usr/include/tqt3/ntqtabwidget.h +usr/include/tqt3/tqtabbar.h +usr/include/tqt3/tqtabdialog.h +usr/include/tqt3/tqtable.h +usr/include/tqt3/tqtabwidget.h usr/include/tqt3/tqtextbrowser.h usr/include/tqt3/tqtextcodec.h usr/include/tqt3/tqtextcodecfactory.h @@ -234,37 +232,37 @@ 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 usr/include/tqt3/tqtooltip.h -usr/include/tqt3/ntqtranslator.h +usr/include/tqt3/tqtranslator.h usr/include/tqt3/tqtsciicodec.h 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/ntqvbox.h -usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvgroupbox.h +usr/include/tqt3/tqvariant.h +usr/include/tqt3/tqvbox.h +usr/include/tqt3/tqvbuttongroup.h +usr/include/tqt3/tqvgroupbox.h usr/include/tqt3/tqwaitcondition.h -usr/include/tqt3/ntqwhatsthis.h +usr/include/tqt3/tqwhatsthis.h usr/include/tqt3/tqwidget.h 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/ntqwindowsstyle.h -usr/include/tqt3/ntqwinexport.h -usr/include/tqt3/ntqwizard.h +usr/include/tqt3/tqwindowdefs.h +usr/include/tqt3/tqwindowsstyle.h +usr/include/tqt3/tqwinexport.h +usr/include/tqt3/tqwizard.h usr/include/tqt3/tqwmatrix.h usr/include/tqt3/tqworkspace.h usr/include/tqt3/tqxml.h diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.install b/debian/_base/dependencies/tqt3/debian/libtqt3-mt.install index 33303e90c..023c39399 100644 --- a/debian/_base/dependencies/tqt3/debian/libtqt3-mt.install +++ b/debian/_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/debian/_base/dependencies/tqt3/debian/qt_plugins_3.3rc b/debian/_base/dependencies/tqt3/debian/qt_plugins_3.3rc index e193b495c..6a411f315 100644 --- a/debian/_base/dependencies/tqt3/debian/qt_plugins_3.3rc +++ b/debian/_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/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install index 43dc0a94a..d3cfad18a 100644 --- a/debian/_base/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/debian/_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 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/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"; diff --git a/dilos/core/tdelibs/debian/control b/dilos/core/tdelibs/debian/control index 801872966..b1c9fac95 100644 --- a/dilos/core/tdelibs/debian/control +++ b/dilos/core/tdelibs/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutil aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, - libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, + libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev, libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, @@ -104,7 +104,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev [!solaris-any], libattr1-dev [!solaris-any], libaspell-dev, hspell, libbz2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, - libopenexr-dev (>= 1.2.2-3), libpcre3-dev, + libopenexr-dev (>= 1.2.2-3), libpcre2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, libsasl2-dev, libxcomposite-dev, libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev, diff --git a/dilos/dependencies/pytqt/debian/rules b/dilos/dependencies/pytqt/debian/rules index d7427e40a..d0f0a6a28 100755 --- a/dilos/dependencies/pytqt/debian/rules +++ b/dilos/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/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules index 9f54ca009..cb02fe737 100755 --- a/dilos/dependencies/sip4-tqt/debian/rules +++ b/dilos/dependencies/sip4-tqt/debian/rules @@ -165,4 +165,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/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt3/debian/control index 7f7d5ac62..3a8df8929 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/dependencies/tqt3/debian/control @@ -2,7 +2,7 @@ Source: tqt-x11-free 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>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libnsl-dev | libc6-dev (<<2.32~), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, diff --git a/dilos/dependencies/tqt3/debian/libtqt3-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-headers.install index 9cd19fa94..b22eb1913 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-headers.install +++ b/dilos/dependencies/tqt3/debian/libtqt3-headers.install @@ -1,34 +1,33 @@ usr/include/tqt3/private/* -usr/include/tqt3/ntqabstractlayout.h -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 usr/include/tqt3/tqbrush.h usr/include/tqt3/tqbuffer.h -usr/include/tqt3/ntqbutton.h -usr/include/tqt3/ntqbuttongroup.h +usr/include/tqt3/tqbutton.h +usr/include/tqt3/tqbuttongroup.h usr/include/tqt3/tqcache.h usr/include/tqt3/tqcanvas.h -usr/include/tqt3/ntqcdestyle.h -usr/include/tqt3/ntqcheckbox.h -usr/include/tqt3/ntqcleanuphandler.h +usr/include/tqt3/tqcdestyle.h +usr/include/tqt3/tqcheckbox.h +usr/include/tqt3/tqcleanuphandler.h usr/include/tqt3/tqclipboard.h usr/include/tqt3/tqcolor.h usr/include/tqt3/tqcolordialog.h -usr/include/tqt3/ntqcombobox.h -usr/include/tqt3/ntqcommonstyle.h -usr/include/tqt3/ntqcompactstyle.h -usr/include/tqt3/ntqconnection.h +usr/include/tqt3/tqcombobox.h +usr/include/tqt3/tqcommonstyle.h +usr/include/tqt3/tqcompactstyle.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 @@ -36,102 +35,101 @@ usr/include/tqt3/tqdataview.h usr/include/tqt3/tqdatetime.h usr/include/tqt3/tqdatetimeedit.h usr/include/tqt3/tqdeepcopy.h -usr/include/tqt3/ntqdesktopwidget.h -usr/include/tqt3/ntqdial.h -usr/include/tqt3/ntqdialog.h +usr/include/tqt3/tqdesktopwidget.h +usr/include/tqt3/tqdial.h +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/ntqevent.h -usr/include/tqt3/ntqeventloop.h -usr/include/tqt3/ntqfeatures.h +usr/include/tqt3/tqevent.h +usr/include/tqt3/tqeventloop.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 usr/include/tqt3/tqfontinfo.h usr/include/tqt3/tqfontmetrics.h -usr/include/tqt3/ntqframe.h +usr/include/tqt3/tqframe.h usr/include/tqt3/tqftp.h -usr/include/tqt3/ntqgarray.h +usr/include/tqt3/tqgarray.h usr/include/tqt3/tqgb18030codec.h usr/include/tqt3/tqgbkcodec.h -usr/include/tqt3/ntqgcache.h -usr/include/tqt3/ntqgdict.h -usr/include/tqt3/ntqgeneric.h -usr/include/tqt3/ntqgif.h -usr/include/tqt3/ntqglist.h -usr/include/tqt3/ntqglobal.h -usr/include/tqt3/ntqgplugin.h -usr/include/tqt3/ntqgrid.h -usr/include/tqt3/ntqgridview.h -usr/include/tqt3/ntqgroupbox.h -usr/include/tqt3/ntqguardedptr.h -usr/include/tqt3/ntqgvector.h -usr/include/tqt3/ntqhbox.h -usr/include/tqt3/ntqhbuttongroup.h -usr/include/tqt3/ntqheader.h +usr/include/tqt3/tqgcache.h +usr/include/tqt3/tqgdict.h +usr/include/tqt3/tqgif.h +usr/include/tqt3/tqglist.h +usr/include/tqt3/tqglobal.h +usr/include/tqt3/tqgplugin.h +usr/include/tqt3/tqgrid.h +usr/include/tqt3/tqgridview.h +usr/include/tqt3/tqgroupbox.h +usr/include/tqt3/tqguardedptr.h +usr/include/tqt3/tqgvector.h +usr/include/tqt3/tqhbox.h +usr/include/tqt3/tqhbuttongroup.h +usr/include/tqt3/tqheader.h usr/include/tqt3/tqhebrewcodec.h -usr/include/tqt3/ntqhgroupbox.h +usr/include/tqt3/tqhgroupbox.h usr/include/tqt3/tqhostaddress.h usr/include/tqt3/tqhttp.h 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/ntqinterlacestyle.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/ntqlabel.h -usr/include/tqt3/ntqlayout.h -usr/include/tqt3/ntqlcdnumber.h -usr/include/tqt3/ntqlibrary.h -usr/include/tqt3/ntqlineedit.h -usr/include/tqt3/ntqlistbox.h -usr/include/tqt3/ntqlistview.h -usr/include/tqt3/ntqlocale.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/tqlibrary.h +usr/include/tqt3/tqlineedit.h +usr/include/tqt3/tqlistbox.h +usr/include/tqt3/tqlistview.h +usr/include/tqt3/tqlocale.h usr/include/tqt3/tqlocalfs.h usr/include/tqt3/tqmainwindow.h 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/ntqmotifstyle.h -usr/include/tqt3/ntqmotifplusstyle.h +usr/include/tqt3/tqmngio.h +usr/include/tqt3/tqmotifstyle.h +usr/include/tqt3/tqmotifplusstyle.h usr/include/tqt3/tqmovie.h -usr/include/tqt3/ntqmultilineedit.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 @@ -146,53 +144,53 @@ usr/include/tqt3/tqpen.h usr/include/tqt3/tqpicture.h usr/include/tqt3/tqpixmap.h usr/include/tqt3/tqpixmapcache.h -usr/include/tqt3/ntqplatinumstyle.h +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/ntqprogressbar.h -usr/include/tqt3/ntqprogressdialog.h +usr/include/tqt3/tqprogressbar.h +usr/include/tqt3/tqprogressdialog.h usr/include/tqt3/tqptrcollection.h usr/include/tqt3/tqptrdict.h usr/include/tqt3/tqptrlist.h usr/include/tqt3/tqptrqueue.h usr/include/tqt3/tqptrstack.h usr/include/tqt3/tqptrvector.h -usr/include/tqt3/ntqpushbutton.h -usr/include/tqt3/ntqradiobutton.h -usr/include/tqt3/ntqrangecontrol.h +usr/include/tqt3/tqpushbutton.h +usr/include/tqt3/tqradiobutton.h +usr/include/tqt3/tqrangecontrol.h usr/include/tqt3/tqrect.h usr/include/tqt3/tqregexp.h usr/include/tqt3/tqregion.h -usr/include/tqt3/ntqscrollbar.h -usr/include/tqt3/ntqscrollview.h +usr/include/tqt3/tqscrollbar.h +usr/include/tqt3/tqscrollview.h usr/include/tqt3/tqsemaphore.h usr/include/tqt3/tqserversocket.h usr/include/tqt3/tqsessionmanager.h usr/include/tqt3/tqsettings.h -usr/include/tqt3/ntqsgistyle.h -usr/include/tqt3/ntqshared.h +usr/include/tqt3/tqsgistyle.h +usr/include/tqt3/tqshared.h usr/include/tqt3/tqsignal.h usr/include/tqt3/tqsignalmapper.h usr/include/tqt3/tqsignalslotimp.h -usr/include/tqt3/ntqsimplerichtext.h +usr/include/tqt3/tqsimplerichtext.h usr/include/tqt3/tqsize.h usr/include/tqt3/tqsizegrip.h usr/include/tqt3/tqsizepolicy.h usr/include/tqt3/tqsjiscodec.h -usr/include/tqt3/ntqslider.h +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/ntqspinbox.h -usr/include/tqt3/ntqsplashscreen.h -usr/include/tqt3/ntqsplitter.h +usr/include/tqt3/tqsound.h +usr/include/tqt3/tqspinbox.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 @@ -217,13 +215,13 @@ usr/include/tqt3/tqstyle.h usr/include/tqt3/tqstylefactory.h usr/include/tqt3/tqstyleplugin.h usr/include/tqt3/tqstylesheet.h -usr/include/tqt3/ntqsyntaxhighlighter.h -usr/include/tqt3/ntqt.h +usr/include/tqt3/tqsyntaxhighlighter.h +usr/include/tqt3/tqt3.h usr/include/tqt3/tqt.h -usr/include/tqt3/ntqtabbar.h -usr/include/tqt3/ntqtabdialog.h -usr/include/tqt3/ntqtable.h -usr/include/tqt3/ntqtabwidget.h +usr/include/tqt3/tqtabbar.h +usr/include/tqt3/tqtabdialog.h +usr/include/tqt3/tqtable.h +usr/include/tqt3/tqtabwidget.h usr/include/tqt3/tqtextbrowser.h usr/include/tqt3/tqtextcodec.h usr/include/tqt3/tqtextcodecfactory.h @@ -234,37 +232,37 @@ 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 usr/include/tqt3/tqtooltip.h -usr/include/tqt3/ntqtranslator.h +usr/include/tqt3/tqtranslator.h usr/include/tqt3/tqtsciicodec.h 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/ntqvbox.h -usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvgroupbox.h +usr/include/tqt3/tqvariant.h +usr/include/tqt3/tqvbox.h +usr/include/tqt3/tqvbuttongroup.h +usr/include/tqt3/tqvgroupbox.h usr/include/tqt3/tqwaitcondition.h -usr/include/tqt3/ntqwhatsthis.h +usr/include/tqt3/tqwhatsthis.h usr/include/tqt3/tqwidget.h 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/ntqwindowsstyle.h -usr/include/tqt3/ntqwinexport.h -usr/include/tqt3/ntqwizard.h +usr/include/tqt3/tqwindowdefs.h +usr/include/tqt3/tqwindowsstyle.h +usr/include/tqt3/tqwinexport.h +usr/include/tqt3/tqwizard.h usr/include/tqt3/tqwmatrix.h usr/include/tqt3/tqworkspace.h usr/include/tqt3/tqxml.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt.install b/dilos/dependencies/tqt3/debian/libtqt3-mt.install index 33303e90c..023c39399 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt.install +++ b/dilos/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/dilos/dependencies/tqt3/debian/qt_plugins_3.3rc b/dilos/dependencies/tqt3/debian/qt_plugins_3.3rc index e193b495c..6a411f315 100644 --- a/dilos/dependencies/tqt3/debian/qt_plugins_3.3rc +++ b/dilos/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/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install index 43dc0a94a..d3cfad18a 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/dilos/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 diff --git a/gentoo b/gentoo -Subproject 8502df8b834b6502e239634a06b770d1dd02804 +Subproject f6cde938ec54e82251e2f026e57157ddb8e2204 diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control index b19611be8..f999b4929 100644 --- a/ubuntu/_base/applications/internet/ktorrent/debian/control +++ b/ubuntu/_base/applications/internet/ktorrent/debian/control @@ -2,7 +2,7 @@ Source: ktorrent-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/control b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control index 3ffd947d0..cd9f85394 100644 --- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/control +++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/control @@ -10,6 +10,7 @@ Standards-Version: 4.7.0 Package: tde-ebook-reader Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: sensible-utils, Description: e-book reader for TDE @@ -33,6 +34,7 @@ Description: e-book reader for TDE Package: libzlcore-tqt Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-data-tqt Description: ZLibrary TQt3-based development library (shared library) This is the core of ZLibrary, the library that tde-ebook-reader is based on. @@ -40,6 +42,7 @@ Description: ZLibrary TQt3-based development library (shared library) Package: libzlcore-data-tqt Section: libs Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, Description: ZLibrary TQt3-based development library (support files) This package contains the support files for the core of ZLibrary, the library @@ -48,6 +51,7 @@ Description: ZLibrary TQt3-based development library (support files) Package: libzltext-tqt Section: libs Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt, libzltext-data-tqt Description: ZLibrary TQt3-based text model/viewer part (shared library) This package provides text model/viewer part of ZLibrary. @@ -55,6 +59,7 @@ Description: ZLibrary TQt3-based text model/viewer part (shared library) Package: libzltext-data-tqt Section: libs Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, Description: ZLibrary TQt3-based text model/viewer part (support files) This package contains the support files for the text model/viewer part @@ -63,6 +68,7 @@ Description: ZLibrary TQt3-based text model/viewer part (support files) Package: libzlcore-tqt-dev Section: libdevel Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, libzlcore-tqt Description: ZLibrary TQt3-based development library (development files) This package contains development files for the ZLibrary core. @@ -70,6 +76,7 @@ Description: ZLibrary TQt3-based development library (development files) Package: libzltext-tqt-dev Section: libdevel Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, libzltext-tqt Description: ZLibrary TQt3-based text model/viewer part (development files) This package contains development files for the ZLibrary text model/viewer diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install index 4b2f1a823..4f30f38c6 100644 --- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install +++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt-dev.install @@ -1,2 +1,2 @@ /usr/include/zlibrary-tqt/core -/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install index f13e427b0..3a6addd23 100644 --- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install +++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzlcore-tqt.install @@ -1 +1 @@ -/usr/lib/x86_64-linux-gnu/libzlcore-tqt.so.* +/usr/lib/$(DEB_HOST_MULTIARCH)/libzlcore-tqt.so.* diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install index eda8a3beb..95be86c20 100644 --- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install +++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt-dev.install @@ -1,2 +1,2 @@ /usr/include/zlibrary-tqt/text -/usr/lib/x86_64-linux-gnu/libzltext-tqt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so diff --git a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install index 5d79675c1..3faed63a9 100644 --- a/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install +++ b/ubuntu/_base/applications/office/tde-ebook-reader/debian/libzltext-tqt.install @@ -1 +1 @@ -/usr/lib/x86_64-linux-gnu/libzltext-tqt.so.* +/usr/lib/$(DEB_HOST_MULTIARCH)/libzltext-tqt.so.* diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs deleted file mode 100644 index f0312285e..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -opt/trinity/bin -opt/trinity/share/doc/tde/HTML/en diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install deleted file mode 100644 index 311ed806e..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/install +++ /dev/null @@ -1,2 +0,0 @@ -debian/kmyfirewall.xpm opt/trinity/share/pixmaps -debian/kmyfirewall-trinity/opt/trinity/share/man/man1/* diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop deleted file mode 100644 index 3a562e7c0..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop +++ /dev/null @@ -1,44 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=ServiceType -X-TDE-ServiceType=KMyFirewall/Installer -X-TDE-Library=libkmfinstallerplugin - -Name=KMyFirewall Installer Plugin -Name[bg]=Приставка-инсталатор на KMyFirewall -Name[br]=Lugent stalier KMyFirewall -Name[bs]=KMyFirewall dodatak za instalaciju -Name[ca]=Connector d'instal·lació per a KMyFirewall -Name[cs]=Modul instalátoru KMyFirewall -Name[de]=KMyFirewall Installationsprogramm -Name[el]=Πρόσθετο εγκατάστασης για το KMyFirewall -Name[es]=Complemento de instalación de KMyFirewall -Name[et]=KMyFirewalli paigaldamisplugin -Name[fr]=Module d'installation de KMyFirewall -Name[gl]=Extensión de Instalazón de KMyFirewall -Name[hi]=के-माइ-फायरवाल संस्थापक प्लगइन -Name[hu]=KMyFirewall telepítőmodul -Name[it]=Plugin di installazione di KMyFirewall -Name[ja]=KMyFirewall インストーラ プラグイン -Name[ka]=KMyFirewall დაყენების მოდული -Name[nl]=KMyFirewall Installatieplugin -Name[pa]=KMyFirewall ਇੰਸਟਾਲਰ ਪਲੱਗਿੰਨ -Name[pl]=Wtyczka instalatora KMyFirewall -Name[pt]='Plugin' de Instalação do KMyFirewall -Name[pt_BR]=Plug-in Instaldor par ao KMyFirewall -Name[ru]=KMyFirewall - Модуль установки -Name[sr]=KMyFirewall-ов прикључак за инсталирање -Name[sr@Latn]=KMyFirewall-ov priključak za instaliranje -Name[sv]=Installationsdel för Min brandvägg -Name[ta]=KMyதீச்சுவர் நிறுவுபவரைச் சொருகு -Name[tr]=KMyFirewall Kurulum Eklentisi -Name[uk]=Втулок встановлення KMyFirewall -Name[xx]=xxKMyFirewall Installer Pluginxx -Name[zh_CN]=KMyFirewall 安装程序插件 - -[PropertyDef::X-KMyFirewall-Platform] -Type=TQString - -[PropertyDef::X-KMyFirewall-Language] -Type=TQString - diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop deleted file mode 100644 index 57f12ad9c..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop +++ /dev/null @@ -1,35 +0,0 @@ -[Desktop Entry] -Type=Application -MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet; -Icon=kmyfirewall -Exec=/opt/trinity/bin/kmyfirewall %u -Terminal=false -Categories=Qt;TDE;System; -Name=KMyFirewall -Name[sv]=Min brandvägg -Name[xx]=xxKMyFirewallxx -GenericName=Firewall Configuration Tool -GenericName[bg]=Настройване на защитна стена -GenericName[es]=Herramienta de configuración de cortafuegos -GenericName[et]=Tulemüüri seadistamistööriist -GenericName[it]=Strumento di configurazione di KMyFirewall -GenericName[nl]=Firewall-configuratieprogramma -GenericName[pt]=Ferramenta de Configuração da Firewall -GenericName[pt_BR]=Ferramenta de Configuração da Firewall -GenericName[sr]=Алат за подешавање заштитног зида -GenericName[sr@Latn]=Алат за подешавање заштитног зида -GenericName[sv]=Verktyg för brandväggsinställning -GenericName[xx]=xxFirewall Configuration Toolxx -Comment=Firewall Configuration Tool -Comment[bg]=Настройване на KMyFirewall -Comment[es]=Herramienta de configuración de cortafuegos -Comment[et]=Tulemüüri seadistamistööriist -Comment[it]=Strumento di configurazione di KMyFirewall -Comment[ms]=Alatan Tetapan Firewall -Comment[nl]=Firewall-configuratieprogramma -Comment[pt]=Ferramenta de Configuração da Firewall -Comment[pt_BR]=Ferramenta de Configuração da Firewall -Comment[sr]=Алат за подешавање заштитног зида -Comment[sr@Latn]=Алат за подешавање заштитног зида -Comment[sv]=Verktyg för inställning av brandvägg -Comment[xx]=xxFirewall Configuration Toolxx diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm deleted file mode 100644 index 3d58b81ff..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm +++ /dev/null @@ -1,369 +0,0 @@ -/* XPM */ -static char * kmyfirewall_xpm[] = { -"32 32 334 2", -" c None", -". c #FE0000", -"+ c #E60000", -"@ c #E10000", -"# c #EA0000", -"$ c #EF0000", -"% c #E40000", -"& c #DA0000", -"* c #D70000", -"= c #DC0000", -"- c #F50F0F", -"; c #F02525", -"> c #EE4949", -", c #EB6C6C", -"' c #F89999", -") c #FBAFAF", -"! c #FDC4C4", -"~ c #FDCACA", -"{ c #FCC2C2", -"] c #FBB2B2", -"^ c #F59494", -"/ c #E87272", -"( c #DD4343", -"_ c #D42929", -": c #EF0808", -"< c #ED5858", -"[ c #F29191", -"} c #F7BCBC", -"| c #FBC8C8", -"1 c #FCCCCC", -"2 c #FDCCCC", -"3 c #FECCCC", -"4 c #FBC9C9", -"5 c #F6B7B7", -"6 c #ED9999", -"7 c #D54D4D", -"8 c #BF1313", -"9 c #E82525", -"0 c #EB7F7F", -"a c #F8CCCC", -"b c #FACCCC", -"c c #FBCCCC", -"d c #F9CCCC", -"e c #F6C6C6", -"f c #E58E8E", -"g c #B91A1A", -"h c #DE0000", -"i c #E46969", -"j c #F4BEBE", -"k c #F8C9C9", -"l c #F9C9C9", -"m c #FAC9C9", -"n c #FCC9C9", -"o c #FDC9C9", -"p c #FECBCB", -"q c #FECFCF", -"r c #FEC9C9", -"s c #F7C9C9", -"t c #F5C5C5", -"u c #D55C5C", -"v c #AF0A0A", -"w c #CC0000", -"x c #EEA4A4", -"y c #F3B5B5", -"z c #F5B5B5", -"A c #F7B5B5", -"B c #F9B5B5", -"C c #FAB5B5", -"D c #FBB5B5", -"E c #FCB5B5", -"F c #FDC3C3", -"G c #FFF1F1", -"H c #FDB9B9", -"I c #F6B5B5", -"J c #F4B5B5", -"K c #F2B5B5", -"L c #E88B8B", -"M c #C81818", -"N c #9E0000", -"O c #EE0000", -"P c #C90000", -"Q c #EB9393", -"R c #F0A2A2", -"S c #F2A2A2", -"T c #F4A2A2", -"U c #F6A2A2", -"V c #F7A2A2", -"W c #F9A2A2", -"X c #FAA2A2", -"Y c #FCBDBD", -"Z c #FFF5F5", -"` c #FCB3B3", -" . c #F8A2A2", -".. c #F5A2A2", -"+. c #F3A2A2", -"@. c #F1A2A2", -"#. c #EFA2A2", -"$. c #E57D7D", -"%. c #CC1616", -"&. c #B00000", -"*. c #8F0000", -"=. c #F20000", -"-. c #D20000", -";. c #C30000", -">. c #C80000", -",. c #DC4747", -"'. c #E97C7C", -"). c #ED8282", -"!. c #EF8282", -"~. c #F28282", -"{. c #F48282", -"]. c #F68888", -"^. c #F9A6A6", -"/. c #FDD9D9", -"(. c #FFFFFF", -"_. c #FDE4E4", -":. c #F89898", -"<. c #F48484", -"[. c #F38282", -"}. c #F08282", -"|. c #EE8282", -"1. c #EC8282", -"2. c #E97F7F", -"3. c #D83E3E", -"4. c #C80505", -"5. c #BD0000", -"6. c #A20000", -"7. c #C50000", -"8. c #D11111", -"9. c #DE4343", -"0. c #E86969", -"a. c #EB6969", -"b. c #EE6969", -"c. c #F06969", -"d. c #F37878", -"e. c #FBCECE", -"f. c #FFF7F7", -"g. c #FEF2F2", -"h. c #F69999", -"i. c #F59999", -"j. c #EF7070", -"k. c #EC6969", -"l. c #EA6969", -"m. c #E66666", -"n. c #DF4B4B", -"o. c #CD0B0B", -"p. c #C60000", -"q. c #BF0000", -"r. c #B40000", -"s. c #7C0000", -"t. c #D40000", -"u. c #C70000", -"v. c #CD0000", -"w. c #D20101", -"x. c #DB1E1E", -"y. c #E13535", -"z. c #E74343", -"A. c #E94646", -"B. c #F06C6C", -"C. c #FCE4E4", -"D. c #FFFCFC", -"E. c #FACECE", -"F. c #FAD8D8", -"G. c #EC6363", -"H. c #E54141", -"I. c #E13838", -"J. c #D81A1A", -"K. c #D00404", -"L. c #CA0000", -"M. c #BB0000", -"N. c #940000", -"O. c #FD0000", -"P. c #D00000", -"Q. c #D50202", -"R. c #D90808", -"S. c #DF1414", -"T. c #E21D1D", -"U. c #EA4F4F", -"V. c #FBDCDC", -"W. c #FFFEFE", -"X. c #FDEFEF", -"Y. c #EC7171", -"Z. c #DD1212", -"`. c #D90909", -" + c #D30101", -".+ c #CF0000", -"++ c #A10000", -"@+ c #6C0000", -"#+ c #E70000", -"$+ c #BE0000", -"%+ c #CB0000", -"&+ c #CE0000", -"*+ c #D30000", -"=+ c #D60000", -"-+ c #DC1010", -";+ c #EA6565", -">+ c #E53B3B", -",+ c #F8C7C7", -"'+ c #FCEBEB", -")+ c #DA1111", -"!+ c #D50303", -"~+ c #D10000", -"{+ c #C00000", -"]+ c #BC0000", -"^+ c #AD0000", -"/+ c #7B0000", -"(+ c #DB0000", -"_+ c #D50000", -":+ c #DD2828", -"<+ c #F7CACA", -"[+ c #F6BCBC", -"}+ c #E45656", -"|+ c #E04545", -"1+ c #C10000", -"2+ c #B30000", -"3+ c #810000", -"4+ c #E25050", -"5+ c #FBE7E7", -"6+ c #F9DFDF", -"7+ c #BA0000", -"8+ c #840000", -"9+ c #E76A6A", -"0+ c #FDF4F4", -"a+ c #FEFAFA", -"b+ c #FEF8F8", -"c+ c #C40000", -"d+ c #C20000", -"e+ c #E66B6B", -"f+ c #FDF3F3", -"g+ c #F2A7A7", -"h+ c #EA7777", -"i+ c #F5C7C7", -"j+ c #830000", -"k+ c #D90000", -"l+ c #E66767", -"m+ c #ED8989", -"n+ c #E34848", -"o+ c #F1A8A8", -"p+ c #DD0000", -"q+ c #E44C4C", -"r+ c #FBE0E0", -"s+ c #FBE5E5", -"t+ c #E64E4E", -"u+ c #E23535", -"v+ c #F2A5A5", -"w+ c #FADCDC", -"x+ c #F8D6D6", -"y+ c #DB2020", -"z+ c #D50404", -"A+ c #740000", -"B+ c #D80000", -"C+ c #E75858", -"D+ c #EF8989", -"E+ c #F3A3A3", -"F+ c #EA5E5E", -"G+ c #DF0D0D", -"H+ c #DE0B0B", -"I+ c #E33232", -"J+ c #F7C6C6", -"K+ c #EF9B9B", -"L+ c #DB1818", -"M+ c #620000", -"N+ c #E00C0C", -"O+ c #F29696", -"P+ c #E52727", -"Q+ c #EC5E5E", -"R+ c #F28F8F", -"S+ c #E20D0D", -"T+ c #E00000", -"U+ c #EE7A7A", -"V+ c #DF0B0B", -"W+ c #900000", -"X+ c #420000", -"Y+ c #E20000", -"Z+ c #E30404", -"`+ c #F18080", -" @ c #EC4646", -".@ c #E61010", -"+@ c #EA3434", -"@@ c #E50404", -"#@ c #EF6B6B", -"$@ c #E51717", -"%@ c #630000", -"&@ c #E80000", -"*@ c #E90000", -"=@ c #EC2020", -"-@ c #FCD4D4", -";@ c #EB1010", -">@ c #EE3434", -",@ c #FAC7C7", -"'@ c #FEF3F3", -")@ c #F69898", -"!@ c #9D0000", -"~@ c #EC0000", -"{@ c #ED0000", -"]@ c #F34C4C", -"^@ c #FCCDCD", -"/@ c #FCDBDB", -"(@ c #F24F4F", -"_@ c #F89D9D", -":@ c #FFF9F9", -"<@ c #F78A8A", -"[@ c #F02424", -"}@ c #700000", -"|@ c #F30000", -"1@ c #F40000", -"2@ c #F40C0C", -"3@ c #FA7676", -"4@ c #FA7C7C", -"5@ c #F51C1C", -"6@ c #F73F3F", -"7@ c #F62525", -"8@ c #6F0000", -"9@ c #F80000", -"0@ c #F70000", -"a@ c #F80404", -"b@ c #F80808", -"c@ c #DF0000", -"d@ c #960000", -"e@ c #710000", -"f@ c #9A0000", -"g@ c #F00000", -"h@ c #A80000", -"i@ c #800000", -"j@ c #F10000", -"k@ c #F90000", -"l@ c #FC0000", -"m@ c #660000", -"n@ c #750000", -"o@ c #8D0000", -"p@ c #980000", -"q@ c #A00000", -"r@ c #9C0000", -"s@ c #690000", -" ", -" . + @ # $ % & * = ", -" - ; > , ' ) ! ~ { ] ^ / ( _ ", -" : < [ } | 1 2 3 3 2 2 1 4 5 6 7 8 ", -" 9 0 a b c 1 2 3 3 3 3 2 2 c b d e f g ", -" h i j k l m n o o p q r o n 4 m l s t u v ", -" h w x y z A B C D E F G H E C B A I J K L M N ", -" O P P Q R S T U V W X Y Z ` X .V ..+.@.#.$.%.&.*. ", -" =.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6. ", -" % 7.;.>.8.9.0.a.b.c.d.e.f.(.g.h.i.j.k.l.m.n.o.p.q.r.s. ", -" t.5.;.u.v.w.x.y.z.A.B.C.(.(.D.E.F.G.H.I.J.K.L.p.q.M.N. ", -" O.;.5.;.u.w P.Q.R.S.T.U.V.(.(.(.W.X.Y.Z.`. +.+P 7.q.M.++@+ ", -" #+M.$+;.u.%+&+*+=+-+;+>+,+(.(.(.(.(.'+)+!+~+v.P 7.{+]+^+/+ ", -" (+M.q.;.u.%+&+-._+:+<+[+'+(.(.(.(.(.(.}+|+P.v.P 7.1+5.2+3+ ", -" t.$+1+7.u.%+&+~+t.4+5+(.(.(.(.(.(.(.(.(.6+.+v.P u.;.{+7+8+ ", -" t.1+;.p.>.%+&+~+*+9+0+(.(.(.(.a+b+(.(.(.6+.+v.L.u.c+d+$+8+ ", -" _+7.p.P %+&+P.-.e+f+(.(.(.(.(.g+h+(.(.(.i+~+.+v.L.u.p.{+j+ ", -" k+>.L.w &+P.~+t.l+(.(.(.(.(.(.m+n+(.(.(.o+-.~+.+v.%+P {+3+ ", -" p+&+.+~+-.*+_+* q+(.(.r+'+r+s+t+u+v+w+(.x+y+z+*+-..+&+M.A+ ", -" (+*+*+t._+* B+& C+(.(.D+z E+F+G+H+I+J+(.D.K+L+=+_+*+*+&.M+ ", -" t.k+(+(+p+p+N+O+(.(.P+Q+R+S+T+@ T+G.(.(.U+V+= (+& k+W+X+ ", -" P.(+T+T+@ Y+Z+`+(.(. @.@+@@@% % % #@(.X.$@Y+@ T+T+_+%@ ", -" ~++ #+&@&@*@=@-@D.h.;@# # # # >@,@'@)@&@&@#+#+h !@ ", -" $+@ ~@~@~@{@{@]@^@/@(@{@{@{@{@_@:@<@[@{@~@~@~@p.}@ ", -" $+Y+|@1@|@1@1@2@3@4@1@1@1@5@6@7@1@1@1@1@=.(+8@ ", -" $+$ 9@0@0@9@9@a@b@9@9@9@9@9@9@0@0@0@0@c@d@ ", -" ^+B+9@O.O.O.O.O.O.O.O.O.O.O.O.O.|@*+e@ ", -" f@;.$ . . . . . . . . . . . g@h@A+ ", -" i@2+.+&@j@k@l@9@j@Y+&+N m@ ", -" n@o@p@q@6.r@N.i@s@X+ ", -" ", -" "}; diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control index 0d88bcb73..6765d61cb 100644 --- a/ubuntu/_base/core/tdebase/debian/control +++ b/ubuntu/_base/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], libsensors-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, 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, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev +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], libsensors-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, 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, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-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/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/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff index bb1dccd7b..1b53be325 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff @@ -5,5 +5,5 @@ index dd64b58..0af3e44 100644 @@ -12,3 +12,4 @@ Terminal=false X-TDE-InitialPreference=8 X-DCOP-ServiceType=Multi - Categories=Qt;TDE;TextEditor; + Categories=Qt;TDE;Utility;TextEditor; +NoDisplay=true diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index 8cdb710e0..4a5dcee66 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -64,7 +64,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_UPOWER="ON" \ -DWITH_LIBART="ON" \ -DWITH_LIBCONFIG="ON" \ - -DWITH_PCRE="ON" \ + -DWITH_PCRE2="ON" \ -DWITH_KRB5="ON" DEB_FIXPERMS_EXCLUDE := \ @@ -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/twin-trinity.install b/ubuntu/_base/core/tdebase/debian/twin-trinity.install index 52c59c4a7..f9b6061d4 100644 --- a/ubuntu/_base/core/tdebase/debian/twin-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/twin-trinity.install @@ -74,19 +74,7 @@ debian/tmp/opt/trinity/share/apps/twin/eventsrc debian/tmp/opt/trinity/share/apps/twin/keramik.desktop debian/tmp/opt/trinity/share/apps/twin/laptop.desktop debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop -debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png -debian/tmp/opt/trinity/share/apps/twin/pics/close.png -debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png -debian/tmp/opt/trinity/share/apps/twin/pics/fog.png -debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png -debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png -debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png -debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png -debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png -debian/tmp/opt/trinity/share/apps/twin/pics/menu.png -debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png -debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png -debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png +debian/tmp/opt/trinity/share/apps/twin/pics/* debian/tmp/opt/trinity/share/apps/twin/plastik.desktop debian/tmp/opt/trinity/share/apps/twin/quartz.desktop debian/tmp/opt/trinity/share/apps/twin/redmond.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/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control index c2e08704b..9c3d16328 100644 --- a/ubuntu/_base/core/tdelibs/debian/control +++ b/ubuntu/_base/core/tdelibs/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutil aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, - libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, + libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev, libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, @@ -103,7 +103,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev, libaspell-dev, hspell, libbz2-dev, libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, - libopenexr-dev (>= 1.2.2-3), libpcre3-dev, + libopenexr-dev (>= 1.2.2-3), libpcre2-dev, liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, libsasl2-dev, libxcomposite-dev, libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev, 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/control b/ubuntu/_base/dependencies/tqt3/debian/control index 36266f44e..a0f53d3a9 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/control +++ b/ubuntu/_base/dependencies/tqt3/debian/control @@ -2,7 +2,7 @@ Source: tqt-x11-free 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>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libnsl-dev | libc6-dev (<<2.32~), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index 9cd19fa94..b22eb1913 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -1,34 +1,33 @@ usr/include/tqt3/private/* -usr/include/tqt3/ntqabstractlayout.h -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 usr/include/tqt3/tqbrush.h usr/include/tqt3/tqbuffer.h -usr/include/tqt3/ntqbutton.h -usr/include/tqt3/ntqbuttongroup.h +usr/include/tqt3/tqbutton.h +usr/include/tqt3/tqbuttongroup.h usr/include/tqt3/tqcache.h usr/include/tqt3/tqcanvas.h -usr/include/tqt3/ntqcdestyle.h -usr/include/tqt3/ntqcheckbox.h -usr/include/tqt3/ntqcleanuphandler.h +usr/include/tqt3/tqcdestyle.h +usr/include/tqt3/tqcheckbox.h +usr/include/tqt3/tqcleanuphandler.h usr/include/tqt3/tqclipboard.h usr/include/tqt3/tqcolor.h usr/include/tqt3/tqcolordialog.h -usr/include/tqt3/ntqcombobox.h -usr/include/tqt3/ntqcommonstyle.h -usr/include/tqt3/ntqcompactstyle.h -usr/include/tqt3/ntqconnection.h +usr/include/tqt3/tqcombobox.h +usr/include/tqt3/tqcommonstyle.h +usr/include/tqt3/tqcompactstyle.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 @@ -36,102 +35,101 @@ usr/include/tqt3/tqdataview.h usr/include/tqt3/tqdatetime.h usr/include/tqt3/tqdatetimeedit.h usr/include/tqt3/tqdeepcopy.h -usr/include/tqt3/ntqdesktopwidget.h -usr/include/tqt3/ntqdial.h -usr/include/tqt3/ntqdialog.h +usr/include/tqt3/tqdesktopwidget.h +usr/include/tqt3/tqdial.h +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/ntqevent.h -usr/include/tqt3/ntqeventloop.h -usr/include/tqt3/ntqfeatures.h +usr/include/tqt3/tqevent.h +usr/include/tqt3/tqeventloop.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 usr/include/tqt3/tqfontinfo.h usr/include/tqt3/tqfontmetrics.h -usr/include/tqt3/ntqframe.h +usr/include/tqt3/tqframe.h usr/include/tqt3/tqftp.h -usr/include/tqt3/ntqgarray.h +usr/include/tqt3/tqgarray.h usr/include/tqt3/tqgb18030codec.h usr/include/tqt3/tqgbkcodec.h -usr/include/tqt3/ntqgcache.h -usr/include/tqt3/ntqgdict.h -usr/include/tqt3/ntqgeneric.h -usr/include/tqt3/ntqgif.h -usr/include/tqt3/ntqglist.h -usr/include/tqt3/ntqglobal.h -usr/include/tqt3/ntqgplugin.h -usr/include/tqt3/ntqgrid.h -usr/include/tqt3/ntqgridview.h -usr/include/tqt3/ntqgroupbox.h -usr/include/tqt3/ntqguardedptr.h -usr/include/tqt3/ntqgvector.h -usr/include/tqt3/ntqhbox.h -usr/include/tqt3/ntqhbuttongroup.h -usr/include/tqt3/ntqheader.h +usr/include/tqt3/tqgcache.h +usr/include/tqt3/tqgdict.h +usr/include/tqt3/tqgif.h +usr/include/tqt3/tqglist.h +usr/include/tqt3/tqglobal.h +usr/include/tqt3/tqgplugin.h +usr/include/tqt3/tqgrid.h +usr/include/tqt3/tqgridview.h +usr/include/tqt3/tqgroupbox.h +usr/include/tqt3/tqguardedptr.h +usr/include/tqt3/tqgvector.h +usr/include/tqt3/tqhbox.h +usr/include/tqt3/tqhbuttongroup.h +usr/include/tqt3/tqheader.h usr/include/tqt3/tqhebrewcodec.h -usr/include/tqt3/ntqhgroupbox.h +usr/include/tqt3/tqhgroupbox.h usr/include/tqt3/tqhostaddress.h usr/include/tqt3/tqhttp.h 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/ntqinterlacestyle.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/ntqlabel.h -usr/include/tqt3/ntqlayout.h -usr/include/tqt3/ntqlcdnumber.h -usr/include/tqt3/ntqlibrary.h -usr/include/tqt3/ntqlineedit.h -usr/include/tqt3/ntqlistbox.h -usr/include/tqt3/ntqlistview.h -usr/include/tqt3/ntqlocale.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/tqlibrary.h +usr/include/tqt3/tqlineedit.h +usr/include/tqt3/tqlistbox.h +usr/include/tqt3/tqlistview.h +usr/include/tqt3/tqlocale.h usr/include/tqt3/tqlocalfs.h usr/include/tqt3/tqmainwindow.h 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/ntqmotifstyle.h -usr/include/tqt3/ntqmotifplusstyle.h +usr/include/tqt3/tqmngio.h +usr/include/tqt3/tqmotifstyle.h +usr/include/tqt3/tqmotifplusstyle.h usr/include/tqt3/tqmovie.h -usr/include/tqt3/ntqmultilineedit.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 @@ -146,53 +144,53 @@ usr/include/tqt3/tqpen.h usr/include/tqt3/tqpicture.h usr/include/tqt3/tqpixmap.h usr/include/tqt3/tqpixmapcache.h -usr/include/tqt3/ntqplatinumstyle.h +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/ntqprogressbar.h -usr/include/tqt3/ntqprogressdialog.h +usr/include/tqt3/tqprogressbar.h +usr/include/tqt3/tqprogressdialog.h usr/include/tqt3/tqptrcollection.h usr/include/tqt3/tqptrdict.h usr/include/tqt3/tqptrlist.h usr/include/tqt3/tqptrqueue.h usr/include/tqt3/tqptrstack.h usr/include/tqt3/tqptrvector.h -usr/include/tqt3/ntqpushbutton.h -usr/include/tqt3/ntqradiobutton.h -usr/include/tqt3/ntqrangecontrol.h +usr/include/tqt3/tqpushbutton.h +usr/include/tqt3/tqradiobutton.h +usr/include/tqt3/tqrangecontrol.h usr/include/tqt3/tqrect.h usr/include/tqt3/tqregexp.h usr/include/tqt3/tqregion.h -usr/include/tqt3/ntqscrollbar.h -usr/include/tqt3/ntqscrollview.h +usr/include/tqt3/tqscrollbar.h +usr/include/tqt3/tqscrollview.h usr/include/tqt3/tqsemaphore.h usr/include/tqt3/tqserversocket.h usr/include/tqt3/tqsessionmanager.h usr/include/tqt3/tqsettings.h -usr/include/tqt3/ntqsgistyle.h -usr/include/tqt3/ntqshared.h +usr/include/tqt3/tqsgistyle.h +usr/include/tqt3/tqshared.h usr/include/tqt3/tqsignal.h usr/include/tqt3/tqsignalmapper.h usr/include/tqt3/tqsignalslotimp.h -usr/include/tqt3/ntqsimplerichtext.h +usr/include/tqt3/tqsimplerichtext.h usr/include/tqt3/tqsize.h usr/include/tqt3/tqsizegrip.h usr/include/tqt3/tqsizepolicy.h usr/include/tqt3/tqsjiscodec.h -usr/include/tqt3/ntqslider.h +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/ntqspinbox.h -usr/include/tqt3/ntqsplashscreen.h -usr/include/tqt3/ntqsplitter.h +usr/include/tqt3/tqsound.h +usr/include/tqt3/tqspinbox.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 @@ -217,13 +215,13 @@ usr/include/tqt3/tqstyle.h usr/include/tqt3/tqstylefactory.h usr/include/tqt3/tqstyleplugin.h usr/include/tqt3/tqstylesheet.h -usr/include/tqt3/ntqsyntaxhighlighter.h -usr/include/tqt3/ntqt.h +usr/include/tqt3/tqsyntaxhighlighter.h +usr/include/tqt3/tqt3.h usr/include/tqt3/tqt.h -usr/include/tqt3/ntqtabbar.h -usr/include/tqt3/ntqtabdialog.h -usr/include/tqt3/ntqtable.h -usr/include/tqt3/ntqtabwidget.h +usr/include/tqt3/tqtabbar.h +usr/include/tqt3/tqtabdialog.h +usr/include/tqt3/tqtable.h +usr/include/tqt3/tqtabwidget.h usr/include/tqt3/tqtextbrowser.h usr/include/tqt3/tqtextcodec.h usr/include/tqt3/tqtextcodecfactory.h @@ -234,37 +232,37 @@ 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 usr/include/tqt3/tqtooltip.h -usr/include/tqt3/ntqtranslator.h +usr/include/tqt3/tqtranslator.h usr/include/tqt3/tqtsciicodec.h 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/ntqvbox.h -usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvgroupbox.h +usr/include/tqt3/tqvariant.h +usr/include/tqt3/tqvbox.h +usr/include/tqt3/tqvbuttongroup.h +usr/include/tqt3/tqvgroupbox.h usr/include/tqt3/tqwaitcondition.h -usr/include/tqt3/ntqwhatsthis.h +usr/include/tqt3/tqwhatsthis.h usr/include/tqt3/tqwidget.h 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/ntqwindowsstyle.h -usr/include/tqt3/ntqwinexport.h -usr/include/tqt3/ntqwizard.h +usr/include/tqt3/tqwindowdefs.h +usr/include/tqt3/tqwindowsstyle.h +usr/include/tqt3/tqwinexport.h +usr/include/tqt3/tqwizard.h usr/include/tqt3/tqwmatrix.h usr/include/tqt3/tqworkspace.h usr/include/tqt3/tqxml.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 |