[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.7.0-beta1-1-16-gbbaf4b9

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit bbaf4b938293c0d287638ad53e27bf65a96ca348
Author: Fathi Boudra <fabo at debian.org>
Date:   Mon Jun 28 20:02:00 2010 +0300

    remove libqt4-declarative-widgets package.
    Update installed files.
---
 debian/changelog                            |    4 +++-
 debian/control                              |    9 ---------
 debian/libqt4-declarative-particles.install |    2 +-
 debian/libqt4-declarative-widgets.install   |    2 --
 debian/libqtcore4.install                   |    3 +--
 debian/qt4-qmlviewer.install                |    2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cdabe55..256f101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,12 @@ qt4-x11 (4:4.7.0~beta1+git3529+59c5857-1) UNRELEASED; urgency=low
   * Remove Debian patches:
     - 81_hurd_architecture.diff - merged upstream.
     - 97_alpha_ftbfs_qatomic_alpha_h_types.diff - merged upstream.
+  * Update debian/control:
+    - remove libqt4-declarative-widgets package.
   * Update debian/rules:
     - replace -multimedia by -no-multimedia configure option.
-    - add -no-mediaservices configure option.
     - replace -webkit by -no-webkit configure option.
+  * Update installed files.
 
  -- Fathi Boudra <fabo at debian.org>  Mon, 28 Jun 2010 14:41:40 +0300
 
diff --git a/debian/control b/debian/control
index 10b6ec8..1382505 100644
--- a/debian/control
+++ b/debian/control
@@ -334,15 +334,6 @@ Description: Qt 4 particles QML plugin
  .
  This package contains the particles QML plugin for QtDeclarative.
 
-Package: libqt4-declarative-widgets
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 widgets QML plugin
- 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 contains the widgets QML plugin for QtDeclarative.
-
 Package: libqt4-dev
 Architecture: any
 Section: libdevel
diff --git a/debian/libqt4-declarative-particles.install b/debian/libqt4-declarative-particles.install
index c84f997..25bab82 100644
--- a/debian/libqt4-declarative-particles.install
+++ b/debian/libqt4-declarative-particles.install
@@ -1,2 +1,2 @@
-usr/lib/qt4/imports/Qt/labs/particles/libparticles.so
+usr/lib/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so
 usr/lib/qt4/imports/Qt/labs/particles/qmldir
diff --git a/debian/libqt4-declarative-widgets.install b/debian/libqt4-declarative-widgets.install
deleted file mode 100644
index 5dd7c34..0000000
--- a/debian/libqt4-declarative-widgets.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/qt4/imports/Qt/widgets/libwidgets.so
-usr/lib/qt4/imports/Qt/widgets/qmldir
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index 6fae0ad..4938b1b 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -8,8 +8,7 @@ usr/share/qt4/translations/qt_de.qm
 usr/share/qt4/translations/qt_es.qm
 usr/share/qt4/translations/qt_fr.qm
 usr/share/qt4/translations/qt_hu.qm
-usr/share/qt4/translations/qt_iw.qm
-usr/share/qt4/translations/qt_ja_JP.qm
+usr/share/qt4/translations/qt_ja.qm
 usr/share/qt4/translations/qt_pl.qm
 usr/share/qt4/translations/qt_pt.qm
 usr/share/qt4/translations/qt_ru.qm
diff --git a/debian/qt4-qmlviewer.install b/debian/qt4-qmlviewer.install
index f0f2c4d..c7e0b5b 100644
--- a/debian/qt4-qmlviewer.install
+++ b/debian/qt4-qmlviewer.install
@@ -1 +1 @@
-usr/bin/qml
+usr/bin/qmlviewer

-- 
Qt 4 Debian packaging