Commit d0a73ae5 authored by Jonathan Carter's avatar Jonathan Carter

new upstream release, bunch of fixes

parent 07a32da1
tuxpaint (1:0.9.23-1) unstable; urgency=medium
* New upstream release
* Update debian-jr uploader e-mail address
(Closes: #899294)
* Update standards version to 4.2.1
* Update copyright years
* debian/rules: remove build-gnome target, no longer
exists upstream
* Add patch to use kbuildsycoca5 instead of kbuildsycoca4
* Add build-dependency: libkf5service-bin
* Install .desktop file to /usr/share/applications
* Remove empty directory usr/share/doc/tuxpaint-data/nn
* Add lintian-overrides for hardening false-alarms
-- Jonathan Carter <jcc@debian.org> Tue, 11 Sep 2018 09:52:01 +0200
tuxpaint (1:0.9.22-12) unstable; urgency=medium
* Set date in makefile to package date instead of build time
......
......@@ -2,12 +2,13 @@ Source: tuxpaint
Section: graphics
Priority: optional
Maintainer: Jonathan Carter <jcc@debian.org>
Uploaders: Debian Junior Maintainers <debianjr-maintainers@lists.alioth.debian.org>
Uploaders: Debian Junior Maintainers <debian-jr@lists.debian.org>
Build-Depends: debhelper (>= 11),
gettext,
gperf,
libcairo2-dev,
libfribidi-dev,
libkf5service-bin,
libpaper-dev,
libpng-dev,
librsvg2-dev,
......@@ -17,11 +18,10 @@ Build-Depends: debhelper (>= 11),
libsdl-ttf2.0-dev,
libsdl1.2-dev,
libvorbis-dev (>= 1.0.0-2)
Standards-Version: 4.1.3
Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/debian-jr-team/tuxpaint
Vcs-Git: https://salsa.debian.org/debian-jr-team/tuxpaint.git
Package: tuxpaint
Architecture: any
Depends: libvorbis0a (>= 1.0.0-2),
......
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: tuxpaint
Source: http://downloads.sourceforge.net/tuxpaint/
Comment: This package was debianized by Ben Armstrong
Comment: This package was originally debianized by Ben Armstrong
<synrg@sanctuary.nslug.ns.ca> on Tue, 18 Jun 2002 16:20:10 -0300.
Files: *
Copyright: 2002-2007 Bill Kendrick <bill@newbreedsoftware.com>
Copyright: 2002-2018 Bill Kendrick <bill@newbreedsoftware.com>
License: GPL-2+
Files: fonts/locale/el.ttf
......@@ -140,4 +140,3 @@ License: LGPL-2.1
.
On Debian systems, the complete text of the GNU Lesser General Public License
version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1.
# false alarms since hardening is set
tuxpaint: hardening-no-bindnow
hardening-no-bindnow
hardening-no-fortify-functions
# false alarms since hardening is set
tuxpaint-plugins-default: hardening-no-fortify-functions
tuxpaint-plugins-default: hardening-no-bindnow
Description: add fdo keywords
Add play, paind, draw and art keywords to .desktop file
--- tuxpaint-0.9.22.orig/src/tuxpaint.desktop
+++ tuxpaint-0.9.22/src/tuxpaint.desktop
@@ -113,6 +113,7 @@ Type=Application
Exec=tuxpaint
Icon=tuxpaint
Terminal=false
+Keywords=play;paint;draw;art;
Categories=Education;Art;
GenericName=Drawing program
GenericName[ach]=Purugram me goc
--- tuxpaint-0.9.22.orig/src/tuxpaint.desktop.in
+++ tuxpaint-0.9.22/src/tuxpaint.desktop.in
@@ -5,5 +5,6 @@ Exec=tuxpaint
Icon=tuxpaint
Terminal=false
Categories=Education;Art;
+Keywords=play;paint;draw;art;
_GenericName=Drawing program
_Comment=A drawing program for children.
Description: fix manpage errors
Remove .l macro which doesn't work (and doesn't seem to do anything).
--- tuxpaint-0.9.22.orig/src/manpage/tuxpaint-pl.1
+++ tuxpaint-0.9.22/src/manpage/tuxpaint-pl.1
@@ -85,7 +85,6 @@ Wywietl list wszystkich opcji moliwyc
Poka licencj (GNU GPL) zgodnie z ktr opublikowano \fITux Paint\fPa.
.SH OPCJE - INTERFEJS
-.l
\fItuxpaint\fP rozpoznaje nastpujce opcje, zmieniajce cechy interfejsu.
Opcji tych mona uywa wraz z, zamiast lub aby zmieni opcje podane w plikach
konfiguracyjnych. (Zobacz poniej.)
@@ -190,7 +189,6 @@ albo \fI\-\-saveovernew\fP (wtedy zawsze
Domylnie program prosi o potwierdzenie przy zapisie (\fI\-\-saveoverask\fP).
.SH OPCJE - JZYK
-.l
Rne czci \fITux Paint\fPa zostay przetumaczone na liczne jzyki.
\fITux Paint\fP bdzie stara si jak najbardziej respektowa Twoje ustawienie
\fIlocale\fP (tzn. zmienn rodowiskow \fILANG\fP), jeli to tylko moliwe.
@@ -309,7 +307,6 @@ Z t opcj, \fITux Paint\fP nie bdzie p
oglnosystemowego pliku konfiguracyjnego (zwykle jest to \fI/etc/tuxpaint/tuxpaint.conf\fP).
.SH RODOWISKO
-.l
Chocia \fITux Paint\fP moe porednio odwoywa si do wielu zmiennych systemowych
(np. poprzez \fISDL(3)\fP), bezporednio wykorzystuje tylko nastpujce zmienne:
.PP
--- tuxpaint-0.9.22.orig/src/manpage/tuxpaint.1
+++ tuxpaint-0.9.22/src/manpage/tuxpaint.1
@@ -247,7 +247,6 @@ Display a list of all commandline option
Show the license (GNU GPL) under which Tux Paint is released.
.SH OPTIONS - INTERFACE
-.l
\fItuxpaint\fP accepts the following options to alter the interface.
They can be used along with, instead of, or to override options set in
configuration files. (See below.)
@@ -496,7 +495,6 @@ containing one color description per lin
"\fI#000 Black\fP" and "\fI255 192 64 Orange\fP".)
.SH OPTIONS - LANGUAGE
-.l
Various parts of \fITux Paint\fP have been translated into numerous languages.
\fITux Paint\fP will try its best to honor your \fIlocale\fP setting
(i.e., the \fILANG\fP environment variable), if possible.
Description: fix spelling mistake in man pages
s/SYNOPSYS/SYNOPSIS/g
--- tuxpaint-0.9.22.orig/src/manpage/tp-magic-config.1
+++ tuxpaint-0.9.22/src/manpage/tp-magic-config.1
@@ -3,7 +3,7 @@
.SH NAME
tp-magic-config -- Helps creating 'Magic' tool plugins for Tux Paint(1)
-.SH SYNOPSYS
+.SH SYNOPSIS
.TP 16
.B tp-magic-config [\-\-apiversion | \-\-version | \-\-cflags | \-\-pluginprefix | \-\-plugindocprefix | \-\-dataprefix | \-\-localpluginprefix | \-\-localdataprefix]
--- tuxpaint-0.9.22.orig/src/manpage/tuxpaint-import.1
+++ tuxpaint-0.9.22/src/manpage/tuxpaint-import.1
@@ -3,7 +3,7 @@
.SH NAME
tuxpaint-import -- Import image files into Tux Paint(1)
-.SH SYNOPSYS
+.SH SYNOPSIS
.TP 16
.B tuxpaint-import [\-\-help]
.TP 16
--- tuxpaint-0.9.22.orig/src/manpage/tuxpaint.1
+++ tuxpaint-0.9.22/src/manpage/tuxpaint.1
@@ -3,7 +3,7 @@
.SH NAME
tuxpaint -- "Tux Paint", a drawing program for young children.
-.SH SYNOPSYS
+.SH SYNOPSIS
.B tuxpaint
[\-\-help \-\-version \-\-verbose\-version \-\-usage \-\-copying]
Description: Fix a parallel build FTBFS
Files were sometimes written to trans/ before that directory was created.
Based on similar patch for tuxpaint-config
Author: Adrian Bunk <bunk@debian.org>
Jonathan Carter <jcc@debian.org>
Index: tuxpaint-0.9.23/Makefile
===================================================================
--- tuxpaint-0.9.23.orig/Makefile
+++ tuxpaint-0.9.23/Makefile
@@ -438,7 +438,7 @@ endif
# Build the translation files for gettext
-$(MOFILES): trans/%.mo: src/po/%.po
+$(MOFILES): trans/%.mo: src/po/%.po trans
msgfmt -o $@ $<
.PHONY: translations
fix-manpage-errors
add-fdo-keywords
fix-manpage-spelling
fix-parallel-builds
update-kbuildsycoca
Description: update required kbuildsycoca version
kbuildsycoca4 is no longer available. Use kbuildsycoca5 instead.
Author: Jonathan Carter <jcc@debian.org>
Last-Update: 2018-09-11
--- tuxpaint-0.9.23.orig/Makefile
+++ tuxpaint-0.9.23/Makefile
@@ -786,7 +786,7 @@ install-kde:
cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/; \
chmod 644 $(DESTDIR)$(KDE_PREFIX)/tuxpaint.desktop; \
fi
- kbuildsycoca4
+ HOME=/tmp kbuildsycoca5
.PHONY: install-kde-icons
install-kde-icons:
......@@ -3,20 +3,22 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
export DH_ALWAYS_EXCLUDE=CVS
DPKG_EXPORT_BUILDFLAGS = 1
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
ifeq ($(shell dpkg --print-architecture), x32)
CFLAGS += -fPIC
CXXFLAGS += -fPIC
CPPFLAGS += -fPIC
endif
DPKG_EXPORT_BUILDFLAGS = 1
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
include /usr/share/dpkg/buildflags.mk
VER_DATE = $(shell date --utc --date="$$(dpkg-parsechangelog -SDate)" '+%Y-%m-%d')
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
DEBUG_FLAGS += -g
endif
# Needed for automatic dbgsym package
DEBUG_FLAGS += -g
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
......@@ -69,7 +71,7 @@ install: build
# - Note: install-icon is called here even though it seems
# it belongs in tuxpaint-data as it is needed for the menu
# icon.
$(MAKE) install-bin install-gnome install-kde install-icon \
$(MAKE) install-bin install-kde install-icon \
install-importscript install-default-config install-bash-completion \
PREFIX=$(CURDIR)/debian/tuxpaint/usr \
CONFDIR=$(CURDIR)/debian/tuxpaint/etc/tuxpaint \
......@@ -108,7 +110,7 @@ install: build
# Cleanup after install-doc, removing extra changelog, license and install files.
rm -f $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/CHANGES*
rm -f $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/COPYING*
rm -rf $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/COPYING*
rm -f $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/INSTALL*
rm -f $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/dejavu*
rm -f $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/*/COP*
......@@ -123,11 +125,15 @@ install: build
find $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data -name Makefile -exec rm -f {} \;
rm -rf $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/magic-docs/src
rm -rf $(CURDIR)/debian/tuxpaint-data/usr/share/doc/tuxpaint-data/nn
# We already have an opendesktop-compliant desktop file, so this
# one for KDE is redundant.
rm -rf $(CURDIR)/debian/tuxpaint/usr/share/applnk
# Add .desktop file
cp ./src/tuxpaint.desktop $(CURDIR)/debian/tuxpaint/usr/share/applications
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
......
usr/share/icons/hicolor/16x16/apps
usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/48x48/apps
usr/share/tuxpaint
usr/share/tuxpaint/fonts/locale
usr/share/icons/hicolor/48x48/apps
usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/16x16/apps
usr/lib/tuxpaint/plugins
usr/share/doc/tuxpaint-plugins-default
usr/share/tuxpaint/images/magic
usr/share/tuxpaint/sounds/magic
usr/share/doc/tuxpaint-plugins-default
# false alarms since hardening is set
hardening-no-fortify-functions
hardening-no-bindnow
usr/bin
usr/share/pixmaps
usr/share/applnk/Graphics
usr/share/applications
usr/share/applnk/Graphics
usr/share/pixmaps
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment