From 6e88c68e1bd46faa2a96bbc409052f27bf445736 Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Wed, 6 Nov 2013 17:18:11 +0100 Subject: Cleanup sources, mostly by removing QtCreator generated bloat. This removes a lot of obsolete files and simplifies the build system of the examples. Furthermore, the examples can now be run without running make install first. It reuses the same import path as the test does. Note that the examples are not installable anymore now though. If this is required, it can be added again. Change-Id: Ic7ff80f734b035a03fb1a11a2df492c97298ceff Reviewed-by: Zeno Albisser --- src/qtc_packaging/debian_harmattan/README | 6 -- src/qtc_packaging/debian_harmattan/changelog | 5 -- src/qtc_packaging/debian_harmattan/compat | 1 - src/qtc_packaging/debian_harmattan/control | 14 ----- src/qtc_packaging/debian_harmattan/copyright | 40 ------------ src/qtc_packaging/debian_harmattan/rules | 91 ---------------------------- src/src.pro | 6 -- 7 files changed, 163 deletions(-) delete mode 100644 src/qtc_packaging/debian_harmattan/README delete mode 100644 src/qtc_packaging/debian_harmattan/changelog delete mode 100644 src/qtc_packaging/debian_harmattan/compat delete mode 100644 src/qtc_packaging/debian_harmattan/control delete mode 100644 src/qtc_packaging/debian_harmattan/copyright delete mode 100755 src/qtc_packaging/debian_harmattan/rules (limited to 'src') diff --git a/src/qtc_packaging/debian_harmattan/README b/src/qtc_packaging/debian_harmattan/README deleted file mode 100644 index 849ff0b..0000000 --- a/src/qtc_packaging/debian_harmattan/README +++ /dev/null @@ -1,6 +0,0 @@ -The Debian Package src ----------------------------- - -Comments regarding the Package - - -- No'am Rosenthal Wed, 03 Aug 2011 16:01:43 -0700 diff --git a/src/qtc_packaging/debian_harmattan/changelog b/src/qtc_packaging/debian_harmattan/changelog deleted file mode 100644 index 3c0d60b..0000000 --- a/src/qtc_packaging/debian_harmattan/changelog +++ /dev/null @@ -1,5 +0,0 @@ -src (0.0.1) unstable; urgency=low - - * Initial Release. - - -- No'am Rosenthal Wed, 03 Aug 2011 16:01:43 -0700 diff --git a/src/qtc_packaging/debian_harmattan/compat b/src/qtc_packaging/debian_harmattan/compat deleted file mode 100644 index 7f8f011..0000000 --- a/src/qtc_packaging/debian_harmattan/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/src/qtc_packaging/debian_harmattan/control b/src/qtc_packaging/debian_harmattan/control deleted file mode 100644 index 89b7482..0000000 --- a/src/qtc_packaging/debian_harmattan/control +++ /dev/null @@ -1,14 +0,0 @@ -Source: src -Section: user/other -Priority: optional -Maintainer: No'am Rosenthal -Build-Depends: debhelper (>= 5), libqt4-dev -Standards-Version: 3.7.3 -Homepage: - -Package: src -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: - -XSBC-Maemo-Display-Name: src diff --git a/src/qtc_packaging/debian_harmattan/copyright b/src/qtc_packaging/debian_harmattan/copyright deleted file mode 100644 index 61aee6c..0000000 --- a/src/qtc_packaging/debian_harmattan/copyright +++ /dev/null @@ -1,40 +0,0 @@ -This package was debianized by No'am Rosenthal on -Wed, 03 Aug 2011 16:01:43 -0700. - -It was downloaded from - -Upstream Author(s): - - - - -Copyright: - - - - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is (C) 2011, No'am Rosenthal and -is licensed under the GPL, see above. - - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/src/qtc_packaging/debian_harmattan/rules b/src/qtc_packaging/debian_harmattan/rules deleted file mode 100755 index 0208b38..0000000 --- a/src/qtc_packaging/debian_harmattan/rules +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - - - -configure: configure-stamp -configure-stamp: - dh_testdir - # qmake PREFIX=/usr# Uncomment this line for use without Qt Creator - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - # $(MAKE) # Uncomment this line for use without Qt Creator - #docbook-to-man debian/src.sgml > src.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/src. - $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/src install - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - # dh_shlibdeps # Uncomment this line for use without Qt Creator - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/src/src.pro b/src/src.pro index 5690897..c20f118 100644 --- a/src/src.pro +++ b/src/src.pro @@ -16,12 +16,6 @@ RESOURCES += \ resources.qrc OTHER_FILES = qmldir \ - qtc_packaging/debian_harmattan/rules \ - qtc_packaging/debian_harmattan/README \ - qtc_packaging/debian_harmattan/copyright \ - qtc_packaging/debian_harmattan/control \ - qtc_packaging/debian_harmattan/compat \ - qtc_packaging/debian_harmattan/changelog \ webchannel.js \ qobject.js \ MetaObjectPublisher.qml \ -- cgit v1.2.1