[SCM] Debian packaging for kdebluetooth4 branch, master, updated. debian/0.3-1-19-g5019a8a

Fathi Boudra fabo at alioth.debian.org
Wed Feb 10 10:05:18 UTC 2010 

The following commit has been merged in the master branch:
commit 5019a8abc9b670f5ac39c695a7f73fe5480e8a22
Author: Fathi Boudra <fabo at kde.org>
Date:   Wed Feb 10 11:05:04 2010 +0100

    * Switch to dpkg-source 3.0 (quilt) format
    * Update debian/control:
      - Bump build dependencies versions (debhelper and pkg-kde-tools)
      - Remove quilt build dependency
    * Update debian/rules:
      - Enable parallel build (pass --parallel option to dh)
      - Use kde sequence addon (pass --with kde option to dh)
---
 debian/README.source                         |   57 --------------------------
 debian/changelog                             |   12 +++++
 debian/control                               |    5 +-
 debian/copyright                             |    2 +-
 debian/patches/kubuntu_01_document_path.diff |    8 +--
 debian/rules                                 |    4 +-
 6 files changed, 20 insertions(+), 68 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/changelog b/debian/changelog
index 897dfe2..38125ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdebluetooth (1:0.4.1-1) UNRELEASED; urgency=low
 
+  * New upstream release
+
+  [ Didier Raboud ]
   * Imported upstream version 0.4.1
   * Change Homepage from SourceForge to KDE-Apps.org
   * Merging from Ubuntu:
@@ -9,6 +12,15 @@ kdebluetooth (1:0.4.1-1) UNRELEASED; urgency=low
     - Refresh kubuntu_01_document_path.diff
   * Bump Standards-Version, no changes needed.
 
+  [ Fathi Boudra ]
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Update debian/control:
+    - Bump build dependencies versions (debhelper and pkg-kde-tools)
+    - Remove quilt build dependency
+  * Update debian/rules:
+    - Enable parallel build (pass --parallel option to dh)
+    - Use kde sequence addon (pass --with kde option to dh)
+
  -- Didier Raboud <didier at raboud.com>  Wed, 10 Feb 2010 09:55:11 +0100
 
 kdebluetooth (1:0.4~rc1-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 707232d..ee452ba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes at debian.org>, Achim Bohnet <ach at mpe.mpg.de>,
- Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>, Didier Raboud <didier at raboud.com>
-Build-Depends: debhelper (>= 7.3), quilt, cmake, pkg-kde-tools (>= 0.4.10),
+ Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>,
+ Didier Raboud <didier at raboud.com>
+Build-Depends: debhelper (>= 7.4.13), cmake, pkg-kde-tools (>= 0.6.1),
  kdelibs5-dev (>= 4:4.2.96), kdebase-workspace-dev (>= 4:4.2.96),
  libknotificationitem-1-dev
 Standards-Version: 3.8.4
diff --git a/debian/copyright b/debian/copyright
index aa8d841..9712522 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -81,6 +81,6 @@ and `/usr/share/common-licenses/GPL-3'.
 
 The Debian packaging is:
 
-    Copyright (C) 2005-2009, Michael Meskes <meskes at debian.org>
+    Copyright (C) 2005-2010, Michael Meskes <meskes at debian.org>
 
 and is licensed under the GPL-2 or any later version, see above.
diff --git a/debian/patches/kubuntu_01_document_path.diff b/debian/patches/kubuntu_01_document_path.diff
index 6f988ab..cf6f0ce 100644
--- a/debian/patches/kubuntu_01_document_path.diff
+++ b/debian/patches/kubuntu_01_document_path.diff
@@ -1,7 +1,5 @@
-Index: kdebluetooth-0.4/src/trayicon.cpp
-===================================================================
---- kdebluetooth-0.4.orig/src/trayicon.cpp	2010-02-01 15:37:39.000000000 -0500
-+++ kdebluetooth-0.4/src/trayicon.cpp	2010-02-01 18:06:38.057388962 -0500
+--- a/src/trayicon.cpp
++++ b/src/trayicon.cpp
 @@ -57,6 +57,7 @@
  #include <KApplication>
  #include <KStandardAction>
@@ -10,7 +8,7 @@ Index: kdebluetooth-0.4/src/trayicon.cpp
  
  using KWallet::Wallet;
  KBlueTray::KBlueTray(const QString& path, QObject* parent) : KNotificationItem(parent), agentPath(path),m_aboutDialog(0)
-@@ -199,13 +200,7 @@
+@@ -199,13 +200,7 @@ void KBlueTray::initConfig() {
  	confGroup = new KConfigGroup(config, "General");
  	KConfigGroup obexServerConfig(config, "ObexServer");
  	if(!obexServerConfig.hasKey("savePath")) {
diff --git a/debian/rules b/debian/rules
index cf9bea0..66a6a31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
-
 %:
-	dh --with quilt $@
+	dh --parallel --with kde $@
 
 override_dh_install:
 	install -D -p -m0755 debian/kblueplugd \

-- 
Debian packaging for kdebluetooth4

More information about the pkg-kde-commits mailing list