diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-06-23 10:26:33 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-06-23 10:26:33 +0200 |
| commit | 55105d15adb9e935e1d7a88b41367017753ace9f (patch) | |
| tree | c726f529c11ef486acf2a63c8464e6cc7ff59457 | |
| parent | c9be07821c8511cb8fe2649392fbd3942d756f72 (diff) | |
| parent | 2415145b9c835be7ff154da29dc76a19aa6a18db (diff) | |
| download | tde-packaging-55105d15adb9e935e1d7a88b41367017753ace9f.tar.gz tde-packaging-55105d15adb9e935e1d7a88b41367017753ace9f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
96 files changed, 486 insertions, 519 deletions
diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop index 9ac108108..3072b99aa 100644 --- a/debian/lenny/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop +++ b/debian/lenny/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Exec=assistant-tqt3 -Name=Qt3 Assistant -Name[de]=Qt3 Assistent -Comment=Qt3 Helpcenter -Comment[de]= Qt3 Hilfezentrum +Exec=tqassistant +Name=TQt3 Assistant +Name[de]=TQt3 Assistent +Comment=TQt3 Helpcenter +Comment[de]= TQt3 Hilfezentrum MimeType=application/x-assistant; Icon=assistant Terminal=false diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/designer-tqt3.desktop index 2872906ab..cc95cead5 100644 --- a/debian/lenny/dependencies/tqt3/debian/maintain/designer-tqt3.desktop +++ b/debian/lenny/dependencies/tqt3/debian/maintain/designer-tqt3.desktop @@ -1,75 +1,75 @@ [Desktop Entry] Encoding=UTF-8 -Exec=designer-tqt3 -Name=Qt3 Designer -Name[bg]=Qt3 Дизайнер -Name[br]=Ergrafer Qt3 -Name[ca]=Dissenyador Qt3 -Name[cs]=Qt3 designer -Name[de]=Qt3-Designer -Name[eo]=Qt3-Desegnilo -Name[es]=Diseñador Qt3 -Name[et]=Qt3 disainer -Name[eu]=Qt3 Diseinatzailea -Name[gl]=Deseñador de Qt3 -Name[he]=Qt בצעמ -Name[it]=Designer Qt3 -Name[ja]=Qtデザイナー -Name[ko]=Qt 디자이너 -Name[lv]=Qt3 Dizainers -Name[mk]=Qt дизајнер -Name[no]=Qt3-designer -Name[oc]=Dessinador Qt3 -Name[pl]=Projektant Qt3 -Name[sk]=Qt3 Dizajnér -Name[sl]=Snovalnik Qt3 -Name[ta]=Qt À¨¼ôÀ¡Ç÷ -Name[uk]=Дизайнер Qt -Name[zh_CN.GB2312]=Qt 设计者 -Name[zh_TW.Big5]=Qt 設計器 -Comment=Qt3 interface designer -Comment[az]=Qt3 axtar üz dizayn proqramı -Comment[bg]=Qt3 interface дизайнер -Comment[br]=Ergrafer etrefas Qt3 -Comment[ca]=Dissenyador d'interfícies Qt3 -Comment[cs]=Editor UI pro Qt3 -Comment[da]=Qt3 grænseflade designer -Comment[de]=Schnittstellen-Designer für Qt3 -Comment[el]=Σχεδιασμός περιβάλλοντων Qt -Comment[eo]=Qt3-Interfacdesegnilo -Comment[es]=Diseñador de interfaces de Qt3 -Comment[et]=Qt3 dialoogide redaktor -Comment[eu]=Qt3 interfaze diseinatzailea -Comment[fi]=Qt:n käyttöliittymäsuunnittelija -Comment[fr]=Conception d'interfaces avec Qt3 -Comment[gl]=Editor de interfaces de Qt3 -Comment[he]=Qt-ל םיקשממ בצעמ -Comment[hu]=Qt3 felülettervező -Comment[is]=Viðmótshönnunartól fyrir Qt3 -Comment[it]=Editor per le interfaccie Qt3 -Comment[ja]=Qtインターフェースデザイナー -Comment[ko]=Qt 인터페이스 디자이너 -Comment[lt]=Qt3 sąsajos redaktorius -Comment[lv]=Qt3 starsejas dizainers -Comment[mk]=Дизајнер на Qt дијалози -Comment[nl]=Qt3 interface-ontwerper -Comment[no]=Qt3-grensesnittdesigner -Comment[no_NY]=Redigering av Qt3-miljø -Comment[oc]=Dessinador d'interfacies Qt3 -Comment[pl]=Projektant interfejsu Qt3 -Comment[pt]=Editor de interfaces do Qt3 -Comment[pt_BR]=Designer de interface Qt3 -Comment[ro]=Dezvoltator de interfeţe Qt3 -Comment[ru]=редактор интерфейсов приложений Qt -Comment[sk]=Qt3 dizajnér rozhrania -Comment[sl]=Snovalnik vmesnikov za Qt3 -Comment[sr]=Dizajner Qt3 interfejsa -Comment[sv]=Editor för gränssnitt till Qt3 -Comment[ta]=Qt À¨¼ôÀ¡Ç÷ -Comment[tr]=Qt3 arayüz tasarım programı -Comment[uk]=Редактор інтерфейсу для Qt -Comment[zh_CN.GB2312]=Qt 界面设计程序 -Comment[zh_TW.Big5]=Qt 介面編輯器 +Exec=tqdesigner +Name=TQt3 Designer +Name[bg]=TQt3 Дизайнер +Name[br]=Ergrafer TQt3 +Name[ca]=Dissenyador TQt3 +Name[cs]=TQt3 designer +Name[de]=TQt3-Designer +Name[eo]=TQt3-Desegnilo +Name[es]=Diseñador TQt3 +Name[et]=TQt3 disainer +Name[eu]=TQt3 Diseinatzailea +Name[gl]=Deseñador de TQt3 +Name[he]=TQt3 בצעמ +Name[it]=Designer TQt3 +Name[ja]=TQt3デザイナー +Name[ko]=TQt3 디자이너 +Name[lv]=TQt3 Dizainers +Name[mk]=TQt3 дизајнер +Name[no]=TQt3-designer +Name[oc]=Dessinador TQt3 +Name[pl]=Projektant TQt3 +Name[sk]=TQt3 Dizajnér +Name[sl]=Snovalnik TQt3 +Name[ta]=TQt3 À¨¼ôÀ¡Ç÷ +Name[uk]=Дизайнер TQt3 +Name[zh_CN.GB2312]=TQt3 设计者 +Name[zh_TW.Big5]=TQt3 設計器 +Comment=TQt3 interface designer +Comment[az]=TQt3 axtar üz dizayn proqramı +Comment[bg]=TQt3 interface дизайнер +Comment[br]=Ergrafer etrefas TQt3 +Comment[ca]=Dissenyador d'interfícies TQt3 +Comment[cs]=Editor UI pro TQt3 +Comment[da]=TQt3 grænseflade designer +Comment[de]=Schnittstellen-Designer für TQt3 +Comment[el]=Σχεδιασμός περιβάλλοντων TQt3 +Comment[eo]=TQt3-Interfacdesegnilo +Comment[es]=Diseñador de interfaces de TQt3 +Comment[et]=TQt3 dialoogide redaktor +Comment[eu]=TQt3 interfaze diseinatzailea +Comment[fi]=TQt3:n käyttöliittymäsuunnittelija +Comment[fr]=Conception d'interfaces avec TQt3 +Comment[gl]=Editor de interfaces de TQt3 +Comment[he]=TQt3-ל םיקשממ בצעמ +Comment[hu]=TQt3 felülettervező +Comment[is]=Viðmótshönnunartól fyrir TQt3 +Comment[it]=Editor per le interfaccie TQt3 +Comment[ja]=TQt3インターフェースデザイナー +Comment[ko]=TQt3 인터페이스 디자이너 +Comment[lt]=TQt3 sąsajos redaktorius +Comment[lv]=TQt3 starsejas dizainers +Comment[mk]=Дизајнер на TQt3 дијалози +Comment[nl]=TQt3 interface-ontwerper +Comment[no]=TQt3-grensesnittdesigner +Comment[no_NY]=Redigering av TQt3-miljø +Comment[oc]=Dessinador d'interfacies TQt3 +Comment[pl]=Projektant interfejsu TQt3 +Comment[pt]=Editor de interfaces do TQt3 +Comment[pt_BR]=Designer de interface TQt3 +Comment[ro]=Dezvoltator de interfeţe TQt3 +Comment[ru]=редактор интерфейсов приложений TQt3 +Comment[sk]=TQt3 dizajnér rozhrania +Comment[sl]=Snovalnik vmesnikov za TQt3 +Comment[sr]=Dizajner TQt3 interfejsa +Comment[sv]=Editor för gränssnitt till TQt3 +Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷ +Comment[tr]=TQt3 arayüz tasarım programı +Comment[uk]=Редактор інтерфейсу для TQt3 +Comment[zh_CN.GB2312]=TQt3 界面设计程序 +Comment[zh_TW.Big5]=TQt3 介面編輯器 MimeType=application/x-designer; Icon=designer Terminal=false diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop index e3a192980..d879d32db 100644 --- a/debian/lenny/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop +++ b/debian/lenny/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop @@ -1,23 +1,23 @@ [Desktop Entry] -Exec=linguist-tqt3 -Name=Qt3 Linguist -Name[de]=Qt3-Linguist -Name[eo]=Qt3-Lingvisto -Name[es]=Lingüista Qt3 -Name[ko]=Qt 언어학자 -Name[lv]=Qt3 Lingvists -Comment=Tool for translating message catalogues of Qt3 based programs -Comment[da]=Redskab til at oversætte Qt3 baserede programmer -Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren -Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj -Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3 -Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ -Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához -Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 -Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās -Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program +Exec=tqlinguist +Name=TQt3 Linguist +Name[de]=TQt3-Linguist +Name[eo]=TQt3-Lingvisto +Name[es]=Lingüista TQt3 +Name[ko]=TQt3 언어학자 +Name[lv]=TQt3 Lingvists +Comment=Tool for translating message catalogues of TQt3 based programs +Comment[da]=Redskab til at oversætte TQt3 baserede programmer +Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren +Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj +Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3 +Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ +Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához +Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 +Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās +Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 +Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 +Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program MimeType=application/x-linguist; Terminal=false Icon=linguist diff --git a/debian/lenny/dependencies/tqt3/debian/maintain/tqt3config.desktop b/debian/lenny/dependencies/tqt3/debian/maintain/tqt3config.desktop index 3965c1355..b3535c06f 100644 --- a/debian/lenny/dependencies/tqt3/debian/maintain/tqt3config.desktop +++ b/debian/lenny/dependencies/tqt3/debian/maintain/tqt3config.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Exec=qtconfig-tqt3 -Name=Qt3 Configuration -Name[de]=Qt3 Konfiguration -Comment=A graphical configuration tool for programs using Qt 3 -Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme +Exec=tqtconfig +Name=TQt3 Configuration +Name[de]=TQt3 Konfiguration +Comment=A graphical configuration tool for programs using TQt 3 +Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme MimeType=application/x-qtconfig; Terminal=false Icon=qtconfig diff --git a/debian/lenny/dependencies/tqt3/debian/rules b/debian/lenny/dependencies/tqt3/debian/rules index 2b4eaf3ae..39a2ee31c 100755 --- a/debian/lenny/dependencies/tqt3/debian/rules +++ b/debian/lenny/dependencies/tqt3/debian/rules @@ -191,7 +191,7 @@ clean: unpatch fi -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ - config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ + config.status bin/moc bin/tqmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ @@ -360,17 +360,17 @@ binary-arch: build install perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri ## i18n files for designer, linguist and assistant - (cd `pwd`/tools/designer/designer/ && lrelease designer.pro) + (cd `pwd`/tools/designer/designer/ && tqlrelease designer.pro) for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/tqt3-designer/usr/share/tqt3/translations/designer_"$$a".qm; done rm -rf `pwd`/tools/designer/designer/*.qm - (cd `pwd`/tools/assistant/ && lrelease assistant.pro) + (cd `pwd`/tools/assistant/ && tqlrelease assistant.pro) for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/tqt3-assistant/usr/share/tqt3/translations/assistant_"$$a".qm; done rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/assistant_de.qm - (cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro) + (cd `pwd`/tools/linguist/linguist/ && tqlrelease linguist.pro) for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done rm -rf `pwd`/tools/linguist/linguist/*.qm @@ -407,17 +407,6 @@ binary-arch: build install install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz rm -rf `pwd`/src/attic.tar.gz - # rename some binaries to make tqt3/4 installations possible - mv `pwd`/debian/tqt3-designer/usr/bin/designer `pwd`/debian/tqt3-designer/usr/bin/designer-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/uic `pwd`/debian/tqt3-dev-tools/usr/bin/uic-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/moc `pwd`/debian/tqt3-dev-tools/usr/bin/moc-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3 - mv `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig-tqt3 - mv `pwd`/debian/tqt3-assistant/usr/bin/assistant `pwd`/debian/tqt3-assistant/usr/bin/assistant-tqt3 - mv `pwd`/debian/tqt3-linguist/usr/bin/linguist `pwd`/debian/tqt3-linguist/usr/bin/linguist-tqt3 - install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1 install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1 install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1 @@ -432,8 +421,8 @@ binary-arch: build install for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done # install the qmake binary - rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/qmake - install -D `pwd`/qmake/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3 + rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake + install -D `pwd`/qmake/tqmake `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake # Install source for the designer tools, such as createcw. cp -ra tools/designer/tools debian/tqt3-designer/usr/share/tqt3/tools diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install index 3ec2f74fa..f393e405a 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install @@ -1,3 +1,3 @@ -usr/bin/assistant +usr/bin/tqassistant usr/share/tqt3/doc/html/assistant*html usr/share/tqt3/doc/html/assistant*dcf diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.links b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.links index 909b4681d..5244653a5 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.links +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.links @@ -1 +1 @@ -/usr/bin/assistant-tqt3 /usr/share/tqt3/bin/assistant +/usr/bin/tqassistant /usr/share/tqt3/bin/tqassistant diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu index 0706262b5..d59f83bd0 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.menu @@ -2,5 +2,5 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Assistant"\ - command="/usr/bin/assistant-tqt3" + title="TQt3 Assistant"\ + command="/usr/bin/tqassistant" diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.postinst index c8b6ca8b3..041457133 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.postinst +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.postinst @@ -3,6 +3,6 @@ set -e update-alternatives --install \ - /usr/bin/assistant assistant "/usr/bin/assistant-tqt3" "45" \ + /usr/bin/assistant assistant "/usr/bin/tqassistant" "45" \ #DEBHELPER# diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.prerm index 1a45c259c..36371091e 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.prerm +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove assistant "/usr/bin/assistant-tqt3" + update-alternatives --remove assistant "/usr/bin/tqassistant" ;; esac diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install index f2db61219..555f8b9b4 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install @@ -1,4 +1,4 @@ -usr/bin/designer +usr/bin/tqdesigner usr/bin/createcw usr/bin/conv2ui usr/share/tqt3/templates/* diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.links b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.links index 550d68ec0..19922f299 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.links +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.links @@ -1 +1 @@ -/usr/bin/designer-tqt3 /usr/share/tqt3/bin/designer +/usr/bin/tqdesigner /usr/share/tqt3/bin/tqdesigner diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu index d3c55b41a..be078bd49 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.menu @@ -2,6 +2,6 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Designer"\ - command="/usr/bin/designer-tqt3" + title="TQt3 Designer"\ + command="/usr/bin/tqdesigner" diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.postinst index bbbd836d0..91d69ce08 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.postinst +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/designer designer "/usr/bin/designer-tqt3" "45" \ + /usr/bin/designer designer "/usr/bin/tqdesigner" "45" \ --slave /usr/share/man/man1/designer.1.gz designer.1.gz \ "/usr/share/man/man1/designer-tqt3.1.gz" diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.prerm index 14497092e..93376ef35 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.prerm +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove designer "/usr/bin/designer-tqt3" + update-alternatives --remove designer "/usr/bin/tqdesigner" ;; esac diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.install b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.install index d496d35b9..3c795661b 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.install @@ -1,9 +1,9 @@ usr/share/tqt3/mkspecs/* usr/share/tqt3/doc/html/qmake*html usr/share/tqt3/doc/html/qmake*dcf -usr/bin/qmake -usr/bin/lupdate -usr/bin/lrelease -usr/bin/uic -usr/bin/moc -usr/bin/qembed +usr/bin/tqmake +usr/bin/tqlupdate +usr/bin/tqlrelease +usr/bin/tquic +usr/bin/tqmoc +usr/bin/tqembed diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.links b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.links index 0de57d25d..073720d2b 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.links +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.links @@ -1,7 +1,7 @@ /usr/share/tqt3/mkspecs/linux-g++ /usr/share/tqt3/mkspecs/default -/usr/bin/qmake-tqt3 /usr/share/tqt3/bin/qmake -/usr/bin/lupdate-tqt3 /usr/share/tqt3/bin/lupdate -/usr/bin/lrelease-tqt3 /usr/share/tqt3/bin/lrelease -/usr/bin/uic-tqt3 /usr/share/tqt3/bin/uic -/usr/bin/moc-tqt3 /usr/share/tqt3/bin/moc -/usr/bin/qembed /usr/share/tqt3/bin/qembed +/usr/bin/tqmake /usr/share/tqt3/bin/tqmake +/usr/bin/tqlupdate /usr/share/tqt3/bin/tqlupdate +/usr/bin/tqlrelease /usr/share/tqt3/bin/tqlrelease +/usr/bin/tquic /usr/share/tqt3/bin/tquic +/usr/bin/tqmoc /usr/share/tqt3/bin/tqmoc +/usr/bin/tqembed /usr/share/tqt3/bin/tqembed diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.postinst index 75022d56f..b6c833de8 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.postinst +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.postinst @@ -3,26 +3,26 @@ set -e update-alternatives --install \ - /usr/bin/moc moc "/usr/bin/moc-tqt3" "45" \ + /usr/bin/moc moc "/usr/bin/tqmoc" "45" \ --slave /usr/share/man/man1/moc.1.gz moc.1.gz \ "/usr/share/man/man1/moc-tqt3.1.gz" update-alternatives --install \ - /usr/bin/uic uic "/usr/bin/uic-tqt3" "45" \ + /usr/bin/uic uic "/usr/bin/tquic" "45" \ --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ "/usr/share/man/man1/uic-tqt3.1.gz" update-alternatives --install \ - /usr/bin/lupdate lupdate "/usr/bin/lupdate-tqt3" "45" \ + /usr/bin/lupdate lupdate "/usr/bin/tqlupdate" "45" \ --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ "/usr/share/man/man1/lupdate-tqt3.1.gz" - + update-alternatives --install \ - /usr/bin/lrelease lrelease "/usr/bin/lrelease-tqt3" "45" \ + /usr/bin/lrelease lrelease "/usr/bin/tqlrelease" "45" \ --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ "/usr/share/man/man1/lrelease-tqt3.1.gz" update-alternatives --install \ - /usr/bin/qmake qmake "/usr/bin/qmake-tqt3" "45" \ + /usr/bin/qmake qmake "/usr/bin/tqmake" "45" \ #DEBHELPER# diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.prerm index c0a69bfe9..0ec40c9e9 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.prerm +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-dev-tools.prerm @@ -5,11 +5,11 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove moc "/usr/bin/moc-tqt3" - update-alternatives --remove uic "/usr/bin/uic-tqt3" - update-alternatives --remove lupdate "/usr/bin/lupdate-tqt3" - update-alternatives --remove lrelease "/usr/bin/lrelease-tqt3" - update-alternatives --remove qmake "/usr/bin/qmake-tqt3" + update-alternatives --remove moc "/usr/bin/tqmoc" + update-alternatives --remove uic "/usr/bin/tquic" + update-alternatives --remove lupdate "/usr/bin/tqlupdate" + update-alternatives --remove lrelease "/usr/bin/tqlrelease" + update-alternatives --remove qmake "/usr/bin/tqmake" ;; esac diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.install b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.install index 7484d8534..8602850aa 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.install @@ -1,4 +1,4 @@ -usr/bin/linguist +usr/bin/tqlinguist usr/share/tqt3/phrasebooks/* usr/share/tqt3/doc/html/linguist*html usr/share/tqt3/doc/html/linguist*dcf diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.links b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.links index aa157aded..4fa700555 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.links +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.links @@ -1 +1 @@ -/usr/bin/linguist-tqt3 /usr/share/tqt3/bin/linguist +/usr/bin/tqlinguist /usr/share/tqt3/bin/tqlinguist diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu index faf1b8eae..976cb4b3c 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.menu @@ -2,5 +2,5 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Linguist"\ - command="/usr/bin/linguist-tqt3" + title="TQt3 Linguist"\ + command="/usr/bin/tqlinguist" diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.postinst index 1dadc79df..4c51e97bf 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.postinst +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/linguist linguist "/usr/bin/linguist-tqt3" "45" \ + /usr/bin/linguist linguist "/usr/bin/tqlinguist" "45" \ --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \ "/usr/share/man/man1/linguist-tqt3.1.gz" diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.prerm index 38de53b13..47d704eb8 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.prerm +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-linguist.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove linguist "/usr/bin/linguist-tqt3" + update-alternatives --remove linguist "/usr/bin/tqlinguist" ;; esac diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.install b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.install index 8fcee756b..a1ae089bc 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.install @@ -1 +1 @@ -usr/bin/qtconfig +usr/bin/tqtconfig diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.links b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.links index 52e4d5473..eb6dd21c0 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.links +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.links @@ -1 +1 @@ -/usr/bin/qtconfig-tqt3 /usr/share/tqt3/bin/qtconfig +/usr/bin/tqtconfig /usr/share/tqt3/bin/tqtconfig diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.menu b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.menu index e567b050b..79f2ff8e5 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.menu +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.menu @@ -1,8 +1,8 @@ ?package(tqt3-qtconfig):\ needs="x11"\ section="Applications/System/Administration"\ - title="Qt3 Config"\ - longtitle="Qt3 Configuration Utility"\ - hints="Qt3 config tool"\ - command="/usr/bin/qtconfig-tqt3" + title="TQt3 Config"\ + longtitle="TQt3 Configuration Utility"\ + hints="TQt3 config tool"\ + command="/usr/bin/tqtconfig" diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.postinst index 9449d5b8a..68671a6ef 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.postinst +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-tqt3" "45" \ + /usr/bin/qtconfig qtconfig "/usr/bin/tqtconfig" "45" \ --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \ "/usr/share/man/man1/qtconfig-tqt3.1.gz" diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.prerm index 810bc0a93..27f898ea3 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.prerm +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-qtconfig.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove qtconfig "/usr/bin/qtconfig-tqt3" + update-alternatives --remove qtconfig "/usr/bin/tqtconfig" ;; esac diff --git a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff index 00cc8ca37..a45290729 100644 --- a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,14 +1,14 @@ --- starttde +++ starttde -@@ -228,17 +228,17 @@ - . $tdehome/share/config/startupconfig +@@ -288,17 +288,17 @@ + . "$tdehome/share/config/startupconfig" fi -# Make sure a default wallpaper is set. --if [ ! -e $tdehome/share/config/kdesktoprc ]; then +-if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then - # With Trinity this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then --cat >$tdehome/share/config/kdesktoprc <<EOF +-cat >"$tdehome/share/config/kdesktoprc" <<EOF -[Desktop0] -Wallpaper=isadora.png -WallpaperMode=Scaled @@ -16,10 +16,10 @@ - fi -fi +## Make sure a default wallpaper is set. -+#if [ ! -e $tdehome/share/config/kdesktoprc ]; then ++#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then +# # With Trinity this file should exist, but test first. +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -+#cat >$tdehome/share/config/kdesktoprc <<EOF ++#cat >"$tdehome/share/config/kdesktoprc" <<EOF +#[Desktop0] +#Wallpaper=isadora.png +#WallpaperMode=Scaled diff --git a/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install b/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install index 80c782628..f737043af 100644 --- a/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install +++ b/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install @@ -1,4 +1,4 @@ debian/tmp/opt/trinity/include/poppler-link-qt3.h debian/tmp/opt/trinity/include/poppler-page-transition.h debian/tmp/opt/trinity/include/poppler-qt.h -debian/opt/trinity/lib/pkgconfig/poppler-tqt.pc +debian/tmp/opt/trinity/lib/pkgconfig/poppler-tqt.pc diff --git a/debian/lenny/tdewebdev/debian/control b/debian/lenny/tdewebdev/debian/control index 44a90830b..f3c83ae1d 100644 --- a/debian/lenny/tdewebdev/debian/control +++ b/debian/lenny/tdewebdev/debian/control @@ -171,7 +171,7 @@ Architecture: any Section: libdevel Replaces: kommander-trinity-dev (<< 4:14.0.0) Breaks: kommander-trinity-dev (<< 4:14.0.0) -Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev +Depends: kommander-trinity (= ${binary:Version}), tdelibs4-trinity-dev Description: development files for Kommander [Trinity] This package contains the headers and other development files for building plugins or otherwise extending Kommander. diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop index 9ac108108..3072b99aa 100644 --- a/debian/squeeze/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop +++ b/debian/squeeze/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Exec=assistant-tqt3 -Name=Qt3 Assistant -Name[de]=Qt3 Assistent -Comment=Qt3 Helpcenter -Comment[de]= Qt3 Hilfezentrum +Exec=tqassistant +Name=TQt3 Assistant +Name[de]=TQt3 Assistent +Comment=TQt3 Helpcenter +Comment[de]= TQt3 Hilfezentrum MimeType=application/x-assistant; Icon=assistant Terminal=false diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/designer-tqt3.desktop index 2872906ab..cc95cead5 100644 --- a/debian/squeeze/dependencies/tqt3/debian/maintain/designer-tqt3.desktop +++ b/debian/squeeze/dependencies/tqt3/debian/maintain/designer-tqt3.desktop @@ -1,75 +1,75 @@ [Desktop Entry] Encoding=UTF-8 -Exec=designer-tqt3 -Name=Qt3 Designer -Name[bg]=Qt3 Дизайнер -Name[br]=Ergrafer Qt3 -Name[ca]=Dissenyador Qt3 -Name[cs]=Qt3 designer -Name[de]=Qt3-Designer -Name[eo]=Qt3-Desegnilo -Name[es]=Diseñador Qt3 -Name[et]=Qt3 disainer -Name[eu]=Qt3 Diseinatzailea -Name[gl]=Deseñador de Qt3 -Name[he]=Qt בצעמ -Name[it]=Designer Qt3 -Name[ja]=Qtデザイナー -Name[ko]=Qt 디자이너 -Name[lv]=Qt3 Dizainers -Name[mk]=Qt дизајнер -Name[no]=Qt3-designer -Name[oc]=Dessinador Qt3 -Name[pl]=Projektant Qt3 -Name[sk]=Qt3 Dizajnér -Name[sl]=Snovalnik Qt3 -Name[ta]=Qt À¨¼ôÀ¡Ç÷ -Name[uk]=Дизайнер Qt -Name[zh_CN.GB2312]=Qt 设计者 -Name[zh_TW.Big5]=Qt 設計器 -Comment=Qt3 interface designer -Comment[az]=Qt3 axtar üz dizayn proqramı -Comment[bg]=Qt3 interface дизайнер -Comment[br]=Ergrafer etrefas Qt3 -Comment[ca]=Dissenyador d'interfícies Qt3 -Comment[cs]=Editor UI pro Qt3 -Comment[da]=Qt3 grænseflade designer -Comment[de]=Schnittstellen-Designer für Qt3 -Comment[el]=Σχεδιασμός περιβάλλοντων Qt -Comment[eo]=Qt3-Interfacdesegnilo -Comment[es]=Diseñador de interfaces de Qt3 -Comment[et]=Qt3 dialoogide redaktor -Comment[eu]=Qt3 interfaze diseinatzailea -Comment[fi]=Qt:n käyttöliittymäsuunnittelija -Comment[fr]=Conception d'interfaces avec Qt3 -Comment[gl]=Editor de interfaces de Qt3 -Comment[he]=Qt-ל םיקשממ בצעמ -Comment[hu]=Qt3 felülettervező -Comment[is]=Viðmótshönnunartól fyrir Qt3 -Comment[it]=Editor per le interfaccie Qt3 -Comment[ja]=Qtインターフェースデザイナー -Comment[ko]=Qt 인터페이스 디자이너 -Comment[lt]=Qt3 sąsajos redaktorius -Comment[lv]=Qt3 starsejas dizainers -Comment[mk]=Дизајнер на Qt дијалози -Comment[nl]=Qt3 interface-ontwerper -Comment[no]=Qt3-grensesnittdesigner -Comment[no_NY]=Redigering av Qt3-miljø -Comment[oc]=Dessinador d'interfacies Qt3 -Comment[pl]=Projektant interfejsu Qt3 -Comment[pt]=Editor de interfaces do Qt3 -Comment[pt_BR]=Designer de interface Qt3 -Comment[ro]=Dezvoltator de interfeţe Qt3 -Comment[ru]=редактор интерфейсов приложений Qt -Comment[sk]=Qt3 dizajnér rozhrania -Comment[sl]=Snovalnik vmesnikov za Qt3 -Comment[sr]=Dizajner Qt3 interfejsa -Comment[sv]=Editor för gränssnitt till Qt3 -Comment[ta]=Qt À¨¼ôÀ¡Ç÷ -Comment[tr]=Qt3 arayüz tasarım programı -Comment[uk]=Редактор інтерфейсу для Qt -Comment[zh_CN.GB2312]=Qt 界面设计程序 -Comment[zh_TW.Big5]=Qt 介面編輯器 +Exec=tqdesigner +Name=TQt3 Designer +Name[bg]=TQt3 Дизайнер +Name[br]=Ergrafer TQt3 +Name[ca]=Dissenyador TQt3 +Name[cs]=TQt3 designer +Name[de]=TQt3-Designer +Name[eo]=TQt3-Desegnilo +Name[es]=Diseñador TQt3 +Name[et]=TQt3 disainer +Name[eu]=TQt3 Diseinatzailea +Name[gl]=Deseñador de TQt3 +Name[he]=TQt3 בצעמ +Name[it]=Designer TQt3 +Name[ja]=TQt3デザイナー +Name[ko]=TQt3 디자이너 +Name[lv]=TQt3 Dizainers +Name[mk]=TQt3 дизајнер +Name[no]=TQt3-designer +Name[oc]=Dessinador TQt3 +Name[pl]=Projektant TQt3 +Name[sk]=TQt3 Dizajnér +Name[sl]=Snovalnik TQt3 +Name[ta]=TQt3 À¨¼ôÀ¡Ç÷ +Name[uk]=Дизайнер TQt3 +Name[zh_CN.GB2312]=TQt3 设计者 +Name[zh_TW.Big5]=TQt3 設計器 +Comment=TQt3 interface designer +Comment[az]=TQt3 axtar üz dizayn proqramı +Comment[bg]=TQt3 interface дизайнер +Comment[br]=Ergrafer etrefas TQt3 +Comment[ca]=Dissenyador d'interfícies TQt3 +Comment[cs]=Editor UI pro TQt3 +Comment[da]=TQt3 grænseflade designer +Comment[de]=Schnittstellen-Designer für TQt3 +Comment[el]=Σχεδιασμός περιβάλλοντων TQt3 +Comment[eo]=TQt3-Interfacdesegnilo +Comment[es]=Diseñador de interfaces de TQt3 +Comment[et]=TQt3 dialoogide redaktor +Comment[eu]=TQt3 interfaze diseinatzailea +Comment[fi]=TQt3:n käyttöliittymäsuunnittelija +Comment[fr]=Conception d'interfaces avec TQt3 +Comment[gl]=Editor de interfaces de TQt3 +Comment[he]=TQt3-ל םיקשממ בצעמ +Comment[hu]=TQt3 felülettervező +Comment[is]=Viðmótshönnunartól fyrir TQt3 +Comment[it]=Editor per le interfaccie TQt3 +Comment[ja]=TQt3インターフェースデザイナー +Comment[ko]=TQt3 인터페이스 디자이너 +Comment[lt]=TQt3 sąsajos redaktorius +Comment[lv]=TQt3 starsejas dizainers +Comment[mk]=Дизајнер на TQt3 дијалози +Comment[nl]=TQt3 interface-ontwerper +Comment[no]=TQt3-grensesnittdesigner +Comment[no_NY]=Redigering av TQt3-miljø +Comment[oc]=Dessinador d'interfacies TQt3 +Comment[pl]=Projektant interfejsu TQt3 +Comment[pt]=Editor de interfaces do TQt3 +Comment[pt_BR]=Designer de interface TQt3 +Comment[ro]=Dezvoltator de interfeţe TQt3 +Comment[ru]=редактор интерфейсов приложений TQt3 +Comment[sk]=TQt3 dizajnér rozhrania +Comment[sl]=Snovalnik vmesnikov za TQt3 +Comment[sr]=Dizajner TQt3 interfejsa +Comment[sv]=Editor för gränssnitt till TQt3 +Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷ +Comment[tr]=TQt3 arayüz tasarım programı +Comment[uk]=Редактор інтерфейсу для TQt3 +Comment[zh_CN.GB2312]=TQt3 界面设计程序 +Comment[zh_TW.Big5]=TQt3 介面編輯器 MimeType=application/x-designer; Icon=designer Terminal=false diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop index e3a192980..d879d32db 100644 --- a/debian/squeeze/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop +++ b/debian/squeeze/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop @@ -1,23 +1,23 @@ [Desktop Entry] -Exec=linguist-tqt3 -Name=Qt3 Linguist -Name[de]=Qt3-Linguist -Name[eo]=Qt3-Lingvisto -Name[es]=Lingüista Qt3 -Name[ko]=Qt 언어학자 -Name[lv]=Qt3 Lingvists -Comment=Tool for translating message catalogues of Qt3 based programs -Comment[da]=Redskab til at oversætte Qt3 baserede programmer -Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren -Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj -Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3 -Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ -Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához -Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 -Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās -Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program +Exec=tqlinguist +Name=TQt3 Linguist +Name[de]=TQt3-Linguist +Name[eo]=TQt3-Lingvisto +Name[es]=Lingüista TQt3 +Name[ko]=TQt3 언어학자 +Name[lv]=TQt3 Lingvists +Comment=Tool for translating message catalogues of TQt3 based programs +Comment[da]=Redskab til at oversætte TQt3 baserede programmer +Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren +Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj +Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3 +Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ +Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához +Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 +Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās +Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 +Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 +Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program MimeType=application/x-linguist; Terminal=false Icon=linguist diff --git a/debian/squeeze/dependencies/tqt3/debian/maintain/tqt3config.desktop b/debian/squeeze/dependencies/tqt3/debian/maintain/tqt3config.desktop index 3965c1355..b3535c06f 100644 --- a/debian/squeeze/dependencies/tqt3/debian/maintain/tqt3config.desktop +++ b/debian/squeeze/dependencies/tqt3/debian/maintain/tqt3config.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Exec=qtconfig-tqt3 -Name=Qt3 Configuration -Name[de]=Qt3 Konfiguration -Comment=A graphical configuration tool for programs using Qt 3 -Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme +Exec=tqtconfig +Name=TQt3 Configuration +Name[de]=TQt3 Konfiguration +Comment=A graphical configuration tool for programs using TQt 3 +Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme MimeType=application/x-qtconfig; Terminal=false Icon=qtconfig diff --git a/debian/squeeze/dependencies/tqt3/debian/rules b/debian/squeeze/dependencies/tqt3/debian/rules index 2b4eaf3ae..39a2ee31c 100755 --- a/debian/squeeze/dependencies/tqt3/debian/rules +++ b/debian/squeeze/dependencies/tqt3/debian/rules @@ -191,7 +191,7 @@ clean: unpatch fi -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ - config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ + config.status bin/moc bin/tqmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ @@ -360,17 +360,17 @@ binary-arch: build install perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri ## i18n files for designer, linguist and assistant - (cd `pwd`/tools/designer/designer/ && lrelease designer.pro) + (cd `pwd`/tools/designer/designer/ && tqlrelease designer.pro) for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/tqt3-designer/usr/share/tqt3/translations/designer_"$$a".qm; done rm -rf `pwd`/tools/designer/designer/*.qm - (cd `pwd`/tools/assistant/ && lrelease assistant.pro) + (cd `pwd`/tools/assistant/ && tqlrelease assistant.pro) for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/tqt3-assistant/usr/share/tqt3/translations/assistant_"$$a".qm; done rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/assistant_de.qm - (cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro) + (cd `pwd`/tools/linguist/linguist/ && tqlrelease linguist.pro) for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done rm -rf `pwd`/tools/linguist/linguist/*.qm @@ -407,17 +407,6 @@ binary-arch: build install install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz rm -rf `pwd`/src/attic.tar.gz - # rename some binaries to make tqt3/4 installations possible - mv `pwd`/debian/tqt3-designer/usr/bin/designer `pwd`/debian/tqt3-designer/usr/bin/designer-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/uic `pwd`/debian/tqt3-dev-tools/usr/bin/uic-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/moc `pwd`/debian/tqt3-dev-tools/usr/bin/moc-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3 - mv `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig-tqt3 - mv `pwd`/debian/tqt3-assistant/usr/bin/assistant `pwd`/debian/tqt3-assistant/usr/bin/assistant-tqt3 - mv `pwd`/debian/tqt3-linguist/usr/bin/linguist `pwd`/debian/tqt3-linguist/usr/bin/linguist-tqt3 - install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1 install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1 install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1 @@ -432,8 +421,8 @@ binary-arch: build install for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done # install the qmake binary - rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/qmake - install -D `pwd`/qmake/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3 + rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake + install -D `pwd`/qmake/tqmake `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake # Install source for the designer tools, such as createcw. cp -ra tools/designer/tools debian/tqt3-designer/usr/share/tqt3/tools diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install index 3ec2f74fa..f393e405a 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install @@ -1,3 +1,3 @@ -usr/bin/assistant +usr/bin/tqassistant usr/share/tqt3/doc/html/assistant*html usr/share/tqt3/doc/html/assistant*dcf diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.links index 909b4681d..5244653a5 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.links +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.links @@ -1 +1 @@ -/usr/bin/assistant-tqt3 /usr/share/tqt3/bin/assistant +/usr/bin/tqassistant /usr/share/tqt3/bin/tqassistant diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.menu index 0706262b5..d59f83bd0 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.menu +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.menu @@ -2,5 +2,5 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Assistant"\ - command="/usr/bin/assistant-tqt3" + title="TQt3 Assistant"\ + command="/usr/bin/tqassistant" diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.postinst index c8b6ca8b3..041457133 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.postinst +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.postinst @@ -3,6 +3,6 @@ set -e update-alternatives --install \ - /usr/bin/assistant assistant "/usr/bin/assistant-tqt3" "45" \ + /usr/bin/assistant assistant "/usr/bin/tqassistant" "45" \ #DEBHELPER# diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.prerm index 1a45c259c..36371091e 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.prerm +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove assistant "/usr/bin/assistant-tqt3" + update-alternatives --remove assistant "/usr/bin/tqassistant" ;; esac diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install index f2db61219..555f8b9b4 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install @@ -1,4 +1,4 @@ -usr/bin/designer +usr/bin/tqdesigner usr/bin/createcw usr/bin/conv2ui usr/share/tqt3/templates/* diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.links index 550d68ec0..19922f299 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.links +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.links @@ -1 +1 @@ -/usr/bin/designer-tqt3 /usr/share/tqt3/bin/designer +/usr/bin/tqdesigner /usr/share/tqt3/bin/tqdesigner diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.menu index d3c55b41a..be078bd49 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.menu +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.menu @@ -2,6 +2,6 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Designer"\ - command="/usr/bin/designer-tqt3" + title="TQt3 Designer"\ + command="/usr/bin/tqdesigner" diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.postinst index bbbd836d0..91d69ce08 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.postinst +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/designer designer "/usr/bin/designer-tqt3" "45" \ + /usr/bin/designer designer "/usr/bin/tqdesigner" "45" \ --slave /usr/share/man/man1/designer.1.gz designer.1.gz \ "/usr/share/man/man1/designer-tqt3.1.gz" diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.prerm index 14497092e..93376ef35 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.prerm +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove designer "/usr/bin/designer-tqt3" + update-alternatives --remove designer "/usr/bin/tqdesigner" ;; esac diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.install index d496d35b9..3c795661b 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.install @@ -1,9 +1,9 @@ usr/share/tqt3/mkspecs/* usr/share/tqt3/doc/html/qmake*html usr/share/tqt3/doc/html/qmake*dcf -usr/bin/qmake -usr/bin/lupdate -usr/bin/lrelease -usr/bin/uic -usr/bin/moc -usr/bin/qembed +usr/bin/tqmake +usr/bin/tqlupdate +usr/bin/tqlrelease +usr/bin/tquic +usr/bin/tqmoc +usr/bin/tqembed diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.links index 0de57d25d..073720d2b 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.links +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.links @@ -1,7 +1,7 @@ /usr/share/tqt3/mkspecs/linux-g++ /usr/share/tqt3/mkspecs/default -/usr/bin/qmake-tqt3 /usr/share/tqt3/bin/qmake -/usr/bin/lupdate-tqt3 /usr/share/tqt3/bin/lupdate -/usr/bin/lrelease-tqt3 /usr/share/tqt3/bin/lrelease -/usr/bin/uic-tqt3 /usr/share/tqt3/bin/uic -/usr/bin/moc-tqt3 /usr/share/tqt3/bin/moc -/usr/bin/qembed /usr/share/tqt3/bin/qembed +/usr/bin/tqmake /usr/share/tqt3/bin/tqmake +/usr/bin/tqlupdate /usr/share/tqt3/bin/tqlupdate +/usr/bin/tqlrelease /usr/share/tqt3/bin/tqlrelease +/usr/bin/tquic /usr/share/tqt3/bin/tquic +/usr/bin/tqmoc /usr/share/tqt3/bin/tqmoc +/usr/bin/tqembed /usr/share/tqt3/bin/tqembed diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.postinst index 75022d56f..b6c833de8 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.postinst +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.postinst @@ -3,26 +3,26 @@ set -e update-alternatives --install \ - /usr/bin/moc moc "/usr/bin/moc-tqt3" "45" \ + /usr/bin/moc moc "/usr/bin/tqmoc" "45" \ --slave /usr/share/man/man1/moc.1.gz moc.1.gz \ "/usr/share/man/man1/moc-tqt3.1.gz" update-alternatives --install \ - /usr/bin/uic uic "/usr/bin/uic-tqt3" "45" \ + /usr/bin/uic uic "/usr/bin/tquic" "45" \ --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ "/usr/share/man/man1/uic-tqt3.1.gz" update-alternatives --install \ - /usr/bin/lupdate lupdate "/usr/bin/lupdate-tqt3" "45" \ + /usr/bin/lupdate lupdate "/usr/bin/tqlupdate" "45" \ --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ "/usr/share/man/man1/lupdate-tqt3.1.gz" - + update-alternatives --install \ - /usr/bin/lrelease lrelease "/usr/bin/lrelease-tqt3" "45" \ + /usr/bin/lrelease lrelease "/usr/bin/tqlrelease" "45" \ --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ "/usr/share/man/man1/lrelease-tqt3.1.gz" update-alternatives --install \ - /usr/bin/qmake qmake "/usr/bin/qmake-tqt3" "45" \ + /usr/bin/qmake qmake "/usr/bin/tqmake" "45" \ #DEBHELPER# diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.prerm index c0a69bfe9..0ec40c9e9 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.prerm +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-dev-tools.prerm @@ -5,11 +5,11 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove moc "/usr/bin/moc-tqt3" - update-alternatives --remove uic "/usr/bin/uic-tqt3" - update-alternatives --remove lupdate "/usr/bin/lupdate-tqt3" - update-alternatives --remove lrelease "/usr/bin/lrelease-tqt3" - update-alternatives --remove qmake "/usr/bin/qmake-tqt3" + update-alternatives --remove moc "/usr/bin/tqmoc" + update-alternatives --remove uic "/usr/bin/tquic" + update-alternatives --remove lupdate "/usr/bin/tqlupdate" + update-alternatives --remove lrelease "/usr/bin/tqlrelease" + update-alternatives --remove qmake "/usr/bin/tqmake" ;; esac diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.install index 7484d8534..8602850aa 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.install @@ -1,4 +1,4 @@ -usr/bin/linguist +usr/bin/tqlinguist usr/share/tqt3/phrasebooks/* usr/share/tqt3/doc/html/linguist*html usr/share/tqt3/doc/html/linguist*dcf diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.links index aa157aded..4fa700555 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.links +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.links @@ -1 +1 @@ -/usr/bin/linguist-tqt3 /usr/share/tqt3/bin/linguist +/usr/bin/tqlinguist /usr/share/tqt3/bin/tqlinguist diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.menu index faf1b8eae..976cb4b3c 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.menu +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.menu @@ -2,5 +2,5 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Linguist"\ - command="/usr/bin/linguist-tqt3" + title="TQt3 Linguist"\ + command="/usr/bin/tqlinguist" diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.postinst index 1dadc79df..4c51e97bf 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.postinst +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/linguist linguist "/usr/bin/linguist-tqt3" "45" \ + /usr/bin/linguist linguist "/usr/bin/tqlinguist" "45" \ --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \ "/usr/share/man/man1/linguist-tqt3.1.gz" diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.prerm index 38de53b13..47d704eb8 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.prerm +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-linguist.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove linguist "/usr/bin/linguist-tqt3" + update-alternatives --remove linguist "/usr/bin/tqlinguist" ;; esac diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.install index 8fcee756b..a1ae089bc 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.install @@ -1 +1 @@ -usr/bin/qtconfig +usr/bin/tqtconfig diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.links index 52e4d5473..eb6dd21c0 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.links +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.links @@ -1 +1 @@ -/usr/bin/qtconfig-tqt3 /usr/share/tqt3/bin/qtconfig +/usr/bin/tqtconfig /usr/share/tqt3/bin/tqtconfig diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.menu b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.menu index e567b050b..79f2ff8e5 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.menu +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.menu @@ -1,8 +1,8 @@ ?package(tqt3-qtconfig):\ needs="x11"\ section="Applications/System/Administration"\ - title="Qt3 Config"\ - longtitle="Qt3 Configuration Utility"\ - hints="Qt3 config tool"\ - command="/usr/bin/qtconfig-tqt3" + title="TQt3 Config"\ + longtitle="TQt3 Configuration Utility"\ + hints="TQt3 config tool"\ + command="/usr/bin/tqtconfig" diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.postinst index 9449d5b8a..68671a6ef 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.postinst +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-tqt3" "45" \ + /usr/bin/qtconfig qtconfig "/usr/bin/tqtconfig" "45" \ --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \ "/usr/share/man/man1/qtconfig-tqt3.1.gz" diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.prerm index 810bc0a93..27f898ea3 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.prerm +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-qtconfig.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove qtconfig "/usr/bin/qtconfig-tqt3" + update-alternatives --remove qtconfig "/usr/bin/tqtconfig" ;; esac diff --git a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff index 00cc8ca37..a45290729 100644 --- a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,14 +1,14 @@ --- starttde +++ starttde -@@ -228,17 +228,17 @@ - . $tdehome/share/config/startupconfig +@@ -288,17 +288,17 @@ + . "$tdehome/share/config/startupconfig" fi -# Make sure a default wallpaper is set. --if [ ! -e $tdehome/share/config/kdesktoprc ]; then +-if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then - # With Trinity this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then --cat >$tdehome/share/config/kdesktoprc <<EOF +-cat >"$tdehome/share/config/kdesktoprc" <<EOF -[Desktop0] -Wallpaper=isadora.png -WallpaperMode=Scaled @@ -16,10 +16,10 @@ - fi -fi +## Make sure a default wallpaper is set. -+#if [ ! -e $tdehome/share/config/kdesktoprc ]; then ++#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then +# # With Trinity this file should exist, but test first. +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -+#cat >$tdehome/share/config/kdesktoprc <<EOF ++#cat >"$tdehome/share/config/kdesktoprc" <<EOF +#[Desktop0] +#Wallpaper=isadora.png +#WallpaperMode=Scaled diff --git a/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install b/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install index 80c782628..f737043af 100644 --- a/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install +++ b/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install @@ -1,4 +1,4 @@ debian/tmp/opt/trinity/include/poppler-link-qt3.h debian/tmp/opt/trinity/include/poppler-page-transition.h debian/tmp/opt/trinity/include/poppler-qt.h -debian/opt/trinity/lib/pkgconfig/poppler-tqt.pc +debian/tmp/opt/trinity/lib/pkgconfig/poppler-tqt.pc diff --git a/debian/squeeze/tdewebdev/debian/control b/debian/squeeze/tdewebdev/debian/control index 44a90830b..f3c83ae1d 100644 --- a/debian/squeeze/tdewebdev/debian/control +++ b/debian/squeeze/tdewebdev/debian/control @@ -171,7 +171,7 @@ Architecture: any Section: libdevel Replaces: kommander-trinity-dev (<< 4:14.0.0) Breaks: kommander-trinity-dev (<< 4:14.0.0) -Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev +Depends: kommander-trinity (= ${binary:Version}), tdelibs4-trinity-dev Description: development files for Kommander [Trinity] This package contains the headers and other development files for building plugins or otherwise extending Kommander. diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop index 9ac108108..3072b99aa 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop +++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Exec=assistant-tqt3 -Name=Qt3 Assistant -Name[de]=Qt3 Assistent -Comment=Qt3 Helpcenter -Comment[de]= Qt3 Hilfezentrum +Exec=tqassistant +Name=TQt3 Assistant +Name[de]=TQt3 Assistent +Comment=TQt3 Helpcenter +Comment[de]= TQt3 Hilfezentrum MimeType=application/x-assistant; Icon=assistant Terminal=false diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop index 2872906ab..cc95cead5 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop +++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/designer-tqt3.desktop @@ -1,75 +1,75 @@ [Desktop Entry] Encoding=UTF-8 -Exec=designer-tqt3 -Name=Qt3 Designer -Name[bg]=Qt3 Дизайнер -Name[br]=Ergrafer Qt3 -Name[ca]=Dissenyador Qt3 -Name[cs]=Qt3 designer -Name[de]=Qt3-Designer -Name[eo]=Qt3-Desegnilo -Name[es]=Diseñador Qt3 -Name[et]=Qt3 disainer -Name[eu]=Qt3 Diseinatzailea -Name[gl]=Deseñador de Qt3 -Name[he]=Qt בצעמ -Name[it]=Designer Qt3 -Name[ja]=Qtデザイナー -Name[ko]=Qt 디자이너 -Name[lv]=Qt3 Dizainers -Name[mk]=Qt дизајнер -Name[no]=Qt3-designer -Name[oc]=Dessinador Qt3 -Name[pl]=Projektant Qt3 -Name[sk]=Qt3 Dizajnér -Name[sl]=Snovalnik Qt3 -Name[ta]=Qt À¨¼ôÀ¡Ç÷ -Name[uk]=Дизайнер Qt -Name[zh_CN.GB2312]=Qt 设计者 -Name[zh_TW.Big5]=Qt 設計器 -Comment=Qt3 interface designer -Comment[az]=Qt3 axtar üz dizayn proqramı -Comment[bg]=Qt3 interface дизайнер -Comment[br]=Ergrafer etrefas Qt3 -Comment[ca]=Dissenyador d'interfícies Qt3 -Comment[cs]=Editor UI pro Qt3 -Comment[da]=Qt3 grænseflade designer -Comment[de]=Schnittstellen-Designer für Qt3 -Comment[el]=Σχεδιασμός περιβάλλοντων Qt -Comment[eo]=Qt3-Interfacdesegnilo -Comment[es]=Diseñador de interfaces de Qt3 -Comment[et]=Qt3 dialoogide redaktor -Comment[eu]=Qt3 interfaze diseinatzailea -Comment[fi]=Qt:n käyttöliittymäsuunnittelija -Comment[fr]=Conception d'interfaces avec Qt3 -Comment[gl]=Editor de interfaces de Qt3 -Comment[he]=Qt-ל םיקשממ בצעמ -Comment[hu]=Qt3 felülettervező -Comment[is]=Viðmótshönnunartól fyrir Qt3 -Comment[it]=Editor per le interfaccie Qt3 -Comment[ja]=Qtインターフェースデザイナー -Comment[ko]=Qt 인터페이스 디자이너 -Comment[lt]=Qt3 sąsajos redaktorius -Comment[lv]=Qt3 starsejas dizainers -Comment[mk]=Дизајнер на Qt дијалози -Comment[nl]=Qt3 interface-ontwerper -Comment[no]=Qt3-grensesnittdesigner -Comment[no_NY]=Redigering av Qt3-miljø -Comment[oc]=Dessinador d'interfacies Qt3 -Comment[pl]=Projektant interfejsu Qt3 -Comment[pt]=Editor de interfaces do Qt3 -Comment[pt_BR]=Designer de interface Qt3 -Comment[ro]=Dezvoltator de interfeţe Qt3 -Comment[ru]=редактор интерфейсов приложений Qt -Comment[sk]=Qt3 dizajnér rozhrania -Comment[sl]=Snovalnik vmesnikov za Qt3 -Comment[sr]=Dizajner Qt3 interfejsa -Comment[sv]=Editor för gränssnitt till Qt3 -Comment[ta]=Qt À¨¼ôÀ¡Ç÷ -Comment[tr]=Qt3 arayüz tasarım programı -Comment[uk]=Редактор інтерфейсу для Qt -Comment[zh_CN.GB2312]=Qt 界面设计程序 -Comment[zh_TW.Big5]=Qt 介面編輯器 +Exec=tqdesigner +Name=TQt3 Designer +Name[bg]=TQt3 Дизайнер +Name[br]=Ergrafer TQt3 +Name[ca]=Dissenyador TQt3 +Name[cs]=TQt3 designer +Name[de]=TQt3-Designer +Name[eo]=TQt3-Desegnilo +Name[es]=Diseñador TQt3 +Name[et]=TQt3 disainer +Name[eu]=TQt3 Diseinatzailea +Name[gl]=Deseñador de TQt3 +Name[he]=TQt3 בצעמ +Name[it]=Designer TQt3 +Name[ja]=TQt3デザイナー +Name[ko]=TQt3 디자이너 +Name[lv]=TQt3 Dizainers +Name[mk]=TQt3 дизајнер +Name[no]=TQt3-designer +Name[oc]=Dessinador TQt3 +Name[pl]=Projektant TQt3 +Name[sk]=TQt3 Dizajnér +Name[sl]=Snovalnik TQt3 +Name[ta]=TQt3 À¨¼ôÀ¡Ç÷ +Name[uk]=Дизайнер TQt3 +Name[zh_CN.GB2312]=TQt3 设计者 +Name[zh_TW.Big5]=TQt3 設計器 +Comment=TQt3 interface designer +Comment[az]=TQt3 axtar üz dizayn proqramı +Comment[bg]=TQt3 interface дизайнер +Comment[br]=Ergrafer etrefas TQt3 +Comment[ca]=Dissenyador d'interfícies TQt3 +Comment[cs]=Editor UI pro TQt3 +Comment[da]=TQt3 grænseflade designer +Comment[de]=Schnittstellen-Designer für TQt3 +Comment[el]=Σχεδιασμός περιβάλλοντων TQt3 +Comment[eo]=TQt3-Interfacdesegnilo +Comment[es]=Diseñador de interfaces de TQt3 +Comment[et]=TQt3 dialoogide redaktor +Comment[eu]=TQt3 interfaze diseinatzailea +Comment[fi]=TQt3:n käyttöliittymäsuunnittelija +Comment[fr]=Conception d'interfaces avec TQt3 +Comment[gl]=Editor de interfaces de TQt3 +Comment[he]=TQt3-ל םיקשממ בצעמ +Comment[hu]=TQt3 felülettervező +Comment[is]=Viðmótshönnunartól fyrir TQt3 +Comment[it]=Editor per le interfaccie TQt3 +Comment[ja]=TQt3インターフェースデザイナー +Comment[ko]=TQt3 인터페이스 디자이너 +Comment[lt]=TQt3 sąsajos redaktorius +Comment[lv]=TQt3 starsejas dizainers +Comment[mk]=Дизајнер на TQt3 дијалози +Comment[nl]=TQt3 interface-ontwerper +Comment[no]=TQt3-grensesnittdesigner +Comment[no_NY]=Redigering av TQt3-miljø +Comment[oc]=Dessinador d'interfacies TQt3 +Comment[pl]=Projektant interfejsu TQt3 +Comment[pt]=Editor de interfaces do TQt3 +Comment[pt_BR]=Designer de interface TQt3 +Comment[ro]=Dezvoltator de interfeţe TQt3 +Comment[ru]=редактор интерфейсов приложений TQt3 +Comment[sk]=TQt3 dizajnér rozhrania +Comment[sl]=Snovalnik vmesnikov za TQt3 +Comment[sr]=Dizajner TQt3 interfejsa +Comment[sv]=Editor för gränssnitt till TQt3 +Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷ +Comment[tr]=TQt3 arayüz tasarım programı +Comment[uk]=Редактор інтерфейсу для TQt3 +Comment[zh_CN.GB2312]=TQt3 界面设计程序 +Comment[zh_TW.Big5]=TQt3 介面編輯器 MimeType=application/x-designer; Icon=designer Terminal=false diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop index e3a192980..d879d32db 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop +++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop @@ -1,23 +1,23 @@ [Desktop Entry] -Exec=linguist-tqt3 -Name=Qt3 Linguist -Name[de]=Qt3-Linguist -Name[eo]=Qt3-Lingvisto -Name[es]=Lingüista Qt3 -Name[ko]=Qt 언어학자 -Name[lv]=Qt3 Lingvists -Comment=Tool for translating message catalogues of Qt3 based programs -Comment[da]=Redskab til at oversætte Qt3 baserede programmer -Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren -Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj -Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3 -Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ -Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához -Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 -Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās -Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3 -Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program +Exec=tqlinguist +Name=TQt3 Linguist +Name[de]=TQt3-Linguist +Name[eo]=TQt3-Lingvisto +Name[es]=Lingüista TQt3 +Name[ko]=TQt3 언어학자 +Name[lv]=TQt3 Lingvists +Comment=Tool for translating message catalogues of TQt3 based programs +Comment[da]=Redskab til at oversætte TQt3 baserede programmer +Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren +Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj +Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3 +Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ +Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához +Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 +Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās +Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 +Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 +Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program MimeType=application/x-linguist; Terminal=false Icon=linguist diff --git a/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop b/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop index 3965c1355..b3535c06f 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop +++ b/ubuntu/maverick/dependencies/tqt3/debian/maintain/tqt3config.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Exec=qtconfig-tqt3 -Name=Qt3 Configuration -Name[de]=Qt3 Konfiguration -Comment=A graphical configuration tool for programs using Qt 3 -Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme +Exec=tqtconfig +Name=TQt3 Configuration +Name[de]=TQt3 Konfiguration +Comment=A graphical configuration tool for programs using TQt 3 +Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme MimeType=application/x-qtconfig; Terminal=false Icon=qtconfig diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules index 2b4eaf3ae..39a2ee31c 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/debian/rules @@ -191,7 +191,7 @@ clean: unpatch fi -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ - config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ + config.status bin/moc bin/tqmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ src/tools/qconfig.cpp include/ntqconfig.h include/ntqmodules.h plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \ @@ -360,17 +360,17 @@ binary-arch: build install perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri ## i18n files for designer, linguist and assistant - (cd `pwd`/tools/designer/designer/ && lrelease designer.pro) + (cd `pwd`/tools/designer/designer/ && tqlrelease designer.pro) for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/tqt3-designer/usr/share/tqt3/translations/designer_"$$a".qm; done rm -rf `pwd`/tools/designer/designer/*.qm - (cd `pwd`/tools/assistant/ && lrelease assistant.pro) + (cd `pwd`/tools/assistant/ && tqlrelease assistant.pro) for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/tqt3-assistant/usr/share/tqt3/translations/assistant_"$$a".qm; done rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libtqt3-i18n/usr/share/tqt3/translations/assistant_de.qm - (cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro) + (cd `pwd`/tools/linguist/linguist/ && tqlrelease linguist.pro) for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \ install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done rm -rf `pwd`/tools/linguist/linguist/*.qm @@ -407,17 +407,6 @@ binary-arch: build install install -D `pwd`/src/attic.tar.gz `pwd`/debian/libtqt3-compat-headers/usr/share/doc/libtqt3-compat-headers/attic.tar.gz rm -rf `pwd`/src/attic.tar.gz - # rename some binaries to make tqt3/4 installations possible - mv `pwd`/debian/tqt3-designer/usr/bin/designer `pwd`/debian/tqt3-designer/usr/bin/designer-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/uic `pwd`/debian/tqt3-dev-tools/usr/bin/uic-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/moc `pwd`/debian/tqt3-dev-tools/usr/bin/moc-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate `pwd`/debian/tqt3-dev-tools/usr/bin/lupdate-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease `pwd`/debian/tqt3-dev-tools/usr/bin/lrelease-tqt3 - mv `pwd`/debian/tqt3-dev-tools/usr/bin/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3 - mv `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig `pwd`/debian/tqt3-qtconfig/usr/bin/qtconfig-tqt3 - mv `pwd`/debian/tqt3-assistant/usr/bin/assistant `pwd`/debian/tqt3-assistant/usr/bin/assistant-tqt3 - mv `pwd`/debian/tqt3-linguist/usr/bin/linguist `pwd`/debian/tqt3-linguist/usr/bin/linguist-tqt3 - install -D doc/man/man1/moc.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/moc-tqt3.1 install -D doc/man/man1/uic.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/uic-tqt3.1 install -D doc/man/man1/lrelease.1 `pwd`/debian/tqt3-dev-tools/usr/share/man/man1/lrelease-tqt3.1 @@ -432,8 +421,8 @@ binary-arch: build install for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done # install the qmake binary - rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/qmake - install -D `pwd`/qmake/qmake `pwd`/debian/tqt3-dev-tools/usr/bin/qmake-tqt3 + rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake + install -D `pwd`/qmake/tqmake `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake # Install source for the designer tools, such as createcw. cp -ra tools/designer/tools debian/tqt3-designer/usr/share/tqt3/tools diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install index 3ec2f74fa..f393e405a 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install @@ -1,3 +1,3 @@ -usr/bin/assistant +usr/bin/tqassistant usr/share/tqt3/doc/html/assistant*html usr/share/tqt3/doc/html/assistant*dcf diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links index 909b4681d..5244653a5 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.links @@ -1 +1 @@ -/usr/bin/assistant-tqt3 /usr/share/tqt3/bin/assistant +/usr/bin/tqassistant /usr/share/tqt3/bin/tqassistant diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu index 0706262b5..d59f83bd0 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.menu @@ -2,5 +2,5 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Assistant"\ - command="/usr/bin/assistant-tqt3" + title="TQt3 Assistant"\ + command="/usr/bin/tqassistant" diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst index c8b6ca8b3..041457133 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.postinst @@ -3,6 +3,6 @@ set -e update-alternatives --install \ - /usr/bin/assistant assistant "/usr/bin/assistant-tqt3" "45" \ + /usr/bin/assistant assistant "/usr/bin/tqassistant" "45" \ #DEBHELPER# diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm index 1a45c259c..36371091e 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove assistant "/usr/bin/assistant-tqt3" + update-alternatives --remove assistant "/usr/bin/tqassistant" ;; esac diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install index f2db61219..555f8b9b4 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install @@ -1,4 +1,4 @@ -usr/bin/designer +usr/bin/tqdesigner usr/bin/createcw usr/bin/conv2ui usr/share/tqt3/templates/* diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links index 550d68ec0..19922f299 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.links @@ -1 +1 @@ -/usr/bin/designer-tqt3 /usr/share/tqt3/bin/designer +/usr/bin/tqdesigner /usr/share/tqt3/bin/tqdesigner diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu index d3c55b41a..be078bd49 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.menu @@ -2,6 +2,6 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Designer"\ - command="/usr/bin/designer-tqt3" + title="TQt3 Designer"\ + command="/usr/bin/tqdesigner" diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst index bbbd836d0..91d69ce08 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/designer designer "/usr/bin/designer-tqt3" "45" \ + /usr/bin/designer designer "/usr/bin/tqdesigner" "45" \ --slave /usr/share/man/man1/designer.1.gz designer.1.gz \ "/usr/share/man/man1/designer-tqt3.1.gz" diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm index 14497092e..93376ef35 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove designer "/usr/bin/designer-tqt3" + update-alternatives --remove designer "/usr/bin/tqdesigner" ;; esac diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install index d496d35b9..3c795661b 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.install @@ -1,9 +1,9 @@ usr/share/tqt3/mkspecs/* usr/share/tqt3/doc/html/qmake*html usr/share/tqt3/doc/html/qmake*dcf -usr/bin/qmake -usr/bin/lupdate -usr/bin/lrelease -usr/bin/uic -usr/bin/moc -usr/bin/qembed +usr/bin/tqmake +usr/bin/tqlupdate +usr/bin/tqlrelease +usr/bin/tquic +usr/bin/tqmoc +usr/bin/tqembed diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links index 0de57d25d..073720d2b 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.links @@ -1,7 +1,7 @@ /usr/share/tqt3/mkspecs/linux-g++ /usr/share/tqt3/mkspecs/default -/usr/bin/qmake-tqt3 /usr/share/tqt3/bin/qmake -/usr/bin/lupdate-tqt3 /usr/share/tqt3/bin/lupdate -/usr/bin/lrelease-tqt3 /usr/share/tqt3/bin/lrelease -/usr/bin/uic-tqt3 /usr/share/tqt3/bin/uic -/usr/bin/moc-tqt3 /usr/share/tqt3/bin/moc -/usr/bin/qembed /usr/share/tqt3/bin/qembed +/usr/bin/tqmake /usr/share/tqt3/bin/tqmake +/usr/bin/tqlupdate /usr/share/tqt3/bin/tqlupdate +/usr/bin/tqlrelease /usr/share/tqt3/bin/tqlrelease +/usr/bin/tquic /usr/share/tqt3/bin/tquic +/usr/bin/tqmoc /usr/share/tqt3/bin/tqmoc +/usr/bin/tqembed /usr/share/tqt3/bin/tqembed diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst index 75022d56f..b6c833de8 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.postinst @@ -3,26 +3,26 @@ set -e update-alternatives --install \ - /usr/bin/moc moc "/usr/bin/moc-tqt3" "45" \ + /usr/bin/moc moc "/usr/bin/tqmoc" "45" \ --slave /usr/share/man/man1/moc.1.gz moc.1.gz \ "/usr/share/man/man1/moc-tqt3.1.gz" update-alternatives --install \ - /usr/bin/uic uic "/usr/bin/uic-tqt3" "45" \ + /usr/bin/uic uic "/usr/bin/tquic" "45" \ --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ "/usr/share/man/man1/uic-tqt3.1.gz" update-alternatives --install \ - /usr/bin/lupdate lupdate "/usr/bin/lupdate-tqt3" "45" \ + /usr/bin/lupdate lupdate "/usr/bin/tqlupdate" "45" \ --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ "/usr/share/man/man1/lupdate-tqt3.1.gz" - + update-alternatives --install \ - /usr/bin/lrelease lrelease "/usr/bin/lrelease-tqt3" "45" \ + /usr/bin/lrelease lrelease "/usr/bin/tqlrelease" "45" \ --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ "/usr/share/man/man1/lrelease-tqt3.1.gz" update-alternatives --install \ - /usr/bin/qmake qmake "/usr/bin/qmake-tqt3" "45" \ + /usr/bin/qmake qmake "/usr/bin/tqmake" "45" \ #DEBHELPER# diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm index c0a69bfe9..0ec40c9e9 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-dev-tools.prerm @@ -5,11 +5,11 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove moc "/usr/bin/moc-tqt3" - update-alternatives --remove uic "/usr/bin/uic-tqt3" - update-alternatives --remove lupdate "/usr/bin/lupdate-tqt3" - update-alternatives --remove lrelease "/usr/bin/lrelease-tqt3" - update-alternatives --remove qmake "/usr/bin/qmake-tqt3" + update-alternatives --remove moc "/usr/bin/tqmoc" + update-alternatives --remove uic "/usr/bin/tquic" + update-alternatives --remove lupdate "/usr/bin/tqlupdate" + update-alternatives --remove lrelease "/usr/bin/tqlrelease" + update-alternatives --remove qmake "/usr/bin/tqmake" ;; esac diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install index 7484d8534..8602850aa 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.install @@ -1,4 +1,4 @@ -usr/bin/linguist +usr/bin/tqlinguist usr/share/tqt3/phrasebooks/* usr/share/tqt3/doc/html/linguist*html usr/share/tqt3/doc/html/linguist*dcf diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links index aa157aded..4fa700555 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.links @@ -1 +1 @@ -/usr/bin/linguist-tqt3 /usr/share/tqt3/bin/linguist +/usr/bin/tqlinguist /usr/share/tqt3/bin/tqlinguist diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu index faf1b8eae..976cb4b3c 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.menu @@ -2,5 +2,5 @@ needs="x11"\ section="Applications/Programming"\ hints="TDE"\ - title="Qt3 Linguist"\ - command="/usr/bin/linguist-tqt3" + title="TQt3 Linguist"\ + command="/usr/bin/tqlinguist" diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst index 1dadc79df..4c51e97bf 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/linguist linguist "/usr/bin/linguist-tqt3" "45" \ + /usr/bin/linguist linguist "/usr/bin/tqlinguist" "45" \ --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \ "/usr/share/man/man1/linguist-tqt3.1.gz" diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm index 38de53b13..47d704eb8 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-linguist.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove linguist "/usr/bin/linguist-tqt3" + update-alternatives --remove linguist "/usr/bin/tqlinguist" ;; esac diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install index 8fcee756b..a1ae089bc 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.install @@ -1 +1 @@ -usr/bin/qtconfig +usr/bin/tqtconfig diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links index 52e4d5473..eb6dd21c0 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.links @@ -1 +1 @@ -/usr/bin/qtconfig-tqt3 /usr/share/tqt3/bin/qtconfig +/usr/bin/tqtconfig /usr/share/tqt3/bin/tqtconfig diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu index e567b050b..79f2ff8e5 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.menu @@ -1,8 +1,8 @@ ?package(tqt3-qtconfig):\ needs="x11"\ section="Applications/System/Administration"\ - title="Qt3 Config"\ - longtitle="Qt3 Configuration Utility"\ - hints="Qt3 config tool"\ - command="/usr/bin/qtconfig-tqt3" + title="TQt3 Config"\ + longtitle="TQt3 Configuration Utility"\ + hints="TQt3 config tool"\ + command="/usr/bin/tqtconfig" diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst index 9449d5b8a..68671a6ef 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.postinst @@ -3,7 +3,7 @@ set -e update-alternatives --install \ - /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-tqt3" "45" \ + /usr/bin/qtconfig qtconfig "/usr/bin/tqtconfig" "45" \ --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \ "/usr/share/man/man1/qtconfig-tqt3.1.gz" diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm index 810bc0a93..27f898ea3 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-qtconfig.prerm @@ -5,7 +5,7 @@ set -e case "$1" in upgrade) ;; remove|failed-upgrade|deconfigure) - update-alternatives --remove qtconfig "/usr/bin/qtconfig-tqt3" + update-alternatives --remove qtconfig "/usr/bin/tqtconfig" ;; esac diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 00cc8ca37..a45290729 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,14 +1,14 @@ --- starttde +++ starttde -@@ -228,17 +228,17 @@ - . $tdehome/share/config/startupconfig +@@ -288,17 +288,17 @@ + . "$tdehome/share/config/startupconfig" fi -# Make sure a default wallpaper is set. --if [ ! -e $tdehome/share/config/kdesktoprc ]; then +-if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then - # With Trinity this file should exist, but test first. - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then --cat >$tdehome/share/config/kdesktoprc <<EOF +-cat >"$tdehome/share/config/kdesktoprc" <<EOF -[Desktop0] -Wallpaper=isadora.png -WallpaperMode=Scaled @@ -16,10 +16,10 @@ - fi -fi +## Make sure a default wallpaper is set. -+#if [ ! -e $tdehome/share/config/kdesktoprc ]; then ++#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then +# # With Trinity this file should exist, but test first. +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then -+#cat >$tdehome/share/config/kdesktoprc <<EOF ++#cat >"$tdehome/share/config/kdesktoprc" <<EOF +#[Desktop0] +#Wallpaper=isadora.png +#WallpaperMode=Scaled diff --git a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install b/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install index 80c782628..f737043af 100644 --- a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install +++ b/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install @@ -1,4 +1,4 @@ debian/tmp/opt/trinity/include/poppler-link-qt3.h debian/tmp/opt/trinity/include/poppler-page-transition.h debian/tmp/opt/trinity/include/poppler-qt.h -debian/opt/trinity/lib/pkgconfig/poppler-tqt.pc +debian/tmp/opt/trinity/lib/pkgconfig/poppler-tqt.pc diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control index 44a90830b..f3c83ae1d 100644 --- a/ubuntu/maverick/tdewebdev/debian/control +++ b/ubuntu/maverick/tdewebdev/debian/control @@ -171,7 +171,7 @@ Architecture: any Section: libdevel Replaces: kommander-trinity-dev (<< 4:14.0.0) Breaks: kommander-trinity-dev (<< 4:14.0.0) -Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev +Depends: kommander-trinity (= ${binary:Version}), tdelibs4-trinity-dev Description: development files for Kommander [Trinity] This package contains the headers and other development files for building plugins or otherwise extending Kommander. |