[SCM] parley packaging branch, master, updated. debian/4.13.1-1-123-g80421b1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/parley.git;a=commitdiff;h=0b63b94

The following commit has been merged in the master branch:
commit 0b63b94a6df12630761f08e71fa453944936c5b6
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Fri Nov 25 21:49:50 2011 +0000

    * Merge with Debian Git, no changes
    * Initial release, based on the Kubuntu package.
---
 debian/.gitattributes       |  1 +
 debian/changelog            | 12 ++++++++----
 debian/control              | 29 +++++++++++++++++++++--------
 debian/copyright            |  1 +
 debian/source/local-options |  1 +
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index fb86ab6..9046547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-parley (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
+parley (4:4.7.3-0ubuntu1) precise; urgency=low
 
-  [ Philip Muškovac ]
   * New upstream release
+  * Merge with Debian Git, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:47:07 +0000
+
+parley (4:4.7.2-0r0) UNRELEASED; urgency=low
 
   [ Felix Geyer ]
-  * Fix kubuntu-devel address in the maintainer field.
+  * Initial release, based on the Kubuntu package.
 
- -- Philip Muškovac <yofel at kubuntu.org>  Tue, 01 Nov 2011 15:32:57 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Oct 2011 15:43:08 +0200
 
 parley (4:4.7.1-0ubuntu2) oneiric; urgency=low
 
diff --git a/debian/control b/debian/control
index 404de4f..9dc1f13 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,36 @@
 Source: parley
 Section: kde
-Priority: extra
+Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Michal Zajac <quintasan at kubuntu.org>
-Build-Depends: debhelper (>= 7.0.50~), cmake, pkg-kde-tools (>= 0.12),
- kdelibs5-dev, kde-sc-dev-latest (>= 4:4.7.3),
- libkdeedu-dev, libattica-dev, libxml2-dev, libx11-dev,
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Eshat Cakar <info at eshat.de>
+Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
+ cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
+ kdelibs5-dev,
+ libkdeedu-dev,
+ libattica-dev,
+ libxml2-dev,
+ libxslt-dev,
+ libx11-dev,
  libxrender-dev
 Standards-Version: 3.9.2
 Homepage: https://projects.kde.org/projects/kde/kdeedu/parley
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/parley
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/parley
+X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/parley.git
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/parley/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/parley/ubuntu
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/parley.git
 
 Package: parley
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl,
+Depends: ${shlibs:Depends}, ${misc:Depends},
  parley-data (>= ${source:Version}), kdeedu-kvtml-data
 Recommends: krosspython, python-kde4
+Suggests: khelpcenter4
 Description: vocabulary trainer for KDE
  Parley is a utility to help train vocabulary when learning a foreign language.
  It is intended as a replacement for flash cards.
+ .
+ This package is part of the KDE education module.
 
 Package: parley-data
 Architecture: all
@@ -27,3 +38,5 @@ Depends: ${misc:Depends}
 Description: data files for the Parley vocabulary trainer
  This package contains architecture-independent data files for the Parley
  vocabulary trainer.
+ .
+ This package is part of the KDE education module.
diff --git a/debian/copyright b/debian/copyright
index 5fb972b..5bf4f7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,6 +35,7 @@ License: Expat
 
 Files: debian/*
 Copyright: 2011 Michał Zając <quintasan at kubuntu.org>
+Copyright: 2011 Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
 License: GPL-2
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
parley packaging