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
1=== added directory 'debian'
2=== renamed directory 'debian' => 'debian.moved'
3=== added file 'debian/changelog'
4--- debian/changelog 1970-01-01 00:00:00 +0000
5+++ debian/changelog 2013-05-12 14:53:23 +0000
6@@ -0,0 +1,66 @@
7+ksudoku (4:4.10.3-0ubuntu1) saucy; urgency=low
8+
9+ * New upstream bugfix release.
10+ * Merged with Debian. All files in debian/ are using the Debian version.
11+
12+ -- Howard Chan <smartboyhw@gmail.com> Sun, 12 May 2013 21:57:43 +0800
13+
14+ksudoku (4:4.10.2-2) experimental; urgency=low
15+
16+ [ Pino Toscano ]
17+ * Add the libqt4-opengl-dev and libgl1-mesa-dev build dependencies for
18+ enabling again OpenGL support.
19+
20+ -- Sune Vuorela <sune@debian.org> Sat, 13 Apr 2013 14:17:29 +0000
21+
22+ksudoku (4:4.10.2-1) experimental; urgency=low
23+
24+ * First release of kdegames after being split by upstream.
25+
26+ -- Maximiliano Curia <maxy@debian.org> Fri, 12 Apr 2013 09:28:23 +0200
27+
28+ksudoku (4:4.10.2-0ubuntu1) raring; urgency=low
29+
30+ * New upstream bugfix release
31+
32+ -- Philip Muškovac <yofel@kubuntu.org> Sun, 31 Mar 2013 14:57:39 +0200
33+
34+ksudoku (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
35+
36+ * New upstream bugfix release
37+
38+ -- Philip Muškovac <yofel@kubuntu.org> Tue, 05 Mar 2013 16:39:45 +0000
39+
40+ksudoku (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
41+
42+ * New upstream release
43+
44+ -- Rohan Garg <rohangarg@kubuntu.org> Wed, 06 Feb 2013 12:04:32 +0000
45+
46+ksudoku (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
47+
48+ * New upstream release candidate
49+
50+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 18 Jan 2013 15:54:47 +0000
51+
52+ksudoku (4:4.9.97-0ubuntu1) raring; urgency=low
53+
54+ * New upstream release candidate
55+
56+ -- Philip Muškovac <yofel@kubuntu.org> Thu, 03 Jan 2013 22:43:37 +0100
57+
58+ksudoku (4:4.9.95-0ubuntu1) raring; urgency=low
59+
60+ * Install to /usr/games
61+ * Version dependency on kdegames-data
62+ * New upstream RC release
63+
64+ -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 18 Dec 2012 23:40:38 +0000
65+
66+ksudoku (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
67+
68+ * Initial release
69+ * Add libqt4-opengl-dev build-dep
70+
71+ -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 07 Dec 2012 18:08:51 +0000
72+
73
74=== added file 'debian/compat'
75--- debian/compat 1970-01-01 00:00:00 +0000
76+++ debian/compat 2013-05-12 14:53:23 +0000
77@@ -0,0 +1,1 @@
78+9
79
80=== added file 'debian/control'
81--- debian/control 1970-01-01 00:00:00 +0000
82+++ debian/control 2013-05-12 14:53:23 +0000
83@@ -0,0 +1,34 @@
84+Source: ksudoku
85+Section: games
86+Priority: optional
87+Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
88+Uploaders: Daniel Schepler <schepler@debian.org>,
89+ Sune Vuorela <sune@debian.org>,
90+ Fathi Boudra <fabo@debian.org>,
91+ Modestas Vainius <modax@debian.org>,
92+ George Kiagiadakis <gkiagiad@csd.uoc.gr>,
93+ Eshat Cakar <info@eshat.de>,
94+ Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
95+ Maximiliano Curia <maxy@debian.org>
96+Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
97+ cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14),
98+ kdelibs5-dev (>= 4:4.10),
99+ libkdegames-dev (>= 4:4.10),
100+ libqt4-opengl-dev,
101+ libgl1-mesa-dev | libgl-dev,
102+Standards-Version: 3.9.4
103+Homepage: http://games.kde.org/
104+Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/ksudoku.git
105+Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/ksudoku.git
106+
107+Package: ksudoku
108+Architecture: any
109+Depends: ${shlibs:Depends}, ${misc:Depends}
110+Recommends: khelpcenter4
111+Description: Sudoku puzzle game and solver
112+ KSudoku is a Sudoku game and solver, supporting a range of 2D and 3D Sudoku
113+ variants. In addition to playing Sudoku, it can print Sudoku puzzle sheets
114+ and find the solution to any Sudoku puzzle.
115+ .
116+ This package is part of the KDE games module.
117+
118
119=== added file 'debian/copyright'
120--- debian/copyright 1970-01-01 00:00:00 +0000
121+++ debian/copyright 2013-05-12 14:53:23 +0000
122@@ -0,0 +1,57 @@
123+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
124+Upstream-Name: ksudoku
125+Upstream-Contact: Albert Astals Cid <aacid@kde.org>
126+ Wolfgang Rohdewald <wolfgang@rohdewald.de>
127+Source: http://www.kde.org/download/
128+
129+Files: *
130+Copyright: 2005-2007, The KSudoku Authors
131+ 2005-2007, Francesco Rossi <redsh@email.it>
132+ 2006-2007, Mick Kappenburg <ksudoku@kappenburg.net>
133+ 2006-2008, Johannes Bergmeier <johannes.bergmeier@gmx.net>
134+ 2009-2012, Ian Wadham <iandw.au@gmail.com>
135+License: GPL-2+
136+
137+Files: doc/*
138+Copyright: 2007, Mick Kappenburg <ksudoku@kappenburg.net>
139+ 2011, Ian Wadham <iandw.au@gmail.com>
140+License: GFDL-1.2+
141+
142+Files: src/generator/sudokuboard.cpp
143+ src/generator/sudokuboard.h
144+Copyright: 2006, David Bau <david.bau@gmail.com>
145+ 2011, Ian Wadham <iandw.au@gmail.com>
146+License: GPL-2+
147+
148+Files: debian/*
149+Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
150+License: GPL-2+
151+
152+License: GPL-2+
153+ This package is free software; you can redistribute it and/or modify
154+ it under the terms of the GNU General Public License as published by
155+ the Free Software Foundation; either version 2 of the License, or
156+ (at your option) any later version.
157+ .
158+ This package is distributed in the hope that it will be useful,
159+ but WITHOUT ANY WARRANTY; without even the implied warranty of
160+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
161+ GNU General Public License for more details.
162+ .
163+ You should have received a copy of the GNU General Public License
164+ along with this program. If not, see <http://www.gnu.org/licenses/>
165+ .
166+ On Debian systems, the complete text of the GNU General Public
167+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
168+
169+License: GFDL-1.2+
170+ Permission is granted to copy, distribute and/or modify this document
171+ under the terms of the GNU Free Documentation License, Version 1.2
172+ or any later version published by the Free Software Foundation;
173+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
174+ A copy of the license is included in the section entitled "GNU
175+ Free Documentation License".
176+ .
177+ On Debian systems, the complete text of the GNU Free Documentation
178+ License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
179+
180
181=== added file 'debian/rules'
182--- debian/rules 1970-01-01 00:00:00 +0000
183+++ debian/rules 2013-05-12 14:53:23 +0000
184@@ -0,0 +1,16 @@
185+#!/usr/bin/make -f
186+
187+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
188+
189+.PHONY: override_dh_auto_test
190+
191+override_dh_auto_configure:
192+ $(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
193+
194+override_dh_auto_install:
195+ $(overridden_command) --destdir=debian/tmp
196+
197+generate-icons:
198+ while read src dest; do \
199+ convert debian/tmp/$$src debian/icons/$$dest; \
200+ done <debian/icon-list
201
202=== added directory 'debian/source'
203=== added file 'debian/source/format'
204--- debian/source/format 1970-01-01 00:00:00 +0000
205+++ debian/source/format 2013-05-12 14:53:23 +0000
206@@ -0,0 +1,1 @@
207+3.0 (quilt)

Subscribers

People subscribed via source and target branches

to all changes: