Update for PR 1.2

5 files changed, 18 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index ca08ed0..04f838b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-homescreen (4.6.2~git20100406-0maemo1) unstable; urgency=low
+
+  * Updated to PR 1.2
+
+ -- Qt Development Frameworks <qt-info@nokia.com>  Tue, 96 Apr 2010 14:29:01 +0200
+
 qt4-maemo5-homescreen (4.6.2~git20100224-5maemo1) unstable; urgency=low
 
   * Force native paint system
diff --git a/debian/control b/debian/control
index ffe525d..b1d92eb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
-Source: qt4-maemo5-homescreen
+Source: qt4-homescreen
 Section: libs
 Priority: optional
 Maintainer: Qt Development Frameworks <qt-info@nokia.com>
 Uploaders: Harald Fernengel <harald.fernengel@nokia.com>
-Build-Depends: libqt4-maemo5-dev, libhildon1-dev, libhildondesktop1-dev 
+Build-Depends: libqt4-dev (>= 4.6.1), libhildon1-dev, libhildondesktop1-dev 
 Standards-Version: 3.7.3
 
-Package: qt4-maemo5-homescreen-loader
+Package: qt4-homescreen-loader
 Architecture: any
 Section: devel
 Depends: libhildondesktop1
@@ -14,24 +14,24 @@ Description: Qt 4 homescreen widget loader
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package provides a loader for loading Qt homescreen widgets
+ This package provides a loader for Qt homescreen widgets
 
-Package: qt4-maemo5-homescreen-loader-dbg
+Package: qt4-homescreen-loader-dbg
 Priority: extra
 Architecture: any
 Section: devel
-Depends: qt4-maemo5-homescreen-loader
+Depends: qt4-homescreen-loader
 Description: Qt 4 library debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  This packages contains the debugging symbols for the Qt 4 homescreen loader
 
-Package: qt4-maemo5-homescreen-example
+Package: qt4-homescreen-example
 Architecture: any
 Section: devel
-Depends: libqt4-maemo5-core (>= 4.6.1), libqt4-maemo5-gui (>= 4.6.1), qt4-maemo5-homescreen-loader
-Description: Qt 4 Declarative development files
+Depends: libqt4-core (>= 4.6.1), libqt4-gui (>= 4.6.1), qt4-homescreen-loader
+Description: Qt 4 Homescreen Example
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
diff --git a/debian/qt4-maemo5-homescreen-example.install b/debian/qt4-homescreen-example.install
index ce57662..ce57662 100644
--- a/debian/qt4-maemo5-homescreen-example.install
+++ b/debian/qt4-homescreen-example.install
diff --git a/debian/qt4-maemo5-homescreen-loader.install b/debian/qt4-homescreen-loader.install
index 2cfcfde..2cfcfde 100644
--- a/debian/qt4-maemo5-homescreen-loader.install
+++ b/debian/qt4-homescreen-loader.install
diff --git a/debian/rules b/debian/rules
index 9389de5..b7e6de8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_ALWAYS_EXCLUDE := .git
 
-# Ensure the *.debug files aren't included in any package other than libqt4-maemo5-dbg
+# Ensure the *.debug files aren't included in any package other than libqt4-*-dbg
 DEB_DH_INSTALL_ARGS := --exclude=.debug
 
 DEB_MAKE_CLEAN_TARGET := distclean
@@ -32,12 +32,12 @@ DEB_MAKE_CLEAN_TARGET := distclean
 # Shlibs of the current upstream version
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
-DEB_DH_STRIP_ARGS := --dbg-package=qt4-maemo5-homescreen-loader
+DEB_DH_STRIP_ARGS := --dbg-package=qt4-homescreen-loader
 DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
 
 # Only present in official source package
 #DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
 
 common-configure-arch::
-	/opt/qt4-maemo5/bin/qmake CONFIG+=separate_debug_info CONFIG+=separate_debug_info_nocopy QMAKE_CXXFLAGS+="-g" QMAKE_CFLAGS+="-g"
+	/usr/bin/qmake CONFIG+=separate_debug_info CONFIG+=separate_debug_info_nocopy QMAKE_CXXFLAGS+="-g" QMAKE_CFLAGS+="-g"