[Pkg-kde-commits] rev 1678 - in trunk/packages/qt-x11-free/debian:
. maintain
Adeodato Simó
adeodato at costa.debian.org
Sun Sep 4 23:28:26 UTC 2005
Author: adeodato
Date: 2005-09-04 23:28:25 +0000 (Sun, 04 Sep 2005)
New Revision: 1678
Added:
trunk/packages/qt-x11-free/debian/maintain/assistant-qt3.desktop
trunk/packages/qt-x11-free/debian/maintain/linguist-qt3.desktop
trunk/packages/qt-x11-free/debian/maintain/qt3config.desktop
trunk/packages/qt-x11-free/debian/qt3-assistant.postinst
trunk/packages/qt-x11-free/debian/qt3-assistant.prerm
trunk/packages/qt-x11-free/debian/qt3-linguist.postinst
trunk/packages/qt-x11-free/debian/qt3-linguist.prerm
trunk/packages/qt-x11-free/debian/qt3-qtconfig.postinst
trunk/packages/qt-x11-free/debian/qt3-qtconfig.prerm
Removed:
trunk/packages/qt-x11-free/debian/maintain/assistant.desktop
trunk/packages/qt-x11-free/debian/maintain/linguist.desktop
trunk/packages/qt-x11-free/debian/maintain/qtconfig.desktop
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/maintain/designer-qt3.desktop
trunk/packages/qt-x11-free/debian/qt3-assistant.menu
trunk/packages/qt-x11-free/debian/qt3-designer.menu
trunk/packages/qt-x11-free/debian/qt3-designer.postinst
trunk/packages/qt-x11-free/debian/qt3-dev-tools.links
trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst
trunk/packages/qt-x11-free/debian/qt3-dev-tools.prerm
trunk/packages/qt-x11-free/debian/qt3-linguist.menu
trunk/packages/qt-x11-free/debian/qt3-qtconfig.menu
trunk/packages/qt-x11-free/debian/rules
Log:
Merge from Christopher:
* Apply packaging patches from Brian Nelson to allow Qt3 to co-exist
with Qt4 packages. (Closes: #306879)
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/changelog 2005-09-04 23:28:25 UTC (rev 1678)
@@ -16,6 +16,9 @@
therefore also usable in dwww and doc-central. (Closes: #185900, #284407,
#294630)
+ * Apply packaging patches from Brian Nelson to allow Qt3 to co-exist
+ with Qt4 packages. (Closes: #306879)
+
* Add the gtkstyle patch, in order to better support Bluecurve.
(Closes: #316108)
Copied: trunk/packages/qt-x11-free/debian/maintain/assistant-qt3.desktop (from rev 1669, trunk/packages/qt-x11-free/debian/maintain/assistant.desktop)
===================================================================
--- trunk/packages/qt-x11-free/debian/maintain/assistant.desktop 2005-09-04 22:39:19 UTC (rev 1669)
+++ trunk/packages/qt-x11-free/debian/maintain/assistant-qt3.desktop 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=assistant-qt3
+Name=Qt3 Assistant
+Name[de]=Qt3 Assistent
+Comment=Qt3 Helpcenter
+Comment[de]= Qt3 Hilfezentrum
+MapNotify=true
+MimeType=application/x-assistant
+Icon=assistant
+Terminal=false
+Type=Application
+Categories=Qt;Core
Deleted: trunk/packages/qt-x11-free/debian/maintain/assistant.desktop
Modified: trunk/packages/qt-x11-free/debian/maintain/designer-qt3.desktop
===================================================================
--- trunk/packages/qt-x11-free/debian/maintain/designer-qt3.desktop 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/maintain/designer-qt3.desktop 2005-09-04 23:28:25 UTC (rev 1678)
@@ -1,71 +1,71 @@
[Desktop Entry]
Exec=designer-qt3
-Name=Qt Designer
-Name[bg]=Qt Дизайнер
-Name[br]=Ergrafer Qt
-Name[ca]=Dissenyador Qt
-Name[cs]=Qt designer
-Name[de]=Qt-Designer
-Name[eo]=Qt-Desegnilo
-Name[es]=Diseñador Qt
-Name[et]=Qt disainer
-Name[eu]=Qt Diseinatzailea
-Name[gl]=Deseñador de Qt
+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 Qt
+Name[it]=Designer Qt3
Name[ja]=Qtデザイナー
Name[ko]=Qt 디자이너
-Name[lv]=Qt Dizainers
+Name[lv]=Qt3 Dizainers
Name[mk]=Qt дизајнер
-Name[no]=Qt-designer
-Name[oc]=Dessinador Qt
-Name[pl]=Projektant Qt
-Name[sk]=Qt Dizajnér
-Name[sl]=Snovalnik 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=Qt interface designer
-Comment[az]=Qt axtar üz dizayn proqramı
-Comment[bg]=Qt interface дизайнер
-Comment[br]=Ergrafer etrefas Qt
-Comment[ca]=Dissenyador d'interfícies Qt
-Comment[cs]=Editor UI pro Qt
-Comment[da]=Qt grænseflade designer
-Comment[de]=Schnittstellen-Designer für 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]=Qt-Interfacdesegnilo
-Comment[es]=Diseñador de interfaces de Qt
-Comment[et]=Qt dialoogide redaktor
-Comment[eu]=Qt interfaze diseinatzailea
+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 Qt
-Comment[gl]=Editor de interfaces de Qt
+Comment[fr]=Conception d'interfaces avec Qt3
+Comment[gl]=Editor de interfaces de Qt3
Comment[he]=Qt-ל םיקשממ בצעמ
-Comment[hu]=Qt felülettervező
-Comment[is]=Viðmótshönnunartól fyrir Qt
-Comment[it]=Editor per le interfaccie 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]=Qt sąsajos redaktorius
-Comment[lv]=Qt starsejas dizainers
+Comment[lt]=Qt3 sąsajos redaktorius
+Comment[lv]=Qt3 starsejas dizainers
Comment[mk]=Дизајнер на Qt дијалози
-Comment[nl]=Qt interface-ontwerper
-Comment[no]=Qt-grensesnittdesigner
-Comment[no_NY]=Redigering av Qt-miljø
-Comment[oc]=Dessinador d'interfacies Qt
-Comment[pl]=Projektant interfejsu Qt
-Comment[pt]=Editor de interfaces do Qt
-Comment[pt_BR]=Designer de interface Qt
-Comment[ro]=Dezvoltator de interfeţe 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]=Qt dizajnér rozhrania
-Comment[sl]=Snovalnik vmesnikov za Qt
-Comment[sr]=Dizajner Qt interfejsa
-Comment[sv]=Editor för gränssnitt till 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]=Qt arayüz tasarım programı
+Comment[tr]=Qt3 arayüz tasarım programı
Comment[uk]=Редактор інтерфейсу для Qt
Comment[zh_CN.GB2312]=Qt 界面设计程序
Comment[zh_TW.Big5]=Qt 介面編輯器
Copied: trunk/packages/qt-x11-free/debian/maintain/linguist-qt3.desktop (from rev 1669, trunk/packages/qt-x11-free/debian/maintain/linguist.desktop)
===================================================================
--- trunk/packages/qt-x11-free/debian/maintain/linguist.desktop 2005-09-04 22:39:19 UTC (rev 1669)
+++ trunk/packages/qt-x11-free/debian/maintain/linguist-qt3.desktop 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Exec=linguist-qt3
+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
+MapNotify=true
+MimeType=application/x-linguist
+Terminal=false
+Icon=linguist
+Type=Application
+Categories=Qt;Development
Deleted: trunk/packages/qt-x11-free/debian/maintain/linguist.desktop
Copied: trunk/packages/qt-x11-free/debian/maintain/qt3config.desktop (from rev 1669, trunk/packages/qt-x11-free/debian/maintain/qtconfig.desktop)
===================================================================
--- trunk/packages/qt-x11-free/debian/maintain/qtconfig.desktop 2005-09-04 22:39:19 UTC (rev 1669)
+++ trunk/packages/qt-x11-free/debian/maintain/qt3config.desktop 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Exec=qtconfig-qt3
+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
+MapNotify=true
+MimeType=application/x-qtconfig
+Terminal=false
+Icon=qtconfig
+Type=Application
+Categories=Qt;Settings
Deleted: trunk/packages/qt-x11-free/debian/maintain/qtconfig.desktop
Modified: trunk/packages/qt-x11-free/debian/qt3-assistant.menu
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-assistant.menu 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-assistant.menu 2005-09-04 23:28:25 UTC (rev 1678)
@@ -2,5 +2,5 @@
needs="X11"\
section="Apps/System"\
hints="KDE"\
- title="Qt Assistant"\
- command="/usr/bin/assistant"
+ title="Qt3 Assistant"\
+ command="/usr/bin/assistant-qt3"
Added: trunk/packages/qt-x11-free/debian/qt3-assistant.postinst
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-assistant.postinst 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-assistant.postinst 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+ /usr/bin/assistant assistant "/usr/bin/assistant-qt3" "45" \
+
+#DEBHELPER#
Added: trunk/packages/qt-x11-free/debian/qt3-assistant.prerm
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-assistant.prerm 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-assistant.prerm 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ upgrade) ;;
+ remove|failed-upgrade|deconfigure)
+ update-alternatives --remove assistant "/usr/bin/assistant-qt3"
+ ;;
+esac
+
+#DEBHELPER#
Modified: trunk/packages/qt-x11-free/debian/qt3-designer.menu
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-designer.menu 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-designer.menu 2005-09-04 23:28:25 UTC (rev 1678)
@@ -2,5 +2,5 @@
needs="X11"\
section="Apps/Programming"\
hints="KDE"\
- title="Qt Designer"\
+ title="Qt3 Designer"\
command="/usr/bin/designer-qt3"
Modified: trunk/packages/qt-x11-free/debian/qt3-designer.postinst
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-designer.postinst 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-designer.postinst 2005-09-04 23:28:25 UTC (rev 1678)
@@ -3,7 +3,7 @@
set -e
update-alternatives --install \
- /usr/bin/designer designer "/usr/bin/designer-qt3" "35" \
+ /usr/bin/designer designer "/usr/bin/designer-qt3" "45" \
--slave /usr/share/man/man1/designer.1.gz designer.1.gz \
"/usr/share/man/man1/designer-qt3.1.gz"
Modified: trunk/packages/qt-x11-free/debian/qt3-dev-tools.links
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-dev-tools.links 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-dev-tools.links 2005-09-04 23:28:25 UTC (rev 1678)
@@ -1,7 +1,7 @@
/usr/share/qt3/mkspecs/linux-g++ /usr/share/qt3/mkspecs/default
-/usr/bin/qmake /usr/share/qt3/bin/qmake
-/usr/bin/lupdate /usr/share/qt3/bin/lupdate
-/usr/bin/lrelease /usr/share/qt3/bin/lrelease
+/usr/bin/qmake-qt3 /usr/share/qt3/bin/qmake
+/usr/bin/lupdate-qt3 /usr/share/qt3/bin/lupdate
+/usr/bin/lrelease-qt3 /usr/share/qt3/bin/lrelease
/usr/bin/uic-qt3 /usr/share/qt3/bin/uic
/usr/bin/moc-qt3 /usr/share/qt3/bin/moc
/usr/bin/qembed /usr/share/qt3/bin/qembed
Modified: trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst 2005-09-04 23:28:25 UTC (rev 1678)
@@ -3,13 +3,26 @@
set -e
update-alternatives --install \
- /usr/bin/moc moc "/usr/bin/moc-qt3" "35" \
+ /usr/bin/moc moc "/usr/bin/moc-qt3" "45" \
--slave /usr/share/man/man1/moc.1.gz moc.1.gz \
"/usr/share/man/man1/moc-qt3.1.gz"
update-alternatives --install \
- /usr/bin/uic uic "/usr/bin/uic-qt3" "35" \
+ /usr/bin/uic uic "/usr/bin/uic-qt3" "45" \
--slave /usr/share/man/man1/uic.1.gz uic.1.gz \
"/usr/share/man/man1/uic-qt3.1.gz"
+update-alternatives --install \
+ /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt3" "45" \
+ --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
+ "/usr/share/man/man1/lupdate-qt3.1.gz"
+
+update-alternatives --install \
+ /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt3" "45" \
+ --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
+ "/usr/share/man/man1/lrelease-qt3.1.gz"
+
+update-alternatives --install \
+ /usr/bin/qmake qmake "/usr/bin/qmake-qt3" "45" \
+
#DEBHELPER#
Modified: trunk/packages/qt-x11-free/debian/qt3-dev-tools.prerm
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-dev-tools.prerm 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-dev-tools.prerm 2005-09-04 23:28:25 UTC (rev 1678)
@@ -7,6 +7,9 @@
remove|failed-upgrade|deconfigure)
update-alternatives --remove moc "/usr/bin/moc-qt3"
update-alternatives --remove uic "/usr/bin/uic-qt3"
+ update-alternatives --remove lupdate "/usr/bin/lupdate-qt3"
+ update-alternatives --remove lrelease "/usr/bin/lrelease-qt3"
+ update-alternatives --remove qmake "/usr/bin/qmake-qt3"
;;
esac
Modified: trunk/packages/qt-x11-free/debian/qt3-linguist.menu
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-linguist.menu 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-linguist.menu 2005-09-04 23:28:25 UTC (rev 1678)
@@ -2,5 +2,5 @@
needs="X11"\
section="Apps/Programming"\
hints="KDE"\
- title="Qt Linguist"\
- command="/usr/bin/linguist"
+ title="Qt3 Linguist"\
+ command="/usr/bin/linguist-qt3"
Added: trunk/packages/qt-x11-free/debian/qt3-linguist.postinst
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-linguist.postinst 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-linguist.postinst 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+ /usr/bin/linguist linguist "/usr/bin/linguist-qt3" "45" \
+ --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
+ "/usr/share/man/man1/linguist-qt3.1.gz"
+
+#DEBHELPER#
Added: trunk/packages/qt-x11-free/debian/qt3-linguist.prerm
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-linguist.prerm 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-linguist.prerm 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ upgrade) ;;
+ remove|failed-upgrade|deconfigure)
+ update-alternatives --remove linguist "/usr/bin/linguist-qt3"
+ ;;
+esac
+
+#DEBHELPER#
Modified: trunk/packages/qt-x11-free/debian/qt3-qtconfig.menu
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-qtconfig.menu 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-qtconfig.menu 2005-09-04 23:28:25 UTC (rev 1678)
@@ -1,5 +1,5 @@
?package(qt3-qtconfig):\
needs="X11"\
section="Apps/System"\
- title="QtConfig"\
- command="/usr/bin/qtconfig"
+ title="Qt3Config"\
+ command="/usr/bin/qtconfig-qt3"
Added: trunk/packages/qt-x11-free/debian/qt3-qtconfig.postinst
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-qtconfig.postinst 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-qtconfig.postinst 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install \
+ /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-qt3" "45" \
+ --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
+ "/usr/share/man/man1/qtconfig-qt3.1.gz"
+
+#DEBHELPER#
Added: trunk/packages/qt-x11-free/debian/qt3-qtconfig.prerm
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-qtconfig.prerm 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/qt3-qtconfig.prerm 2005-09-04 23:28:25 UTC (rev 1678)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ upgrade) ;;
+ remove|failed-upgrade|deconfigure)
+ update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt3"
+ ;;
+esac
+
+#DEBHELPER#
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2005-09-04 23:18:54 UTC (rev 1677)
+++ trunk/packages/qt-x11-free/debian/rules 2005-09-04 23:28:25 UTC (rev 1678)
@@ -270,11 +270,6 @@
chmod 755 `pwd`/debian/doc/qt3-examples/build-examples
cd `pwd`/debian/doc/ && tar cvvfz qt3-examples.tar.gz qt3-examples/
install -D `pwd`/debian/doc/qt3-examples.tar.gz `pwd`/debian/qt3-examples/usr/share/doc/qt3-examples/qt3-examples.tar.gz
-
- # build attic package and copy it to libqt3-ompat-headers
- cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
- install -D `pwd`/src/attic.tar.gz `pwd`/debian/libqt3-compat-headers/usr/share/doc/libqt3-compat-headers/attic.tar.gz
- rm -rf `pwd`/src/attic.tar.gz
# proceed
dh_compress -i -Xhtml/
@@ -338,11 +333,11 @@
rm -rf `pwd`/tools/linguist/linguist/*.qm
# desktop lnk files
- install -D debian/maintain/designer-qt3.desktop `pwd`/debian/qt3-designer/usr/share/applnk/Development/designer-qt3.desktop
- install -D debian/maintain/linguist.desktop `pwd`/debian/qt3-linguist/usr/share/applnk/Development/linguist.desktop
+ install -m644 -D debian/maintain/designer-qt3.desktop `pwd`/debian/qt3-designer/usr/share/applnk/Development/designer-qt3.desktop
+ install -m644 -D debian/maintain/linguist-qt3.desktop `pwd`/debian/qt3-linguist/usr/share/applnk/Development/linguist-qt3.desktop
- install -D debian/maintain/assistant.desktop `pwd`/debian/qt3-assistant/usr/share/applnk/System/assistant.desktop
- install -D debian/maintain/qtconfig.desktop `pwd`/debian/qt3-qtconfig/usr/share/applnk/Settingsmenu/qtconfig.desktop
+ install -m644 -D debian/maintain/assistant-qt3.desktop `pwd`/debian/qt3-assistant/usr/share/applnk/System/assistant-qt3.desktop
+ install -m644 -D debian/maintain/qt3config.desktop `pwd`/debian/qt3-qtconfig/usr/share/applnk/Settingsmenu/qt3config.desktop
# include logo32 for every program
cd `pwd`/debian/qt3-designer/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
@@ -357,35 +352,54 @@
cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done
- for a in designer linguist assistant; do install -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-"$$a"/usr/share/qt3/doc/html/logo32-"$$a".png; done
- install -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html/logo32-qmake.png
+ for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-"$$a"/usr/share/qt3/doc/html/logo32-"$$a".png; done
+ install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html/logo32-qmake.png
# fix qmake.conf files
cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/qt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/qt3/g' | \
sed 's/\-I\/usr\/include/&\/qt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
- # rename some binaries to make qt2/3 installations possible
+ # build attic package and copy it to libqt3-ompat-headers
+ cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
+ install -D `pwd`/src/attic.tar.gz `pwd`/debian/libqt3-compat-headers/usr/share/doc/libqt3-compat-headers/attic.tar.gz
+ rm -rf `pwd`/src/attic.tar.gz
+
+ # rename some binaries to make qt3/4 installations possible
mv `pwd`/debian/qt3-designer/usr/bin/designer `pwd`/debian/qt3-designer/usr/bin/designer-qt3
mv `pwd`/debian/qt3-dev-tools/usr/bin/uic `pwd`/debian/qt3-dev-tools/usr/bin/uic-qt3
mv `pwd`/debian/qt3-dev-tools/usr/bin/moc `pwd`/debian/qt3-dev-tools/usr/bin/moc-qt3
+ mv `pwd`/debian/qt3-dev-tools/usr/bin/lupdate `pwd`/debian/qt3-dev-tools/usr/bin/lupdate-qt3
+ mv `pwd`/debian/qt3-dev-tools/usr/bin/lrelease `pwd`/debian/qt3-dev-tools/usr/bin/lrelease-qt3
+ mv `pwd`/debian/qt3-dev-tools/usr/bin/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-qt3
+ mv `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig-qt3
+ mv `pwd`/debian/qt3-assistant/usr/bin/assistant `pwd`/debian/qt3-assistant/usr/bin/assistant-qt3
+ mv `pwd`/debian/qt3-linguist/usr/bin/linguist `pwd`/debian/qt3-linguist/usr/bin/linguist-qt3
+
install -D debian/maintain/man/designer.1 `pwd`/debian/qt3-designer/usr/share/man/man1/designer-qt3.1
install -D doc/man/man1/moc.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/moc-qt3.1
install -D doc/man/man1/uic.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/uic-qt3.1
+ install -D doc/man/man1/lrelease.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lrelease-qt3.1
+ install -D doc/man/man1/lupdate.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lupdate-qt3.1
+ install -D debian/maintain/man/qtconfig.1 `pwd`/debian/qt3-designer/usr/share/man/man1/qtconfig-qt3.1
+ install -D debian/maintain/man/linguist.1 `pwd`/debian/qt3-designer/usr/share/man/man1/linguist-qt3.1
+
+ dh_link -pqt3-designer usr/share/qt3/doc/html usr/share/doc/qt3-designer/html
+ dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html
+ dh_link -pqt3-linguist usr/share/qt3/doc/html usr/share/doc/qt3-linguist/html
+ dh_link -pqt3-dev-tools usr/share/qt3/doc/html usr/share/doc/qt3-dev-tools/html
# install the manpages we have
dh_installman -pqt3-designer debian/maintain/man/createcw.1
dh_installman -pqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
dh_installman -pqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1
- dh_installman -pqt3-dev-tools doc/man/man1/lupdate.1 doc/man/man1/lrelease.1 debian/maintain/man/qembed.1
- dh_installman -pqt3-qtconfig debian/maintain/man/qtconfig.1
- dh_installman -pqt3-linguist debian/maintain/man/linguist.1
+ dh_installman -pqt3-dev-tools debian/maintain/man/qembed.1
# copy README.Debian
for a in libqt3-mt-dev qt3-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/qt3-dev-tools/usr/bin/qmake
- install -D `pwd`/qmake/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake
+ install -D `pwd`/qmake/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-qt3
# Install source for the designer tools, such as createcw.
cp -ra tools/designer/tools debian/qt3-designer/usr/share/qt3/tools
More information about the pkg-kde-commits
mailing list