[SCM] kanagram packaging branch, master, updated. debian/4.12.4-1-129-ge3fc3ea

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jul 29 09:35:09 UTC 2014 

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

The following commit has been merged in the master branch:
commit 679997abf4838f31e5a8dbde120ebdb1f1f41894
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Tue May 28 13:32:45 2013 +0000

    merge
---
 debian/changelog        | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/control          | 23 +++++++----------------
 debian/copyright        |  2 +-
 debian/kanagram.install | 31 ++++++++++++++++++++++++++++++-
 debian/not-installed    |  4 ++++
 debian/rules            |  4 ++--
 6 files changed, 91 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b7c310..76ff42e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+kanagram (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Merge with Debian
+  * Update .install file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:27 +0000
+
+kanagram (4:4.10.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update uploaders.
+  * Bump build-deps.
+  * Manually choose which kanagram files to (not) install.
+
+ -- Sune Vuorela <sune at debian.org>  Sun, 07 Apr 2013 15:56:03 +0000
+
 kanagram (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -87,6 +104,12 @@ kanagram (4:4.8.80-0ubuntu1) quantal; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 06 Jun 2012 13:54:49 +0100
 
+kanagram (4:4.8.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sune Vuorela <sune at debian.org>  Sun, 17 Jun 2012 01:42:04 +0200
+
 kanagram (4:4.8.3-0ubuntu1) quantal; urgency=low
 
   * New upstream release
@@ -131,6 +154,22 @@ kanagram (4:4.7.90-0ubuntu2) precise; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2011 14:17:56 +0000
 
+kanagram (4:4.7.4-2) unstable; urgency=low
+
+  * Team upload. Upload to unstable.
+
+ -- Pino Toscano <pino at debian.org>  Wed, 07 Mar 2012 10:56:27 +0100
+
+kanagram (4:4.7.4-1) experimental; urgency=low
+
+  * New upstream release. 
+  
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
+  * Add myself to Uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Dec 2011 01:36:17 +0100
+
 kanagram (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
@@ -138,6 +177,13 @@ kanagram (4:4.7.3-0ubuntu1) precise; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:46:57 +0000
 
+kanagram (4:4.7.2-1) experimental; urgency=low
+
+  [ Eshat Cakar ]
+  * Initial release. Start from the Kubuntu packaging, thanks!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:43:56 -0300
+
 kanagram (4:4.7.2-0r1) raring; urgency=low
 
   [ Eshat Cakar ]
@@ -170,3 +216,4 @@ kanagram (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
   * Initial release 
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 08 Jul 2011 13:28:38 +0200
+
diff --git a/debian/control b/debian/control
index 7df2cd0..832b2ce 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: misc
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Eshat Cakar <info at eshat.de>
+Uploaders: Eshat Cakar <info at eshat.de>,
+ Sune Vuorela <sune at debian.org>
 Build-Depends: debhelper (>= 7.3.16),
  cmake,
- pkg-kde-tools (>= 0.14), 
- libkdeedu-dev (>= 4:4.10.2),
- libssl-dev
-Standards-Version: 3.9.3
+ pkg-kde-tools (>= 0.14),
+ kde-sc-dev-latest (>= 4:4.10),
+ libkdeedu-dev (>= 4:4.10)
+Standards-Version: 3.9.2
 Homepage: https://projects.kde.org/projects/kde/kdeedu/kanagram
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
@@ -20,19 +21,9 @@ Package: kanagram
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kdeedu-kvtml-data
 Suggests: khelpcenter4
-Description: jumble word puzzle for KDE
+Description: jumble word puzzle
  KAnagram is a game where a random word is shown with its letters scrambled.
  To win, the player must rearrange the letters into the correct order.
  .
  This package is part of the KDE education module
 
-Package: kanagram-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Breaks: kdeedu-dbg (<= 4:4.6.80)
-Replaces: kdeedu-dbg (<= 4:4.6.80)
-Depends: ${misc:Depends}, kanagram (= ${binary:Version})
-Description: debugging symbols for kanagram
- This package contains debugging files used to investigate problems with
- binaries included in kanagram.
diff --git a/debian/copyright b/debian/copyright
index 783f438..eeefc6f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,7 +37,7 @@ License: GFDL-1.2
 
 Files: debian/*
 Copyright: 2011 Rohan Garg <rohangarg at kubuntu.org>
-           2011 Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Copyright: 2011 Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/kanagram.install b/debian/kanagram.install
index 097923b..988d6e0 100644
--- a/debian/kanagram.install
+++ b/debian/kanagram.install
@@ -1 +1,30 @@
-usr/*
+usr/bin/kanagram
+usr/lib/libkanagramengine.so.4*
+usr/share/applications/kde4/kanagram.desktop
+usr/share/doc/kde/HTML/en/kanagram/answer-highlight.png
+usr/share/doc/kde/HTML/en/kanagram/common
+usr/share/doc/kde/HTML/en/kanagram/general-settings.png
+usr/share/doc/kde/HTML/en/kanagram/helpstates.png
+usr/share/doc/kde/HTML/en/kanagram/index.cache.bz2
+usr/share/doc/kde/HTML/en/kanagram/index.docbook
+usr/share/doc/kde/HTML/en/kanagram/kanagram-hint.png
+usr/share/doc/kde/HTML/en/kanagram/kanagram.png
+usr/share/doc/kde/HTML/en/kanagram/newstuff-dialog.png
+usr/share/doc/kde/HTML/en/kanagram/newstuff-settings.png
+usr/share/doc/kde/HTML/en/kanagram/shortcuts-settings.png
+usr/share/doc/kde/HTML/en/kanagram/vocab-editor.png
+usr/share/doc/kde/HTML/en/kanagram/vocab-settings.png
+usr/share/icons/hicolor/128x128/apps/kanagram.png
+usr/share/icons/hicolor/16x16/apps/kanagram.png
+usr/share/icons/hicolor/24x24/apps/kanagram.png
+usr/share/icons/hicolor/32x32/apps/kanagram.png
+usr/share/icons/hicolor/48x48/apps/kanagram.png
+usr/share/icons/hicolor/64x64/apps/kanagram.png
+usr/share/icons/hicolor/80x80/apps/kanagram-harmattan.png
+usr/share/icons/hicolor/scalable/apps/kanagram.svgz
+usr/share/kde4/apps/kanagram/images/kanagram.svg
+usr/share/kde4/apps/kanagram/sounds/chalk.ogg
+usr/share/kde4/apps/kanagram/sounds/right.ogg
+usr/share/kde4/apps/kanagram/sounds/wrong.ogg
+usr/share/kde4/config.kcfg/kanagram.kcfg
+usr/share/kde4/config/kanagram.knsrc
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..9eb4eed
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,4 @@
+./usr/include/kanagram/kanagram_engine_export.h
+./usr/include/kanagram/kanagramgame.h
+./usr/include/kanagram/kanagramsettings.h
+./usr/lib/libkanagramengine.so
diff --git a/debian/rules b/debian/rules
index 85c80f8..244905c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,5 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-override_dh_strip:
-	$(overridden_command) --dbg-package=kanagram-dbg
+override_dh_auto_install:
+	$(overridden_command) --destdir=debian/tmp

-- 
kanagram packaging

More information about the pkg-kde-commits mailing list