[SCM] qtjsbackend packaging branch, master, updated. cc03f81eb139bebbb3abdfd9f098a89a7a4cd36f

Timo Jyrinki timo at alioth.debian.org
Tue Dec 18 07:55:19 UTC 2012


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

The following commit has been merged in the master branch:
commit cc03f81eb139bebbb3abdfd9f098a89a7a4cd36f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Dec 18 07:54:18 2012 +0000

    Update for rc2.
    
    Reformat copyright for DEP-5. Run qmake manually in rules to prevent
    complaint about missing .qmake.conf.
---
 debian/changelog                                   |    2 +-
 debian/control                                     |   19 +++--
 debian/copyright                                   |   77 ++++++++++----------
 debian/libqt5v8-5-dev.install                      |    8 ++
 ...-dev.install => libqt5v8-5-private-dev.install} |    7 +-
 debian/libqt5v8-5.install                          |    1 +
 debian/libqtv8-5-dev.install                       |    9 ---
 debian/libqtv8-5.install                           |    1 -
 debian/rules                                       |    5 +-
 9 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea41f7e..5f554bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtjsbackend-opensource-src (5.0.0~beta1-1) unstable; urgency=low
+qtjsbackend-opensource-src (5.0.0~rc2-1) unstable; urgency=low
 
   * Initial release.
 
diff --git a/debian/control b/debian/control
index 9265454..46c84f5 100644
--- a/debian/control
+++ b/debian/control
@@ -17,10 +17,10 @@ Homepage: http://qt-project.org/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qtjsbackend.git
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtjsbackend.git;a=summary
 
-Package: libqtv8-5
+Package: libqt5v8-5
 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 JavaScript backend module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -28,10 +28,11 @@ Description: Qt 5 JavaScript backend module
  .
  The Qt JavaScript backend module powered by V8 JavaScript engine.
 
-Package: libqtv8-5-dev
+Package: libqt5v8-5-dev
 Section: libdevel
 Architecture: any
-Depends: libqtv8-5 (= ${binary:Version}), ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: libqt5v8-5 (= ${binary:Version}), ${misc:Depends}
 Description: Qt 5 JavaScript backend development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -39,10 +40,11 @@ Description: Qt 5 JavaScript backend development files
  This package contains the header development files used for building Qt 5
  applications using V8 JavaScript engine.
 
-Package: libqtv8-5-private-dev
+Package: libqt5v8-5-private-dev
 Architecture: any
 Section: libdevel
-Depends: libqtv8-5-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: libqt5v8-5-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 JavaScript backend private development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -50,11 +52,12 @@ Description: Qt 5 JavaScript backend private development files
  This package contains the private header development files used for building
  Qt 5 applications using V8 JavaScript engine private headers.
 
-Package: libqtv8-5-dbg
+Package: libqt5v8-5-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: libqtv8-5 (= ${binary:Version}), ${misc:Depends}
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Depends: libqt5v8-5 (= ${binary:Version}), ${misc:Depends}
 Description: Qt 5 JavaScript backend 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.
diff --git a/debian/copyright b/debian/copyright
index 25b0a0c..ab372a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,29 +54,19 @@ Copyright: 2006-2012, the V8 project authors. All rights reserved.
            Zaheer Ahmad <zahmad at codeaurora.org>
            Zhongping Wang <kewpie.w.zp at gmail.com>
 License: BSD
