rev 17243 - in kde-extras/kmplayer/trunk/debian: . patches source

Fathi Boudra fabo at alioth.debian.org
Mon Mar 1 10:06:56 UTC 2010 

Author: fabo
Date: 2010-03-01 10:06:54 +0000 (Mon, 01 Mar 2010)
New Revision: 17243

Added:
   kde-extras/kmplayer/trunk/debian/patches/02_sh4_support.diff
   kde-extras/kmplayer/trunk/debian/source/
   kde-extras/kmplayer/trunk/debian/source/format
Removed:
   kde-extras/kmplayer/trunk/debian/README.source
Modified:
   kde-extras/kmplayer/trunk/debian/changelog
   kde-extras/kmplayer/trunk/debian/control
   kde-extras/kmplayer/trunk/debian/copyright
   kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff
   kde-extras/kmplayer/trunk/debian/patches/series
   kde-extras/kmplayer/trunk/debian/rules
Log:
* Add patch to support to sh4. Thanks to Nobuhiro Iwamatsu. (Closes: #560124)
* Switch to dpkg-source 3.0 (quilt) format.
* Update debian/control:
  - Remove quilt build dependency
  - Bump build dependencies versions (debhelper, pkg-kde-tools).
  - Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
* Update debian/rules:
  - Enable parallel build (add --parallel option to dh).
  - Remove quilt sequence addon, not needed anymore
    (dpkg-source 3.0 format switch).
  - Remove override_dh_compress target, not needed anymore
    (included in pkg-kde-tools).


Modified: kde-extras/kmplayer/trunk/debian/changelog
===================================================================
--- kde-extras/kmplayer/trunk/debian/changelog	2010-03-01 09:27:30 UTC (rev 17242)
+++ kde-extras/kmplayer/trunk/debian/changelog	2010-03-01 10:06:54 UTC (rev 17243)
@@ -1,3 +1,20 @@
+kmplayer (1:0.11.1b-3) UNRELEASED; urgency=low
+
+  * Add patch to support to sh4. Thanks to Nobuhiro Iwamatsu. (Closes: #560124)
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Update debian/control:
+    - Remove quilt build dependency
+    - Bump build dependencies versions (debhelper, pkg-kde-tools).
+    - Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
+  * Update debian/rules:
+    - Enable parallel build (add --parallel option to dh).
+    - Remove quilt sequence addon, not needed anymore
+      (dpkg-source 3.0 format switch).
+    - Remove override_dh_compress target, not needed anymore
+      (included in pkg-kde-tools).
+
+ -- Fathi Boudra <fabo at debian.org>  Mon, 01 Mar 2010 10:53:04 +0100
+
 kmplayer (1:0.11.1b-2) unstable; urgency=low
 
   [ José Manuel Santamaría Lema ]

Modified: kde-extras/kmplayer/trunk/debian/control
===================================================================
--- kde-extras/kmplayer/trunk/debian/control	2010-03-01 09:27:30 UTC (rev 17242)
+++ kde-extras/kmplayer/trunk/debian/control	2010-03-01 10:06:54 UTC (rev 17243)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7.3.16), quilt, cmake, pkg-kde-tools (>= 0.5),
- kdelibs5-dev (>= 4:4.3.2), libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev,
+Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.5),
+ kdelibs5-dev (>= 4:4.3.4), libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev,
  libgtk2.0-dev, libx11-dev, libxt-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://kmplayer.kde.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kmplayer/?op=log
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kmplayer/trunk/

Modified: kde-extras/kmplayer/trunk/debian/copyright
===================================================================
--- kde-extras/kmplayer/trunk/debian/copyright	2010-03-01 09:27:30 UTC (rev 17242)
+++ kde-extras/kmplayer/trunk/debian/copyright	2010-03-01 10:06:54 UTC (rev 17243)
@@ -7,7 +7,7 @@
 
 Copyright:
 
-   (C) 2002-2009 Koos Vriezen <koos.vriezen at gmail.com>
+   (C) 2002-2010 Koos Vriezen <koos.vriezen at gmail.com>
    (C) 2003 Joonas Koivunen <rzei at mbnet.fi>
 
 Copyright for moz-sdk (except npruntime.h):
@@ -106,7 +106,7 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. 
+ *   (at your option) any later version.
 
    This package is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff	2010-03-01 09:27:30 UTC (rev 17242)
+++ kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff	2010-03-01 10:06:54 UTC (rev 17243)
@@ -3,9 +3,9 @@
 # Forwarded: not-needed
 # Origin: http://websvn.kde.org/?view=revision&revision=1046843
 # 
---- kmess/src/CMakeLists.txt	2009/11/09 20:30:04	1046842
-+++ kmess/src/CMakeLists.txt	2009/11/09 20:31:07	1046843
-@@ -140,7 +140,8 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -139,7 +139,8 @@ if (KMPLAYER_WITH_NPP)
          "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags}"
      )
  

Added: kde-extras/kmplayer/trunk/debian/patches/02_sh4_support.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/02_sh4_support.diff	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/02_sh4_support.diff	2010-03-01 10:06:54 UTC (rev 17243)
@@ -0,0 +1,62 @@
+# DP: Renesas SuperH(sh) support
+#     Nobuhiro Iwamatsu <iwamatsu at debian.org>
+
+--- a/src/moz-sdk/prcpucfg.h
++++ b/src/moz-sdk/prcpucfg.h
+@@ -654,6 +654,56 @@
+ #define PR_BYTES_PER_WORD_LOG2   2
+ #define PR_BYTES_PER_DWORD_LOG2  3
+ 
++#elif defined(__sh__)
++
++#ifdef __LITTLE_ENDIAN__
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#else
++#define IS_BIG_ENDIAN 1
++#undef  IS_LITTLE_ENDIAN
++#endif
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
+ #else
+ 
+ #error "Unknown CPU architecture"

Modified: kde-extras/kmplayer/trunk/debian/patches/series
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/series	2010-03-01 09:27:30 UTC (rev 17242)
+++ kde-extras/kmplayer/trunk/debian/patches/series	2010-03-01 10:06:54 UTC (rev 17243)
@@ -1 +1,2 @@
 01_rev1046843_link_with_X11.diff
+02_sh4_support.diff

Modified: kde-extras/kmplayer/trunk/debian/rules
===================================================================
--- kde-extras/kmplayer/trunk/debian/rules	2010-03-01 09:27:30 UTC (rev 17242)
+++ kde-extras/kmplayer/trunk/debian/rules	2010-03-01 10:06:54 UTC (rev 17243)
@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt,kde $@
+	dh --parallel --with kde $@
 
 override_dh_install:
 	dh_install
 	rm -rf debian/kmplayer/usr/share/icons/oxygen/
 	chmod +x debian/kmplayer/usr/share/kde4/apps/kmplayer/find-media.sh
 
-override_dh_compress:
-	dh_compress -X.docbook
-
 .PHONY: override_dh_auto_test

Added: kde-extras/kmplayer/trunk/debian/source/format
===================================================================
--- kde-extras/kmplayer/trunk/debian/source/format	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/source/format	2010-03-01 10:06:54 UTC (rev 17243)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-kde-commits mailing list