Browse Source

upload to unstable

tags/upstream/1.3.6
Mateusz Łukasik 6 years ago
parent
commit
b7d2f2c005
5 changed files with 67 additions and 42 deletions
  1. +20
    -18
      debian/changelog
  2. +2
    -3
      debian/control
  3. +21
    -20
      debian/copyright
  4. +23
    -0
      debian/patches/manpage-formatting-fixes.patch
  5. +1
    -1
      debian/patches/series

+ 20
- 18
debian/changelog View File

@@ -1,28 +1,32 @@
slim (1.3.6-4) unstable; urgency=medium

* Drop consolekit depends. Thanks Elimar Riesebieter <riesebie@lxtec.de>
for the patch. (Closes: #751618)
* Bump Standards-Version to 3.9.6. (no changes needed)
* Update homepage.
* Update debian/watch to new homepage.
* Add new themes Lines for Debian 8:
- Update debian/copyright.
* Build slim without deprecated consolekit support (Closes: #751618):
- Drop consolekit from Depends and libck-connector-dev
from Build-Depends in debian/control.
- Disable consolekit in CMAKE_FLAGS in debian/rules.
Thanks to Elimar Riesebieter <riesebie@lxtec.de>!
* Bump Standards-Version to 3.9.6, no changes required.
* Update homepage in debian/control and debian/copyright.
* Update debian/watch to point to new homepage.
* Update and clean up debian/copyright.
* Add new Lines theme for Debian Jessie:
- Refresh debian/patches/slim-conf.patch
- Update debian/slim.install, debian/rules and
debian/source/include-binaries for new files.
- Fix select session. (Closes: #756519)
* Making lintian clear package:
- Add fix-hyphen-used-as-minus-sign.patch for like the name call.
- Fix key binding for session selection. (Closes: #756519)
* Make package lintian-clean:
- Add manpage-formatting-fixes.patch to escape a minus
sign and remove a trailing space in the slimlock.1.
- Update debian/copyright.
- Add lintian-overrides for informations which can be ignored.
- Add lintian-overrides for info tags which can be ignored.
- Add lintian-override for check-gpg-signature as a GPG
signature is not provided by upstream yet.
* Rewrite debian/patches/fix-systemd-service.patch, debian/slim.posinst:
- ensure we are starting slim under systemd only when selected as
default. Thanks Didier Roche <didrocks@ubuntu.com> for suggests patch.
- Ensure we are starting slim on systemd only when selected as
default. Thanks Didier Roche <didrocks@ubuntu.com> for the patch.
(Closes: #748668)
* Add lintian-overrides for check-gpg-signature it is not provides by
upstream yet.

-- Mateusz Łukasik <mati75@linuxmint.pl> Sun, 21 Dec 2014 13:46:02 +0100
-- Mateusz Łukasik <mati75@linuxmint.pl> Tue, 13 Jan 2015 20:12:03 +0100

slim (1.3.6-3) unstable; urgency=high

@@ -290,7 +294,6 @@ slim (1.3.0-2) unstable; urgency=low
slim (1.3.0-1) unstable; urgency=low

[ Mike Massonnet <mmassonnet@gmail.com> ]

* Package new upstream version 1.3.0. (Closes: #447913)
- Build against libpam (add build dependency libpam0g-dev).
- DPatch cfg.cpp to include <stdlib.h> and fix FTBFS with GCC-4.3.
@@ -312,7 +315,6 @@ slim (1.3.0-1) unstable; urgency=low
- Patch Makefile (LDFLAGS) to remove unnecessary links.

[ Christian Perrier <bubulle@debian.org> ]

* Debconf templates and debian/control reviewed by the debian-l10n-
english team as part of the Smith review project. (Closes: #426233, #423279)
* Debconf translation updates:


+ 2
- 3
debian/control View File

@@ -4,9 +4,8 @@ Priority: optional
Maintainer: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Uploaders: Jens Peter Secher <jps@debian.org>, Mateusz Łukasik <mati75@linuxmint.pl>
Build-Depends: debconf, debhelper (>= 9), libjpeg-dev, libpam0g-dev,
libpng-dev, libxft-dev, libxmu-dev, po-debconf, sharutils,
zlib1g-dev, cmake, freeglut3-dev, libpthread-stubs0-dev, libxrandr-dev,
dh-systemd
libpng-dev, libxft-dev, libxmu-dev, po-debconf, sharutils, cmake,
freeglut3-dev, libpthread-stubs0-dev, libxrandr-dev, dh-systemd
Standards-Version: 3.9.6
Homepage: http://sourceforge.net/projects/slim.berlios/



+ 21
- 20
debian/copyright View File

@@ -1,52 +1,53 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: slim
Upstream-Contact: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Source: http://developer.berlios.de/project/showfiles.php?group_id=2663
Source: http://sourceforge.net/projects/slim.berlios/

Files: *
Copyright: 1997-1998 Per Liden
2004-2006, Simone Rota <sip@varlock.com>, Johannes Winkelmann <jw@tks6.net>
2006-2013, Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2004-2006 Simone Rota <sip@varlock.com>
2004-2006 Johannes Winkelmann <jw@tks6.net>
2006-2013 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
License: GPL-2+

Files: Ck.cpp
Copyright: 2011, David Hauweele
Copyright: 2011 David Hauweele
License: GPL-2+

Files: Ck.h PAM.*
Copyright: 2007, Martin Parm
Copyright: 2007 Martin Parm
License: GPL-2+

Files: image.*
Copyright: 2002-2004, Hari Nair <hari@alumni.caltech.edu>
Copyright: 2002-2004 Hari Nair <hari@alumni.caltech.edu>
License: GPL-2+

Files: jpeg.c
png.c
Copyright: 2002, Hari Nair <hari@alumni.caltech.edu>
Copyright: 2002 Hari Nair <hari@alumni.caltech.edu>
License: GPL-2+

Files: slimlock.cpp
Copyright: 2010-2012, Joel Burget <joelburget@gmail.com>
Copyright: 2010-2012 Joel Burget <joelburget@gmail.com>
License: GPL-2+

Files: util.*
Copyright: 2009, Eygene Ryabinkin <rea@codelabs.ru>
Copyright: 2009 Eygene Ryabinkin <rea@codelabs.ru>
License: GPL-2+

Files: themes/default/panel.png
Copyright: 2004, Lila Community
Copyright: 2004 Lila Community
License: GPL-2+

Files: themes/default/background.jpg
Copyright: 2005, rafael nascimento
Copyright: 2005 Rafael Nascimento
License: permissive
This file may be copied and used freely without restrictions. It may
be used in projects which are not available under a GNU General Public License.

Files: cmake/*
Copyright: 2006, Alexander Neundorf, <neundorf@kde.org>
2008, Kevin Kofler, <kevin.kofler@chello.at>
Copyright: 2006 Alexander Neundorf <neundorf@kde.org>
2008 Kevin Kofler <kevin.kofler@chello.at>
License: BSD-3-clause
These scripts are placed under the BSD license:
Copyright (c) The Regents of the University of California.
@@ -77,21 +78,21 @@ License: BSD-3-clause
SUCH DAMAGE.

Files: debian/*
Copyright: 2007-2008, Mike Massonnet <mmassonnet@gmail.com>
2009-2012, Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014, Mateusz Łukasik <mati75@linuxmint.pl>
Copyright: 2007-2008 Mike Massonnet <mmassonnet@gmail.com>
2009-2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-2015 Mateusz Łukasik <mati75@linuxmint.pl>
License: GPL-2+

Files: debian/debian-joy/*
debian/debian-moreblue-orbit/*
debian/debian-spacefun/*
debian/debian-lines/*
Copyright: 2007-2008, Mike Massonnet <mmassonnet@gmail.com>
2008, Yves-Alexis Perez <corsac@debian.org>
Copyright: 2007-2008 Mike Massonnet <mmassonnet@gmail.com>
2008 Yves-Alexis Perez <corsac@debian.org>
License: GPL-2+

Files: debian/debian-moreblue/*
Copyright: 2007, Mike Massonnet
Copyright: 2007 Mike Massonnet <mmassonnet@gmail.com>
License: GPL-2+

Files: debian/debian-moreblue-orbit/background.png
@@ -99,7 +100,7 @@ Copyright: Valessio S Brito <valessio@debianart.org>
License: GPL-2+

Files: debian/debian-lines/background.png
Copyright: 2014, Juliette Taka BELIN <juliettetaka.belin@gmail.com>
Copyright: 2014 Juliette Taka Belin <juliettetaka.belin@gmail.com>
License: GPL-2+

License: GPL-2+


+ 23
- 0
debian/patches/manpage-formatting-fixes.patch View File

@@ -0,0 +1,23 @@
Description: Fix hyphen used as minus sign
Author: Mateusz Łukasik <mati75@linuxmint.pl>

--- a/slimlock.1
+++ b/slimlock.1
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.nf
.fam C
-\fBslimlock\fP [-v]
+\fBslimlock\fP [\-v]
.fam T
.fi
.SH DESCRIPTION
@@ -25,7 +25,7 @@ slimlock.conf contains the following set
.B dpms_standby_timeout
number of seconds of inactivity before the screen blanks.
.BI "Default: " 60
-.TP
+.TP
.B dpms_off_timeout
number of seconds of inactivity before the screen is turned off.
.BI "Default: " 600

+ 1
- 1
debian/patches/series View File

@@ -4,4 +4,4 @@ slim-fix-env-alloc.patch
no-slimlock-with-pam.patch
libslim-cmake-fixes.patch
fix-systemd-service.patch
fix-hyphen-used-as-minus-sign.patch
manpage-formatting-fixes.patch

Loading…
Cancel
Save