-
-Files: debian/*
-Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
-           2007-2012 Sune Vuorela <debian at pusling.com>
-           2008-2012 Modestas Vainius <modax at debian.org>
-           2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
-           2005-2007 Brian Nelson <pyro at debian.org>
-License: LGPL-2.1
-
-License:
-This license applies to all parts of V8 that are not externally maintained
-libraries. The externally maintained libraries used by V8 are:
-
+ This license applies to all parts of V8 that are not externally maintained
+ libraries. The externally maintained libraries used by V8 are:
+ .
   - PCRE test suite, located in
     test/mjsunit/third_party/regexp-pcre.js.  This is based on the
     test suite from PCRE-7.3, which is copyrighted by the University
     of Cambridge and Google, Inc.  The copyright notice and license
     are embedded in regexp-pcre.js.
-
+ .
   - Layout tests, located in test/mjsunit/third_party.  These are
     based on layout tests from webkit.org which are copyrighted by
     Apple Computer, Inc. and released under a 3-clause BSD license.
-
+ .
   - Strongtalk assembler, the basis of the files assembler-arm-inl.h,
     assembler-arm.cc, assembler-arm.h, assembler-ia32-inl.h,
     assembler-ia32.cc, assembler-ia32.h, assembler-x64-inl.h,
@@ -84,18 +74,18 @@ libraries. The externally maintained libraries used by V8 are:
     assembler-mips.cc, assembler-mips.h, assembler.cc and assembler.h.
     This code is copyrighted by Sun Microsystems Inc. and released
     under a 3-clause BSD license.
-
+ .
   - Valgrind client API header, located at third_party/valgrind/valgrind.h
     This is release under the BSD license.
-
-These libraries have their own licenses; we recommend you read them,
-as their terms may differ from the terms below.
-
-Copyright 2006-2012, the V8 project authors. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
+ .
+ These libraries have their own licenses; we recommend you read them,
+ as their terms may differ from the terms below.
+ .
+ Copyright 2006-2012, the V8 project authors. All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above
@@ -105,18 +95,27 @@ met:
     * Neither the name of Google Inc. nor the names of its
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-On Debian systems, the complete text of the BSD licensescan be found in
- `/usr/share/common-licenses/BSD`.
+Files: debian/*
+Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
+           2007-2012 Sune Vuorela <debian at pusling.com>
+           2008-2012 Modestas Vainius <modax 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.jyrinki at canonical.com>
+License: LGPL-2.1
+ On Debian systems, the complete text of the LGPL--2.1 license can be found in
+  `/usr/share/common-licenses/LGPL-2.1`.
diff --git a/debian/libqt5v8-5-dev.install b/debian/libqt5v8-5-dev.install
new file mode 100644
index 0000000..14256ec
--- /dev/null
+++ b/debian/libqt5v8-5-dev.install
@@ -0,0 +1,8 @@
+usr/lib/*/libQt5V8.so
+usr/include/qt5/QtV8/QtV8
+usr/include/qt5/QtV8/QtV8Version
+usr/include/qt5/QtV8/qtv8version.h
+usr/lib/*/libQt5V8.prl
+usr/lib/*/libQt5V8.so
+usr/lib/*/pkgconfig/Qt5V8.pc
+usr/share/qt5/mkspecs/modules/qt_lib_v8.pri
diff --git a/debian/libqtv8-5-private-dev.install b/debian/libqt5v8-5-private-dev.install
similarity index 83%
rename from debian/libqtv8-5-private-dev.install
rename to debian/libqt5v8-5-private-dev.install
index a1132f2..bb8ead2 100644
--- a/debian/libqtv8-5-private-dev.install
+++ b/debian/libqt5v8-5-private-dev.install
@@ -1,6 +1,7 @@
-usr/include/qt5/QtV8/5.0.0/QtV8/private/v8-debug.h
-usr/include/qt5/QtV8/5.0.0/QtV8/private/v8-preparser.h
 usr/include/qt5/QtV8/5.0.0/QtV8/private/v8-profiler.h
-usr/include/qt5/QtV8/5.0.0/QtV8/private/v8-testing.h
 usr/include/qt5/QtV8/5.0.0/QtV8/private/v8.h
 usr/include/qt5/QtV8/5.0.0/QtV8/private/v8stdint.h
+usr/include/qt5/QtV8/5.0.0/QtV8/private/v8-testing.h
+usr/include/qt5/QtV8/5.0.0/QtV8/private/v8-debug.h
+usr/include/qt5/QtV8/5.0.0/QtV8/private/qcalculatehash_p.h
+usr/include/qt5/QtV8/5.0.0/QtV8/private/v8-preparser.h
diff --git a/debian/libqt5v8-5.install b/debian/libqt5v8-5.install
new file mode 100644
index 0000000..e84686d
--- /dev/null
+++ b/debian/libqt5v8-5.install
@@ -0,0 +1 @@
+usr/lib/*/libQt5V8.so.*
diff --git a/debian/libqtv8-5-dev.install b/debian/libqtv8-5-dev.install
deleted file mode 100644
index 999f20a..0000000
--- a/debian/libqtv8-5-dev.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/include/qt5/Qt/QtV8
-usr/include/qt5/Qt/qtv8version.h
-usr/include/qt5/QtV8/QtV8
-usr/include/qt5/QtV8/QtV8Version
-usr/include/qt5/QtV8/qtv8version.h
-usr/lib/*/libQtV8.prl
-usr/lib/*/libQtV8.so
-usr/lib/*/pkgconfig/QtV8.pc
-usr/share/qt5/mkspecs/modules/qt_v8.pri
diff --git a/debian/libqtv8-5.install b/debian/libqtv8-5.install
deleted file mode 100644
index 3cc7cbe..0000000
--- a/debian/libqtv8-5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQtV8.so.*
diff --git a/debian/rules b/debian/rules
index ea8b5e0..fbea79b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,10 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 %:
-	dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=libqtv8-5-dbg
+	dh $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=libqt5v8-5-dbg
+
+override_dh_auto_configure:
+	qmake
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
qtjsbackend packaging



More information about the pkg-kde-commits mailing list