diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-06-20 12:51:50 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-06-25 19:28:20 +0900 |
commit | 355bec7df1f2dde81834eca7b7c979dd461acbea (patch) | |
tree | 6db7c5a17de9c7486c1af40abc1c10312be08936 | |
parent | cf2b2717c3c6b71ee78932ff75f7090cc35579e1 (diff) | |
download | tde-packaging-355bec7df1f2dde81834eca7b7c979dd461acbea.tar.gz tde-packaging-355bec7df1f2dde81834eca7b7c979dd461acbea.zip |
DEB tqt3: remove Qt/embedded related files
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
18 files changed, 6 insertions, 108 deletions
diff --git a/debian/_base/dependencies/tqt3/debian/README.Debian b/debian/_base/dependencies/tqt3/debian/README.Debian index 6d5c135e2..4458531f5 100644 --- a/debian/_base/dependencies/tqt3/debian/README.Debian +++ b/debian/_base/dependencies/tqt3/debian/README.Debian @@ -136,9 +136,7 @@ Designer or extend the Designer as well as utilizing the Qt Assistant by calling it from within your program, install tqt3-apps-dev, which contains the static libraries and header files retquired for this functionality. -For Embedded Developers, the program tqvfb (Qt Virtual Frambuffer) and -maketqpf (embedded fonts tool)have been packaged into -qt3-dev-tools-embedded. For developers that work on migrating their program +For developers that work on migrating their program from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find additional tools in the tqt3-dev-tools-compat. diff --git a/debian/_base/dependencies/tqt3/debian/control b/debian/_base/dependencies/tqt3/debian/control index cfb831620..36266f44e 100644 --- a/debian/_base/dependencies/tqt3/debian/control +++ b/debian/_base/dependencies/tqt3/debian/control @@ -261,21 +261,6 @@ Description: The TQt3 Configuration Application CJK-fonts or other non-latin scripts, you will most likely want to install this package. -Package: tqt3-dev-tools-embedded -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Recommends: libtqt3-mt-dev -Depends: ${shlibs:Depends} -Description: Tools to develop embedded TQt applications - This package contains applications only suitable for developing - applications with TQt Embedded and/or Qtopia. It provides the QVFB - program for simulating an embedded device desktop as well as maketqpf - for converting fonts to embedded fonts suitable for being utilized - by TQt Embedded applications. - Package: tqt3-dev-tools-compat Architecture: any Multi-Arch: foreign diff --git a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install index 93299c21c..985432218 100644 --- a/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/debian/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -254,7 +254,6 @@ usr/include/tqt3/tqvaluevector.h usr/include/tqt3/ntqvariant.h usr/include/tqt3/ntqvbox.h usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvfbhdr.h usr/include/tqt3/ntqvgroupbox.h usr/include/tqt3/ntqwaitcondition.h usr/include/tqt3/ntqwhatsthis.h diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules index 36a8cc408..f42f8989d 100755 --- a/debian/_base/dependencies/tqt3/debian/rules +++ b/debian/_base/dependencies/tqt3/debian/rules @@ -191,10 +191,6 @@ libqt-thread-stamp: post-patches cd tools/designer/tools/tqtconv2ui && $(MAKE) cp bin/tqtconv2ui $(TMP_INSTALL)/usr/bin/tqtconv2ui - # build tqvfb - cd tools/tqvfb/ && $(MAKE) - cp tools/tqvfb/tqvfb $(TMP_INSTALL)/usr/bin/tqvfb - # install qmake.cache file install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache @@ -213,7 +209,7 @@ clean:: if [ -f "src/Makefile" ]; then \ $(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \ - $(MAKE) -C tools/maketqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/tqvfb distclean; \ + $(MAKE) -C tools/qconfig distclean; \ $(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \ $(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \ $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \ @@ -403,11 +399,6 @@ binary-arch: build install cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/ rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h - ## tqvfb package - install -m644 -D `pwd`/tools/tqvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/tqvfb/pda.skin - install -m644 -D `pwd`/tools/tqvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_down.png - install -m644 -D `pwd`/tools/tqvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_up.png - # remove utterly ugle symlink rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++ @@ -502,9 +493,6 @@ binary-arch: build install # fix shlibdeps madness for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done - # fix conffiles file for tqt3-dev-tools-embedded - echo "/etc/tqt3/tqvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles - dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install deleted file mode 100644 index 38a249f41..000000000 --- a/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/maketqpf -usr/bin/tqvfb diff --git a/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links deleted file mode 100644 index 72baff7fd..000000000 --- a/debian/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/maketqpf /usr/share/tqt3/bin/maketqpf -/usr/bin/tqvfb /usr/share/tqt3/bin/tqvfb diff --git a/dilos/dependencies/tqt3/debian/README.Debian b/dilos/dependencies/tqt3/debian/README.Debian index 6d5c135e2..4458531f5 100644 --- a/dilos/dependencies/tqt3/debian/README.Debian +++ b/dilos/dependencies/tqt3/debian/README.Debian @@ -136,9 +136,7 @@ Designer or extend the Designer as well as utilizing the Qt Assistant by calling it from within your program, install tqt3-apps-dev, which contains the static libraries and header files retquired for this functionality. -For Embedded Developers, the program tqvfb (Qt Virtual Frambuffer) and -maketqpf (embedded fonts tool)have been packaged into -qt3-dev-tools-embedded. For developers that work on migrating their program +For developers that work on migrating their program from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find additional tools in the tqt3-dev-tools-compat. diff --git a/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt3/debian/control index 021e167a6..7f7d5ac62 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/dependencies/tqt3/debian/control @@ -262,21 +262,6 @@ Description: The TQt3 Configuration Application CJK-fonts or other non-latin scripts, you will most likely want to install this package. -Package: tqt3-dev-tools-embedded -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Recommends: libtqt3-mt-dev -Depends: ${shlibs:Depends} -Description: Tools to develop embedded TQt applications - This package contains applications only suitable for developing - applications with TQt Embedded and/or Qtopia. It provides the QVFB - program for simulating an embedded device desktop as well as maketqpf - for converting fonts to embedded fonts suitable for being utilized - by TQt Embedded applications. - Package: tqt3-dev-tools-compat Architecture: any Multi-Arch: foreign diff --git a/dilos/dependencies/tqt3/debian/libtqt3-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-headers.install index 93299c21c..985432218 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-headers.install +++ b/dilos/dependencies/tqt3/debian/libtqt3-headers.install @@ -254,7 +254,6 @@ usr/include/tqt3/tqvaluevector.h usr/include/tqt3/ntqvariant.h usr/include/tqt3/ntqvbox.h usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvfbhdr.h usr/include/tqt3/ntqvgroupbox.h usr/include/tqt3/ntqwaitcondition.h usr/include/tqt3/ntqwhatsthis.h diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules index 910bfb64a..c031285c2 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt3/debian/rules @@ -188,10 +188,6 @@ libqt-thread-stamp: post-patches cd tools/designer/tools/tqtconv2ui && $(MAKE) cp bin/tqtconv2ui $(TMP_INSTALL)/usr/bin/tqtconv2ui - # build tqvfb - cd tools/tqvfb/ && $(MAKE) - cp tools/tqvfb/tqvfb $(TMP_INSTALL)/usr/bin/tqvfb - # install qmake.cache file install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache @@ -218,7 +214,7 @@ clean:: if [ -f "src/Makefile" ]; then \ $(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \ - $(MAKE) -C tools/maketqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/tqvfb distclean; \ + $(MAKE) -C tools/qconfig distclean; \ $(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \ $(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \ $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \ @@ -409,11 +405,6 @@ binary-arch: build install cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/ rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h - ## tqvfb package - install -m644 -D `pwd`/tools/tqvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/tqvfb/pda.skin - install -m644 -D `pwd`/tools/tqvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_down.png - install -m644 -D `pwd`/tools/tqvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_up.png - # remove utterly ugle symlink rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++ @@ -509,9 +500,6 @@ binary-arch: build install # fix shlibdeps madness for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done - # fix conffiles file for tqt3-dev-tools-embedded - echo "/etc/tqt3/tqvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles - dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install deleted file mode 100644 index 38a249f41..000000000 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/maketqpf -usr/bin/tqvfb diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links deleted file mode 100644 index 72baff7fd..000000000 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/maketqpf /usr/share/tqt3/bin/maketqpf -/usr/bin/tqvfb /usr/share/tqt3/bin/tqvfb diff --git a/ubuntu/_base/dependencies/tqt3/debian/README.Debian b/ubuntu/_base/dependencies/tqt3/debian/README.Debian index 6d5c135e2..4458531f5 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/README.Debian +++ b/ubuntu/_base/dependencies/tqt3/debian/README.Debian @@ -136,9 +136,7 @@ Designer or extend the Designer as well as utilizing the Qt Assistant by calling it from within your program, install tqt3-apps-dev, which contains the static libraries and header files retquired for this functionality. -For Embedded Developers, the program tqvfb (Qt Virtual Frambuffer) and -maketqpf (embedded fonts tool)have been packaged into -qt3-dev-tools-embedded. For developers that work on migrating their program +For developers that work on migrating their program from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find additional tools in the tqt3-dev-tools-compat. diff --git a/ubuntu/_base/dependencies/tqt3/debian/control b/ubuntu/_base/dependencies/tqt3/debian/control index cfb831620..36266f44e 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/control +++ b/ubuntu/_base/dependencies/tqt3/debian/control @@ -261,21 +261,6 @@ Description: The TQt3 Configuration Application CJK-fonts or other non-latin scripts, you will most likely want to install this package. -Package: tqt3-dev-tools-embedded -Architecture: any -Multi-Arch: foreign -Section: devel -Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~) -Recommends: libtqt3-mt-dev -Depends: ${shlibs:Depends} -Description: Tools to develop embedded TQt applications - This package contains applications only suitable for developing - applications with TQt Embedded and/or Qtopia. It provides the QVFB - program for simulating an embedded device desktop as well as maketqpf - for converting fonts to embedded fonts suitable for being utilized - by TQt Embedded applications. - Package: tqt3-dev-tools-compat Architecture: any Multi-Arch: foreign diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index 93299c21c..985432218 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -254,7 +254,6 @@ usr/include/tqt3/tqvaluevector.h usr/include/tqt3/ntqvariant.h usr/include/tqt3/ntqvbox.h usr/include/tqt3/ntqvbuttongroup.h -usr/include/tqt3/ntqvfbhdr.h usr/include/tqt3/ntqvgroupbox.h usr/include/tqt3/ntqwaitcondition.h usr/include/tqt3/ntqwhatsthis.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index 36a8cc408..f42f8989d 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -191,10 +191,6 @@ libqt-thread-stamp: post-patches cd tools/designer/tools/tqtconv2ui && $(MAKE) cp bin/tqtconv2ui $(TMP_INSTALL)/usr/bin/tqtconv2ui - # build tqvfb - cd tools/tqvfb/ && $(MAKE) - cp tools/tqvfb/tqvfb $(TMP_INSTALL)/usr/bin/tqvfb - # install qmake.cache file install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache @@ -213,7 +209,7 @@ clean:: if [ -f "src/Makefile" ]; then \ $(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \ - $(MAKE) -C tools/maketqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/tqvfb distclean; \ + $(MAKE) -C tools/qconfig distclean; \ $(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \ $(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \ $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \ @@ -403,11 +399,6 @@ binary-arch: build install cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/tqt3/ rm -rf `pwd`/debian/tqt3-apps-dev/usr/include/tqt3/preferences.ui.h - ## tqvfb package - install -m644 -D `pwd`/tools/tqvfb/pda.skin `pwd`/debian/tqt3-dev-tools-embedded/etc/tqt3/tqvfb/pda.skin - install -m644 -D `pwd`/tools/tqvfb/pda_down.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_down.png - install -m644 -D `pwd`/tools/tqvfb/pda_up.png `pwd`/debian/tqt3-dev-tools-embedded/usr/share/tqvfb/pda_up.png - # remove utterly ugle symlink rm -rf `pwd`/debian/tqt3-dev-tools//usr/share/tqt3/mkspecs/linux-g++/linux-g++ @@ -502,9 +493,6 @@ binary-arch: build install # fix shlibdeps madness for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done - # fix conffiles file for tqt3-dev-tools-embedded - echo "/etc/tqt3/tqvfb/pda.skin" > `pwd`/debian/tqt3-dev-tools-embedded/DEBIAN/conffiles - dh_gencontrol -a $(IBASE) dh_md5sums -a $(IBASE) dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install deleted file mode 100644 index 38a249f41..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/maketqpf -usr/bin/tqvfb diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links b/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links deleted file mode 100644 index 72baff7fd..000000000 --- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-dev-tools-embedded.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/maketqpf /usr/share/tqt3/bin/maketqpf -/usr/bin/tqvfb /usr/share/tqt3/bin/tqvfb |