Merge lp:~smartboyhw/kubuntu-packaging/ksudoku-4.10.3 into lp:~kubuntu-packagers/kubuntu-packaging/plasmate

Proposed by Howard Chan
Status: Merged
Merge reported by: Philip Muškovac
Merged at revision: not available
Proposed branch: lp:~smartboyhw/kubuntu-packaging/ksudoku-4.10.3
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/plasmate
Diff against target: 207 lines (+175/-0) (has conflicts)
6 files modified
debian/changelog (+66/-0)
debian/compat (+1/-0)
debian/control (+34/-0)
debian/copyright (+57/-0)
debian/rules (+16/-0)
debian/source/format (+1/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp:~smartboyhw/kubuntu-packaging/ksudoku-4.10.3
Reviewer Review Type Date Requested Status
Philip Muškovac Needs Fixing
Review via email: mp+163429@code.launchpad.net

This proposal has been superseded by a proposal from 2013-05-12.

Description of the change

New upstream version 4.10.3 + Debian merge

To post a comment you must log in.
Revision history for this message
Philip Muškovac (yofel) wrote :

See #kubuntu-devel

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2013-05-12 14:53:23 +0000
@@ -0,0 +1,66 @@
1ksudoku (4:4.10.3-0ubuntu1) saucy; urgency=low
2
3 * New upstream bugfix release.
4 * Merged with Debian. All files in debian/ are using the Debian version.
5
6 -- Howard Chan <smartboyhw@gmail.com> Sun, 12 May 2013 21:57:43 +0800
7
8ksudoku (4:4.10.2-2) experimental; urgency=low
9
10 [ Pino Toscano ]
11 * Add the libqt4-opengl-dev and libgl1-mesa-dev build dependencies for
12 enabling again OpenGL support.
13
14 -- Sune Vuorela <sune@debian.org> Sat, 13 Apr 2013 14:17:29 +0000
15
16ksudoku (4:4.10.2-1) experimental; urgency=low
17
18 * First release of kdegames after being split by upstream.
19
20 -- Maximiliano Curia <maxy@debian.org> Fri, 12 Apr 2013 09:28:23 +0200
21
22ksudoku (4:4.10.2-0ubuntu1) raring; urgency=low
23
24 * New upstream bugfix release
25
26 -- Philip Muškovac <yofel@kubuntu.org> Sun, 31 Mar 2013 14:57:39 +0200
27
28ksudoku (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
29
30 * New upstream bugfix release
31
32 -- Philip Muškovac <yofel@kubuntu.org> Tue, 05 Mar 2013 16:39:45 +0000
33
34ksudoku (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
35
36 * New upstream release
37
38 -- Rohan Garg <rohangarg@kubuntu.org> Wed, 06 Feb 2013 12:04:32 +0000
39
40ksudoku (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
41
42 * New upstream release candidate
43
44 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 18 Jan 2013 15:54:47 +0000
45
46ksudoku (4:4.9.97-0ubuntu1) raring; urgency=low
47
48 * New upstream release candidate
49
50 -- Philip Muškovac <yofel@kubuntu.org> Thu, 03 Jan 2013 22:43:37 +0100
51
52ksudoku (4:4.9.95-0ubuntu1) raring; urgency=low
53
54 * Install to /usr/games
55 * Version dependency on kdegames-data
56 * New upstream RC release
57
58 -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 18 Dec 2012 23:40:38 +0000
59
60ksudoku (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
61
62 * Initial release
63 * Add libqt4-opengl-dev build-dep
64
65 -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 07 Dec 2012 18:08:51 +0000
66
067
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2013-05-12 14:53:23 +0000
@@ -0,0 +1,1 @@
19
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2013-05-12 14:53:23 +0000
@@ -0,0 +1,34 @@
1Source: ksudoku
2Section: games
3Priority: optional
4Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
5Uploaders: Daniel Schepler <schepler@debian.org>,
6 Sune Vuorela <sune@debian.org>,
7 Fathi Boudra <fabo@debian.org>,
8 Modestas Vainius <modax@debian.org>,
9 George Kiagiadakis <gkiagiad@csd.uoc.gr>,
10 Eshat Cakar <info@eshat.de>,
11 Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
12 Maximiliano Curia <maxy@debian.org>
13Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
14 cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14),
15 kdelibs5-dev (>= 4:4.10),
16 libkdegames-dev (>= 4:4.10),
17 libqt4-opengl-dev,
18 libgl1-mesa-dev | libgl-dev,
19Standards-Version: 3.9.4
20Homepage: http://games.kde.org/
21Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/ksudoku.git
22Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/ksudoku.git
23
24Package: ksudoku
25Architecture: any
26Depends: ${shlibs:Depends}, ${misc:Depends}
27Recommends: khelpcenter4
28Description: Sudoku puzzle game and solver
29 KSudoku is a Sudoku game and solver, supporting a range of 2D and 3D Sudoku
30 variants. In addition to playing Sudoku, it can print Sudoku puzzle sheets
31 and find the solution to any Sudoku puzzle.
32 .
33 This package is part of the KDE games module.
34
035
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2013-05-12 14:53:23 +0000
@@ -0,0 +1,57 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: ksudoku
3Upstream-Contact: Albert Astals Cid <aacid@kde.org>
4 Wolfgang Rohdewald <wolfgang@rohdewald.de>
5Source: http://www.kde.org/download/
6
7Files: *
8Copyright: 2005-2007, The KSudoku Authors
9 2005-2007, Francesco Rossi <redsh@email.it>
10 2006-2007, Mick Kappenburg <ksudoku@kappenburg.net>
11 2006-2008, Johannes Bergmeier <johannes.bergmeier@gmx.net>
12 2009-2012, Ian Wadham <iandw.au@gmail.com>
13License: GPL-2+
14
15Files: doc/*
16Copyright: 2007, Mick Kappenburg <ksudoku@kappenburg.net>
17 2011, Ian Wadham <iandw.au@gmail.com>
18License: GFDL-1.2+
19
20Files: src/generator/sudokuboard.cpp
21 src/generator/sudokuboard.h
22Copyright: 2006, David Bau <david.bau@gmail.com>
23 2011, Ian Wadham <iandw.au@gmail.com>
24License: GPL-2+
25
26Files: debian/*
27Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
28License: GPL-2+
29
30License: GPL-2+
31 This package is free software; you can redistribute it and/or modify
32 it under the terms of the GNU General Public License as published by
33 the Free Software Foundation; either version 2 of the License, or
34 (at your option) any later version.
35 .
36 This package is distributed in the hope that it will be useful,
37 but WITHOUT ANY WARRANTY; without even the implied warranty of
38 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
39 GNU General Public License for more details.
40 .
41 You should have received a copy of the GNU General Public License
42 along with this program. If not, see <http://www.gnu.org/licenses/>
43 .
44 On Debian systems, the complete text of the GNU General Public
45 License version 2 can be found in "/usr/share/common-licenses/GPL-2".
46
47License: GFDL-1.2+
48 Permission is granted to copy, distribute and/or modify this document
49 under the terms of the GNU Free Documentation License, Version 1.2
50 or any later version published by the Free Software Foundation;
51 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
52 A copy of the license is included in the section entitled "GNU
53 Free Documentation License".
54 .
55 On Debian systems, the complete text of the GNU Free Documentation
56 License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
57
058
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2013-05-12 14:53:23 +0000
@@ -0,0 +1,16 @@
1#!/usr/bin/make -f
2
3include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
4
5.PHONY: override_dh_auto_test
6
7override_dh_auto_configure:
8 $(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
9
10override_dh_auto_install:
11 $(overridden_command) --destdir=debian/tmp
12
13generate-icons:
14 while read src dest; do \
15 convert debian/tmp/$$src debian/icons/$$dest; \
16 done <debian/icon-list
017
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2013-05-12 14:53:23 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)

Subscribers

People subscribed via source and target branches

to all changes: