[SCM] kdegraphics-mobipocket packaging branch, master, updated. 6fef8c710a5c575afd00dcd2ec26ee01ea9a378b

[Pino Toscano]

The following commit has been merged in the master branch:
commit 1500e87ad60ea8fab4dce43f0a4adbd45d9c436e
Author: Pino Toscano <pino at debian.org>
Date:   Fri Nov 25 19:47:55 2011 +0100

    update for debian
    
    - adapt headers in control
    - add note in copyright
    - cleanup changelog
    - remove kubuntu-specific variable in rules
    - other minor updates
---
 debian/changelog |   41 +++--------------------------------------
 debian/control   |   27 +++++++++++++--------------
 debian/copyright |    5 ++++-
 debian/rules     |    3 ---
 4 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 976286f..b1fe865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,40 +1,5 @@
-kdegraphics-mobipocket (4:4.7.1-0ubuntu2) oneiric; urgency=low
+kdegraphics-strigi-analyzer (4:4.7.2-0r1) UNRELEASED; urgency=low
 
-  * No-change rebuild so translations aren't stripped from .desktop
-    files anymore.
+  * Initial release. Start from the Ubuntu packaging, thanks!
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 15 Sep 2011 23:31:23 +0200
-
-kdegraphics-mobipocket (4:4.7.1-0ubuntu1) oneiric; urgency=low
-
-  * New upstream release
-
- -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 09 Sep 2011 10:21:24 -0400
-
-kdegraphics-mobipocket (4:4.7.0-0ubuntu1) oneiric; urgency=low
-
-  [ Philip Muškovac ]
-  * New upstream release 
-
-  [ Felix Geyer ]
-  * Set KUBUNTU_DESKTOP_POT because package name != tarball name.
-
- -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 28 Jul 2011 19:16:59 +0200
-
-kdegraphics-mobipocket (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
-
-  [ Harald Sitter ]
-  * Initial release (moved out of kdegraphics)
-  * Repack upstream source to include a copy of GPL
-  * Replace and break old packages (kdegraphics-strigi-plugins and okular)
-
-  [ Philip Muškovac ]
-  * Add kubuntu_mobi_desktop_use_tryexec.diff so TryExec is used to check
-    if okular is actually installed.
-  * kdegraphics-mobipocket Recommends/Enhances okular
-
-  [ Felix Geyer ]
-  * Rename package to kdegraphics-mobipocket.
-  * Add lintian override for desktop-command-not-in-package.
-
- -- Philip Muškovac <yofel at kubuntu.org>  Sat, 16 Jul 2011 13:25:25 +0200
+ -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 16 Nov 2011 14:56:16 +0100
diff --git a/debian/control b/debian/control
index 0dd49a7..1e3bf27 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,25 @@
 Source: kdegraphics-mobipocket
 Section: kde
 Priority: optional
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Harald Sitter <apachelogger at ubuntu.com>
-Build-Depends: cmake,
-               debhelper (>= 7.3.16),
-               kde-sc-dev-latest (>= 4:4.7.0),
-               kdelibs5-dev (>= 4:4.6),
-               libstreamanalyzer-dev (>= 0.6.3),
-               libstreams-dev (>= 0.6.3),
-               okular-dev (>= 4:4.6.90),
-               pkg-kde-tools (>= 0.12)
+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>
+Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
+ cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
+ kdelibs5-dev (>= 4:4.7),
+ libstreamanalyzer-dev (>= 0.6.3), libstreams-dev (>= 0.6.3),
+ okular-dev (>= 4:4.7)
 Standards-Version: 3.9.2
 Homepage: http://www.kde.org/
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdegraphics-mobipocket
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kdegraphics-mobipocket
+Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdegraphics-mobipocket.git
+Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kdegraphics-mobipocket.git
 
 Package: kdegraphics-mobipocket
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: kdegraphics-strigi-plugins (<< 4:4.6.90),
-          okular (<< 4:4.6.90)
+ okular (<< 4:4.6.90)
 Breaks: kdegraphics-strigi-plugins (<< 4:4.6.90),
-        okular (<< 4:4.6.90)
+ okular (<< 4:4.6.90)
 Recommends: okular
 Enhances: okular
 Description: mobipocket plugins for Strigi indexing, Okular and thumbnails
@@ -30,3 +27,5 @@ Description: mobipocket plugins for Strigi indexing, Okular and thumbnails
  about mobipocket files. Additionally they allow the Dolphin file manager to
  create thumbnails for this file format and Okular to display the open the
  files.
+ .
+ This package is part of the KDE graphics module.
diff --git a/debian/copyright b/debian/copyright
index 0b9fda0..10b2fd6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,10 @@
 Format: http://www.debian.org/doc/copyright-format/1.0
-Upstream-Name: Mobipocket
+Upstream-Name: mobipocket
 Upstream-Contact: kde-graphics-devel at kde.org
 Source: ftp.kde.org
+Comment: This package was developed for Ubuntu by the Kubuntu Developers and
+ modified to be included in Debian. See below the copyright holders for debian/*
+ files.
 
 Files: *
 Copyright: 2008, Jakub Stachowski <qbast at go2.pl>
diff --git a/debian/rules b/debian/rules
index acaf088..6a77e53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,3 @@
 #!/usr/bin/make -f
 
-# set the correct gettext domain as source package name != upstream tarball name
-export KUBUNTU_DESKTOP_POT=mobipocket
-
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk

-- 
kdegraphics-mobipocket packaging