Browse Source

DEB qt3: Drop deleting/re-creating symlinks for include/qinputcontext*.h.

Installation of the qinputcontext*.h, qconfig.h and qmodules.h files
moved from rules to regular *.install files.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
v3.5.13-sru
Slávek Banko 9 months ago
parent
commit
0bfe4e2db5
Signed by: SlavekB GPG Key ID: 608F5293A04BE668
6 changed files with 10 additions and 28 deletions
  1. +3
    -0
      debian/_base/dependencies/qt3/debian/libqt3-headers.install
  2. +2
    -0
      debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install
  3. +0
    -14
      debian/_base/dependencies/qt3/debian/rules
  4. +3
    -0
      ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
  5. +2
    -0
      ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
  6. +0
    -14
      ubuntu/_base/dependencies/qt3/debian/rules

+ 3
- 0
debian/_base/dependencies/qt3/debian/libqt3-headers.install View File

@@ -91,6 +91,9 @@ usr/include/qt3/qiconset.h
usr/include/qt3/qiconview.h
usr/include/qt3/qimage.h
usr/include/qt3/qimageformatplugin.h
usr/include/qt3/qinputcontext.h
usr/include/qt3/qinputcontextfactory.h
usr/include/qt3/qinputcontextplugin.h
usr/include/qt3/qinputdialog.h
usr/include/qt3/qintcache.h
usr/include/qt3/qintdict.h


+ 2
- 0
debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install View File

@@ -4,6 +4,8 @@ usr/lib/libqt-mt.so
usr/lib/libqui.prl
usr/lib/libqui.so
usr/lib/pkgconfig/qt-mt.pc
usr/include/qt3/qconfig.h
usr/include/qt3/qgl.h
usr/include/qt3/qglcolormap.h
usr/include/qt3/qmodules.h
usr/include/qt3/qwidgetfactory.h

+ 0
- 14
debian/_base/dependencies/qt3/debian/rules View File

@@ -135,11 +135,6 @@ libqt-thread-stamp: post-patches

echo yes | ./configure $(CONFIGURE_OPTS)

rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h

# proceed
$(MAKE) sub-src sub-plugins sub-tools
$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
@@ -165,14 +160,6 @@ libqt-thread-stamp: post-patches
install -d $(P_QTMTDEV)/usr/share/qt3/
cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache

# install qconfig.h for the mt
install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h

install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h
install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h
install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h

touch libqt-thread-stamp

clean::
@@ -203,7 +190,6 @@ clean::
extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer

rm -f qmake/*o
rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o



+ 3
- 0
ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install View File

@@ -91,6 +91,9 @@ usr/include/qt3/qiconset.h
usr/include/qt3/qiconview.h
usr/include/qt3/qimage.h
usr/include/qt3/qimageformatplugin.h
usr/include/qt3/qinputcontext.h
usr/include/qt3/qinputcontextfactory.h
usr/include/qt3/qinputcontextplugin.h
usr/include/qt3/qinputdialog.h
usr/include/qt3/qintcache.h
usr/include/qt3/qintdict.h


+ 2
- 0
ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install View File

@@ -4,6 +4,8 @@ usr/lib/libqt-mt.so
usr/lib/libqui.prl
usr/lib/libqui.so
usr/lib/pkgconfig/qt-mt.pc
usr/include/qt3/qconfig.h
usr/include/qt3/qgl.h
usr/include/qt3/qglcolormap.h
usr/include/qt3/qmodules.h
usr/include/qt3/qwidgetfactory.h

+ 0
- 14
ubuntu/_base/dependencies/qt3/debian/rules View File

@@ -135,11 +135,6 @@ libqt-thread-stamp: post-patches

echo yes | ./configure $(CONFIGURE_OPTS)

rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h

# proceed
$(MAKE) sub-src sub-plugins sub-tools
$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
@@ -165,14 +160,6 @@ libqt-thread-stamp: post-patches
install -d $(P_QTMTDEV)/usr/share/qt3/
cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache

# install qconfig.h for the mt
install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h

install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h
install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h
install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h

touch libqt-thread-stamp

clean::
@@ -203,7 +190,6 @@ clean::
extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer

rm -f qmake/*o
rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o



Loading…
Cancel
Save