[SCM] qtscript packaging branch, master, updated. d752dd9c0852df0562be7a35b86a7c9cbbaf9d8a

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtscript.git;a=commitdiff;h=d752dd9

The following commit has been merged in the master branch:
commit d752dd9c0852df0562be7a35b86a7c9cbbaf9d8a
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jan 8 10:00:17 2013 +0000

    Updates reflecting qtbase changes
    
    Depend on qt5-default to find the tools, dpkg pre-depends,
    rules cleanup, examples directory update.
---
 debian/control                    |   13 +++++++++----
 debian/copyright                  |    2 +-
 debian/not-installed              |    2 ++
 debian/qtscript5-examples.install |    2 +-
 debian/rules                      |   12 +-----------
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index b2eab25..3f453c4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,14 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Modestas Vainius <modax at debian.org>,
            Sune Vuorela <debian at pusling.com>,
            Pino Toscano <pino at debian.org>,
-           Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+           Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+           Timo Jyrinki <timo at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools,
+               qt5-default,
                qtbase5-private-dev (>= 5)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qtscript.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtscript.git;a=summary
@@ -19,7 +21,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtscript.git;a=summary
 Package: libqt5script5
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 script module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -30,7 +32,7 @@ Description: Qt 5 script module
 Package: libqt5scripttools5
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 script tools module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -45,6 +47,7 @@ Description: Qt 5 script tools module
 Package: qtscript5-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: libqt5script5 (= ${binary:Version}),
          libqt5scripttools5 (= ${binary:Version}),
          ${misc:Depends}
@@ -58,6 +61,7 @@ Description: Qt 5 script development files
 Package: qtscript5-private-dev
 Architecture: any
 Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: qtscript5-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 script private development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -71,6 +75,7 @@ Description: Qt 5 script private development files
 Package: qtscript5-examples
 Architecture: any
 Section: x11
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 script examples
  Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/copyright b/debian/copyright
index 32f021f..f0fe3bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012 Zoltán Balogh <zoltan at bakter.hu>
-           2012 Timo Jyrinki <timo at debian.org>
+           2012 Timo Jyrinki <timo.jyrinki at canonical.com>
 License: LGPL-2.1
 
 License: LGPL-2.1 with Nokia Qt LGPL exception
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..51fa7d1
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+usr/lib/*/libQt5ScriptTools.la
+usr/lib/*/libQt5Script.la
diff --git a/debian/qtscript5-examples.install b/debian/qtscript5-examples.install
index 7d75ff6..f281302 100644
--- a/debian/qtscript5-examples.install
+++ b/debian/qtscript5-examples.install
@@ -1 +1 @@
-usr/lib/qt5/examples
+usr/lib/*/qt5/examples
diff --git a/debian/rules b/debian/rules
index fd275ca..9ba4a6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,21 +8,11 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 %:
-	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtscript5-dbg 
+	dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtscript5-dbg 
 
 override_dh_auto_configure:
 	qmake
 
-override_dh_auto_install:
-	make install INSTALL_ROOT=$(CURDIR)/debian/tmp STRIP=echo
-	
-	# Remove la files (http://wiki.debian.org/ReleaseGoals/LAFileRemoval)
-	rm -f debian/tmp/usr/lib/*/libQt5ScriptTools.la
-	rm -f debian/tmp/usr/lib/*/libQt5Script.la
-
-override_dh_builddeb:
-
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-override_dh_auto_test:

-- 
qtscript packaging