[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.1-2-8-gbc8a5da

Fathi Boudra fabo at alioth.debian.org
Tue Aug 10 17:07:08 UTC 2010 

The following commit has been merged in the master branch:
commit bc8a5daf307326109567578de5a75ddf88fbe1d9
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Aug 10 20:04:10 2010 +0300

    remove patches merged or stolen upstream
    add libdeclarative-contacts and libdeclarative-sensors packages
    update installed files
---
 debian/changelog                                   |   12 ++++-
 debian/control                                     |   16 ++++++
 debian/libdeclarative-contacts.install             |    2 +
 debian/libdeclarative-sensors.install              |    2 +
 debian/libqtbearer1.install                        |    1 -
 debian/patches/0001_rename_smallsensors.diff       |   11 ----
 debian/patches/0002_rename_sysinfo.diff            |   13 -----
 ...ix_ftbfs_incorrect_copy2build_output_value.diff |   54 --------------------
 debian/patches/03_ftbfs_multimedia_plugin.diff     |   41 ---------------
 debian/patches/04_ftbfs_multimedia_examples.diff   |    8 ++--
 debian/patches/series                              |    4 --
 debian/qtmobility-dev.install                      |    1 +
 debian/qtmobility-examples.install                 |    1 -
 13 files changed, 35 insertions(+), 131 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bef76b6..a820ff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,21 @@
-qtmobility (1.0.1-3) UNRELEASED; urgency=low
+qtmobility (1.0.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
 
   [ Fathi Boudra ]
   * Disable Qt Mobility Bearer management module. It is merged in Qt as
     Qt Network Bearer management module after Qt 4.7.0 beta 2 release.
+  * Remove patches:
+    - 01_fix_ftbfs_incorrect_copy2build_output_value.diff
+    - 03_ftbfs_multimedia_plugin.diff
+    - 0001_rename_smallsensors.diff
+    - 0002_rename_sysinfo.diff
   * Update debian/control:
     - add libgstreamer-plugins-base0.10-dev, libxext-dev and libxv-dev build
       dependencies.
     - add libqt4-sql-sqlite dependency to libqtsensors1 package.
     - add hal dependency to libqtserviceframework1 package.
+    - add libdeclarative-contacts and libdeclarative-sensors packages.
   * Update debian/rules:
     - remove more leftover files and directories.
   * Update debian/*.install files.
@@ -15,7 +23,7 @@ qtmobility (1.0.1-3) UNRELEASED; urgency=low
   [ Modestas Vainius ]
   * Fix debian/control Vcs fields to point to the new location.
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 20 Jul 2010 17:35:13 +0300
+ -- Fathi Boudra <fabo at debian.org>  Mon, 09 Aug 2010 19:30:37 +0300
 
 qtmobility (1.0.1-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 70595c9..25685be 100644
--- a/debian/control
+++ b/debian/control
@@ -121,6 +121,14 @@ Description: Qt Mobility Versit module
  .
  This package contains an API to manage Versit documents.
 
+Package: libdeclarative-contacts
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt Mobility Contacts QML plugin
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+ .
+ This package contains the Contacts QML plugin for QtDeclarative.
+
 Package: libdeclarative-multimedia
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -137,6 +145,14 @@ Description: Qt Mobility Publish and Subscribe QML plugin
  .
  This package contains the Publish and Subscribe QML plugin for QtDeclarative.
 
+Package: libdeclarative-sensors
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt Mobility Sensors QML plugin
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+ .
+ This package contains the Sensors QML plugin for QtDeclarative.
+
 Package: libdeclarative-serviceframework
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/libdeclarative-contacts.install b/debian/libdeclarative-contacts.install
new file mode 100644
index 0000000..4c6c5de
--- /dev/null
+++ b/debian/libdeclarative-contacts.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/imports/QtMobility/contacts/libdeclarative_contacts.so
+usr/lib/qt4/imports/QtMobility/contacts/qmldir
diff --git a/debian/libdeclarative-sensors.install b/debian/libdeclarative-sensors.install
new file mode 100644
index 0000000..724adc3
--- /dev/null
+++ b/debian/libdeclarative-sensors.install
@@ -0,0 +1,2 @@
+usr/lib/qt4/imports/QtMobility/sensors/libdeclarative_sensors.so
+usr/lib/qt4/imports/QtMobility/sensors/qmldir
diff --git a/debian/libqtbearer1.install b/debian/libqtbearer1.install
deleted file mode 100644
index ad7f339..0000000
--- a/debian/libqtbearer1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libQtBearer.so.*
diff --git a/debian/patches/0001_rename_smallsensors.diff b/debian/patches/0001_rename_smallsensors.diff
deleted file mode 100644
index 72bebfc..0000000
--- a/debian/patches/0001_rename_smallsensors.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: rename binary to lowercase characters
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/examples/sensors/small_screen_sensors/small_screen_sensors.pro
-+++ b/examples/sensors/small_screen_sensors/small_screen_sensors.pro
-@@ -1,4 +1,4 @@
--TARGET = SmallSensors
-+TARGET = smallsensors
- TEMPLATE = app
- 
- include(../../examples.pri)
diff --git a/debian/patches/0002_rename_sysinfo.diff b/debian/patches/0002_rename_sysinfo.diff
deleted file mode 100644
index 140a60b..0000000
--- a/debian/patches/0002_rename_sysinfo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: rename binary to qsysinfo
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/examples/sysinfo/sysinfo.pro
-+++ b/examples/sysinfo/sysinfo.pro
-@@ -1,6 +1,6 @@
- QT       += network
- 
--TARGET = sysinfo
-+TARGET = qsysinfo
- TEMPLATE = app
- 
- 
diff --git a/debian/patches/01_fix_ftbfs_incorrect_copy2build_output_value.diff b/debian/patches/01_fix_ftbfs_incorrect_copy2build_output_value.diff
deleted file mode 100644
index f2d679a..0000000
--- a/debian/patches/01_fix_ftbfs_incorrect_copy2build_output_value.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Fix incorrect copy2build output value
-
-copy2build output is set to $$[QT_INSTALL_PREFIX] base path. 
-It caused a build failure when users are non-root (ie 
-autobuilders): 
-cp: cannot create regular file `/usr/imports/QtMobility/serviceframework/qmldir': No such file or directory
-
-Use $$QT_MOBILITY_BUILD_TREE as base path.
-
-Remove useless DESTDIR definitions on related QML plugins.
-
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/plugins/qimportbase.pri
-+++ b/plugins/qimportbase.pri
-@@ -12,7 +12,7 @@ isEmpty(TARGET) {
- 
- QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
- copy2build.input = QMLDIRFILE
--copy2build.output = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH/qmldir
-+copy2build.output = $$QT_MOBILITY_BUILD_TREE/$$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH/qmldir
- !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
- copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
- copy2build.name = COPY ${QMAKE_FILE_IN}
---- a/plugins/declarative/multimedia/multimedia.pro
-+++ b/plugins/declarative/multimedia/multimedia.pro
-@@ -28,7 +28,6 @@ SOURCES += \
- CONFIG += mobility
- MOBILITY += multimedia
- 
--DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH
- target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
- 
- qmldir.files += $$PWD/qmldir
---- a/plugins/declarative/publishsubscribe/publishsubscribe.pro
-+++ b/plugins/declarative/publishsubscribe/publishsubscribe.pro
-@@ -14,7 +14,6 @@ SOURCES += publishsubscribe.cpp
- CONFIG += mobility
- MOBILITY += publishsubscribe
- 
--DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH
- target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
- 
- qmldir.files += $$PWD/qmldir
---- a/plugins/declarative/serviceframework/serviceframework.pro
-+++ b/plugins/declarative/serviceframework/serviceframework.pro
-@@ -16,7 +16,6 @@ SOURCES += qdeclarativeservice.cpp \
- CONFIG += mobility
- MOBILITY += serviceframework
- 
--DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH
- target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
- 
- qmldir.files += $$PWD/qmldir
diff --git a/debian/patches/03_ftbfs_multimedia_plugin.diff b/debian/patches/03_ftbfs_multimedia_plugin.diff
deleted file mode 100644
index de0e6a7..0000000
--- a/debian/patches/03_ftbfs_multimedia_plugin.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Include a copy of QAbstractDynamicMetaObject in qmetadatacontrolmetaobject_p.h
-
-QMetaDataControlMetaObject inherits from QAbstractDynamicMetaObject but the
-qobject_p.h header can't be included when building against packages which don't
-include private headers. We have to make do with a copy of the class instead.
-
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/plugins/declarative/multimedia/qmetadatacontrolmetaobject_p.h
-+++ b/plugins/declarative/multimedia/qmetadatacontrolmetaobject_p.h
-@@ -59,15 +59,27 @@
- // We mean it.
- //
- 
--#include <QtCore/qmetaobject.h>
-+#include <QtCore/QMetaObject>
-+#include <QtCore/QObject>
- #include <qtmedianamespace.h>
- 
--#include <QtCore/private/qobject_p.h>
--
- QT_BEGIN_HEADER
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef QOBJECT_P_H
-+#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0))
-+
-+struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QMetaObject
-+{
-+    virtual ~QAbstractDynamicMetaObject() {}
-+    virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; }
-+    virtual int createProperty(const char *, const char *) { return -1; }
-+};
-+
-+#endif
-+#endif
-+
- class QMetaDataReaderControl;
- 
- class QMetaDataControlMetaObject : public QAbstractDynamicMetaObject
diff --git a/debian/patches/04_ftbfs_multimedia_examples.diff b/debian/patches/04_ftbfs_multimedia_examples.diff
index cd1fc83..1fe2390 100644
--- a/debian/patches/04_ftbfs_multimedia_examples.diff
+++ b/debian/patches/04_ftbfs_multimedia_examples.diff
@@ -8,14 +8,14 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/src/multimedia/effects/effects.pri
 +++ b/src/multimedia/effects/effects.pri
-@@ -5,8 +5,8 @@ unix:!mac {
+@@ -6,8 +6,8 @@ unix:!mac:!symbian {
          DEFINES += QT_MULTIMEDIA_PULSEAUDIO
-         HEADERS += $$PWD/qsoundeffect_pulse_p.h
-         SOURCES += $$PWD/qsoundeffect_pulse_p.cpp
+         PRIVATE_HEADERS += effects/qsoundeffect_pulse_p.h
+         SOURCES += effects/qsoundeffect_pulse_p.cpp
 -        QMAKE_CXXFLAGS += $$QT_CFLAGS_PULSEAUDIO
 -        LIBS += $$QT_LIBS_PULSEAUDIO
 +        QMAKE_CXXFLAGS += -D_REENTRANT
 +        LIBS += -lpulse
      } else {
          DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
-         HEADERS += $$PWD/qsoundeffect_qmedia_p.h
+         PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
diff --git a/debian/patches/series b/debian/patches/series
index 68cabf1..d8dab65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
-0001_rename_smallsensors.diff
-0002_rename_sysinfo.diff
 # merged for 1.0.2
 # 0003_adds_-examplesdir_and_-demosdir_options_to_configure.diff
-01_fix_ftbfs_incorrect_copy2build_output_value.diff
 02_no_rpath.diff
-03_ftbfs_multimedia_plugin.diff
 04_ftbfs_multimedia_examples.diff
 05_fix_translations_install_path.diff
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index f4a9998..dc1e7cd 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -277,6 +277,7 @@ usr/include/QtMultimediaKit/qmetadatareadercontrol.h
 usr/include/QtMultimediaKit/qmetadatawritercontrol.h
 usr/include/QtMultimediaKit/qradiotuner.h
 usr/include/QtMultimediaKit/qradiotunercontrol.h
+usr/include/QtMultimediaKit/qsoundeffect.h
 usr/include/QtMultimediaKit/qtmedianamespace.h
 usr/include/QtMultimediaKit/qvideodevicecontrol.h
 usr/include/QtMultimediaKit/qvideoencodercontrol.h
diff --git a/debian/qtmobility-examples.install b/debian/qtmobility-examples.install
index a69cdb0..277d639 100644
--- a/debian/qtmobility-examples.install
+++ b/debian/qtmobility-examples.install
@@ -13,7 +13,6 @@ usr/bin/metadata
 usr/bin/orientation
 usr/bin/player
 usr/bin/publish-subscribe
-usr/bin/qmlcontacts
 usr/bin/qsysinfo
 usr/bin/querymessages
 usr/bin/radio

-- 
Qt Mobility packaging

More information about the pkg-kde-commits mailing list