[SCM] palapeli packaging branch, master, updated. debian/4.13.1-1-52-g84d2ff1
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jul 29 20:49:19 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/palapeli.git;a=commitdiff;h=24557e3
The following commit has been merged in the master branch:
commit 24557e33924c4356cec9512d7b9ca4dea86f87fc
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Tue Jun 17 17:06:17 2014 +0100
merge with debian
---
debian/.gitattributes | 1 +
debian/changelog | 67 +++++++++++++++++++++++++++++++++++++++
debian/control | 39 ++++++++++++-----------
debian/copyright | 3 +-
debian/kblackbox.install | 12 -------
debian/not-installed | 15 ---------
debian/palapeli.lintian-overrides | 4 +++
debian/rules | 2 --
8 files changed, 94 insertions(+), 49 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 9a58143..61a4e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,70 @@
+palapeli (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+ * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 17 Jun 2014 10:42:03 +0100
+
+palapeli (4:4.13.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 23 May 2014 11:02:11 +0200
+
+palapeli (4:4.12.4-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 28 Apr 2014 12:24:10 +0200
+
+palapeli (4:4.12.2-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 10 Feb 2014 11:31:45 +0100
+
+palapeli (4:4.11.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Do not disable an empty test set.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 30 Jan 2014 15:24:19 +0100
+
+palapeli (4:4.11.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 07 Nov 2013 14:27:45 +0100
+
+palapeli (4:4.11.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 07 Oct 2013 15:28:56 +0200
+
+palapeli (4:4.10.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 11 Jul 2013 17:56:26 +0200
+
+palapeli (4:4.10.4-1) experimental; urgency=low
+
+ * New upstream release.
+ * Add lintian-overrides for private library messages.
+ * Update vcs fields.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 14 Jun 2013 10:54:10 +0200
+
+palapeli (4:4.10.2-1) experimental; urgency=low
+
+ * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 12 Apr 2013 12:12:41 +0200
+
palapeli (4:4.13.0-0ubuntu1) trusty; urgency=medium
* New upstream KDE Software Compilation release
diff --git a/debian/control b/debian/control
index 3dfe1b8..cc8ebf7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,24 +4,26 @@ 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: Daniel Schepler <schepler at debian.org>,
- Sune Vuorela <sune at debian.org>,
- Fathi Boudra <fabo at debian.org>,
- Modestas Vainius <modax at debian.org>,
- George Kiagiadakis <gkiagiad at csd.uoc.gr>,
- Eshat Cakar <info at eshat.de>,
- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
- Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14),
- kdelibs5-dev (>= 4:4.13.0),
- libkdegames-dev (>= 4:4.13.0),
- shared-mime-info
-Standards-Version: 3.9.4
+ Sune Vuorela <sune at debian.org>,
+ Fathi Boudra <fabo at debian.org>,
+ Modestas Vainius <modax at debian.org>,
+ George Kiagiadakis <gkiagiad at csd.uoc.gr>,
+ Eshat Cakar <info at eshat.de>,
+ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+ Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.12),
+ kdelibs5-dev (>= 4:4.11),
+ libkdegames-dev (>= 4:4.11),
+ pkg-kde-tools (>= 0.14),
+ shared-mime-info
+Standards-Version: 3.9.5
Homepage: http://games.kde.org/
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/palapeli
Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/palapeli
-X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/palapeli.git
-X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/palapeli.git
+X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/palapeli.git
+X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/palapeli.git
Package: palapeli-data
Architecture: all
@@ -39,8 +41,10 @@ Description: data files for palapeli jigsaw puzzle game
Package: palapeli
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, palapeli-data (>= ${source:Version})
-Recommends: qhull-bin, khelpcenter4
+Depends: palapeli-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: khelpcenter4, qhull-bin
Description: jigsaw puzzle game
Palapeli is a jigsaw puzzle game. Unlike other games in that genre,
you are not limited to aligning pieces on imaginary grids. The
@@ -49,4 +53,3 @@ Description: jigsaw puzzle game
Palapeli is the Finnish word for jigsaw puzzle.
.
This package is part of the KDE games module.
-
diff --git a/debian/copyright b/debian/copyright
index e7469aa..b2ff813 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -66,7 +66,7 @@ License: GPL-2+
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
@@ -103,4 +103,3 @@ License: LGPL-2+
.
On Debian systems, the complete text of the GNU Library General Public
License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-
diff --git a/debian/kblackbox.install b/debian/kblackbox.install
deleted file mode 100644
index 88e6986..0000000
--- a/debian/kblackbox.install
+++ /dev/null
@@ -1,12 +0,0 @@
-../icons/kblackbox-16.xpm /usr/share/pixmaps
-../icons/kblackbox.xpm /usr/share/pixmaps
-usr/games/kblackbox
-usr/share/applications/kde4/kblackbox.desktop
-usr/share/doc/kde/HTML/en/kblackbox/*
-usr/share/icons/hicolor/128x128/apps/kblackbox.png
-usr/share/icons/hicolor/16x16/apps/kblackbox.png
-usr/share/icons/hicolor/22x22/apps/kblackbox.png
-usr/share/icons/hicolor/32x32/apps/kblackbox.png
-usr/share/icons/hicolor/48x48/apps/kblackbox.png
-usr/share/icons/hicolor/64x64/apps/kblackbox.png
-usr/share/kde4/apps/kblackbox/*
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index c7a259a..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,15 +0,0 @@
-./usr/include/Pala/Slicer
-./usr/include/Pala/SlicerJob
-./usr/include/Pala/SlicerMode
-./usr/include/Pala/SlicerProperty
-./usr/include/Pala/SlicerPropertySet
-./usr/include/libpala/libpalamacros.h
-./usr/include/libpala/slicer.h
-./usr/include/libpala/slicerjob.h
-./usr/include/libpala/slicermode.h
-./usr/include/libpala/slicerproperty.h
-./usr/include/libpala/slicerpropertyset.h
-./usr/lib/libpala.so
-./usr/lib/libpala/libpala-config.cmake
-./usr/lib/libpala/pala-targets-debian.cmake
-./usr/lib/libpala/pala-targets.cmake
diff --git a/debian/palapeli.lintian-overrides b/debian/palapeli.lintian-overrides
new file mode 100644
index 0000000..2af6ffd
--- /dev/null
+++ b/debian/palapeli.lintian-overrides
@@ -0,0 +1,4 @@
+# Private library, not worth an extra package
+palapeli: package-name-doesnt-match-sonames libpala0
+# Private library, no symbols needed
+palapeli: no-symbols-control-file usr/lib/libpala.so.0.2.0
diff --git a/debian/rules b/debian/rules
index 24e3402..1a1dd13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-.PHONY: override_dh_auto_test
-
override_dh_auto_configure:
$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
--
palapeli packaging
More information about the pkg-kde-commits
mailing list