Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
Please unblock package slim.
I made package update for jessie release. New theme Debian-Lines is
included, also bugs for machines with systemd was fixed.
diff -Nru slim-1.3.6/debian/changelog slim-1.3.6/debian/changelog
--- slim-1.3.6/debian/changelog 2014-04-29 13:18:36.000000000 +0200
+++ slim-1.3.6/debian/changelog 2014-12-21 13:50:09.000000000 +0100
@@ -1,3 +1,29 @@
+slim (1.3.6-4) unstable; urgency=medium
+
+ * Drop consolekit depends. Thanks Elimar Riesebieter <riese...@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.
+ - 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.
+ - Update debian/copyright.
+ - Add lintian-overrides for info tags which can be ignored.
+ * 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 <didro...@ubuntu.com> for suggests
patch.
+ (Closes: #748668)
+ * Add lintian-overrides for check-gpg-signature it is not provides by
+ upstream yet.
+
+ -- Mateusz Łukasik <mat...@linuxmint.pl> Sun, 21 Dec 2014 13:46:02 +0100
+
slim (1.3.6-3) unstable; urgency=high
* debian/patches:
diff -Nru slim-1.3.6/debian/control slim-1.3.6/debian/control
--- slim-1.3.6/debian/control 2014-04-25 15:16:46.000000000 +0200
+++ slim-1.3.6/debian/control 2014-12-19 20:15:02.000000000 +0100
@@ -5,17 +5,17 @@
Uploaders: Jens Peter Secher <j...@debian.org>, Mateusz Łukasik
<mat...@linuxmint.pl>
Build-Depends: debconf, debhelper (>= 9), libjpeg-dev, libpam0g-dev,
libpng-dev, libxft-dev, libxmu-dev, po-debconf, sharutils,
- libck-connector-dev, zlib1g-dev, cmake, freeglut3-dev,
- libpthread-stubs0-dev, libxrandr-dev, dh-systemd
-Standards-Version: 3.9.5
-Homepage: http://slim.berlios.de/
+ zlib1g-dev, cmake, freeglut3-dev, libpthread-stubs0-dev, libxrandr-dev,
+ dh-systemd
+Standards-Version: 3.9.6
+Homepage: http://sourceforge.net/projects/slim.berlios/
Package: slim
Architecture: any
Provides: x-display-manager
Recommends: xterm
Suggests: scrot, xauth
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) |
debconf-2.0, dbus, consolekit
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) |
debconf-2.0, dbus
Description: desktop-independent graphical login manager for X11
SLiM aims to be light, simple and independent from the various
desktop environments. Although completely configurable through
diff -Nru slim-1.3.6/debian/copyright slim-1.3.6/debian/copyright
--- slim-1.3.6/debian/copyright 2014-02-15 15:46:18.000000000 +0100
+++ slim-1.3.6/debian/copyright 2014-12-20 15:45:55.000000000 +0100
@@ -13,39 +13,40 @@
Copyright: 2011, David Hauweele
License: GPL-2+
-Files: Ck.h; PAM.*
+Files: Ck.h PAM.*
Copyright: 2007, Martin Parm
License: GPL-2+
Files: image.*
-Copyright: 2002-2004 Hari Nair <h...@alumni.caltech.edu>
+Copyright: 2002-2004, Hari Nair <h...@alumni.caltech.edu>
License: GPL-2+
-Files: jpeg.c; png.c
-Copyright: 2002 Hari Nair <h...@alumni.caltech.edu>
+Files: jpeg.c
+ png.c
+Copyright: 2002, Hari Nair <h...@alumni.caltech.edu>
License: GPL-2+
Files: slimlock.cpp
-Copyright: 2010-2012 Joel Burget <joelbur...@gmail.com>
+Copyright: 2010-2012, Joel Burget <joelbur...@gmail.com>
License: GPL-2+
Files: util.*
-Copyright: 2009 Eygene Ryabinkin <r...@codelabs.ru>
+Copyright: 2009, Eygene Ryabinkin <r...@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.png
-Copyright: 2005 rafael nascimento
+Files: themes/default/background.jpg
+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, <neund...@kde.org>
- 2008, Kevin Kofler, <kevin.kof...@chello.at>
+ 2008, Kevin Kofler, <kevin.kof...@chello.at>
License: BSD-3-clause
These scripts are placed under the BSD license:
Copyright (c) The Regents of the University of California.
@@ -81,19 +82,26 @@
2014, Mateusz Łukasik <mat...@linuxmint.pl>
License: GPL-2+
-Files:
debian/debian-joy/*;debian/debian-moreblue-orbit/*;debian/debian-spacefun/*;
-Copyright: 2007-2008 Mike Massonnet <mmasson...@gmail.com>
- 2008 Yves-Alexis Perez <cor...@debian.org>
+Files: debian/debian-joy/*
+ debian/debian-moreblue-orbit/*
+ debian/debian-spacefun/*
+ debian/debian-lines/*
+Copyright: 2007-2008, Mike Massonnet <mmasson...@gmail.com>
+ 2008, Yves-Alexis Perez <cor...@debian.org>
License: GPL-2+
Files: debian/debian-moreblue/*
-Copyright: 2007 Mike Massonnet
+Copyright: 2007, Mike Massonnet
License: GPL-2+
Files: debian/debian-moreblue-orbit/background.png
Copyright: Valessio S Brito <vales...@debianart.org>
License: GPL-2+
+Files: debian/debian-lines/background.png
+Copyright: 2014, Juliette Taka BELIN <juliettetaka.be...@gmail.com>
+License: GPL-2+
+
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Binarne pliki
/tmp/iy6nb8Bvhq/slim-1.3.6/debian/debian-lines/background.png i
/tmp/ylM6CBu6f6/slim-1.3.6/debian/debian-lines/background.png różnią się
diff -Nru slim-1.3.6/debian/debian-lines/COPYING
slim-1.3.6/debian/debian-lines/COPYING
--- slim-1.3.6/debian/debian-lines/COPYING 1970-01-01 01:00:00.000000000
+0100
+++ slim-1.3.6/debian/debian-lines/COPYING 2014-12-19 20:33:11.000000000
+0100
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software
interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free
Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
`show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -Nru slim-1.3.6/debian/debian-lines/COPYRIGHT.background
slim-1.3.6/debian/debian-lines/COPYRIGHT.background
--- slim-1.3.6/debian/debian-lines/COPYRIGHT.background 1970-01-01
01:00:00.000000000 +0100
+++ slim-1.3.6/debian/debian-lines/COPYRIGHT.background 2014-12-19
20:38:36.000000000 +0100
@@ -0,0 +1,22 @@
+Joy Theme
+
+Upstream Authors: Juliette Taka BELIN <juliettetaka.be...@gmail.com>
+
+Copyright:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ 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
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+
+Downloaded from https://wiki.debian.org/DebianArt/Themes/Lines
diff -Nru slim-1.3.6/debian/debian-lines/COPYRIGHT.panel
slim-1.3.6/debian/debian-lines/COPYRIGHT.panel
--- slim-1.3.6/debian/debian-lines/COPYRIGHT.panel 1970-01-01
01:00:00.000000000 +0100
+++ slim-1.3.6/debian/debian-lines/COPYRIGHT.panel 2014-12-19
20:33:11.000000000 +0100
@@ -0,0 +1,20 @@
+Copyright (C) 2007-2008 Mike Massonnet <mmasson...@gmail.com>
+Copyright (C) 2008 Yves-Alexis Perez <cor...@debian.org>
+Backdrop copied from gdm package
+Text "Login:" copied from SLiM default theme
+Background artwork is available at
http://www.debianart.org/cchost/people/si0ux/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
Binarne pliki /tmp/iy6nb8Bvhq/slim-1.3.6/debian/debian-lines/panel.png i
/tmp/ylM6CBu6f6/slim-1.3.6/debian/debian-lines/panel.png różnią się
diff -Nru slim-1.3.6/debian/debian-lines/slim.theme
slim-1.3.6/debian/debian-lines/slim.theme
--- slim-1.3.6/debian/debian-lines/slim.theme 1970-01-01
01:00:00.000000000 +0100
+++ slim-1.3.6/debian/debian-lines/slim.theme 2014-12-19
22:11:37.000000000 +0100
@@ -0,0 +1,39 @@
+# Debian-lines theme for SLIM
+# by Yves-Alexis Perez <cor...@debian.org>, Mateusz Łukasik
<mat...@linuxmint.pl>
+# using artwork from Valessio S Brito <valessio at debianart.org>
+# inspired from slim theme by Johannes Winkelmann
+
+# Messages (ie: shutdown)
+msg_color #000000
+msg_font Sans:size=18:bold:dpi=75
+msg_x 50%
+msg_y 40%
+msg_shadow_color #FFFFFF
+msg_shadow_xoffset 1
+msg_shadow_yoffset 1
+
+# valid values: stretch, tile
+background_style stretch
+background_color #eedddd
+
+# Input controls
+input_panel_x 50%
+input_panel_y 50%
+input_name_x 59
+input_name_y 161
+input_font Sans:size=12:dpi=75
+input_fgcolor #000000
+
+# Username / password request
+username_font Sans:size=14:bold:dpi=75
+username_color #000000
+username_x 50%
+username_y 122
+password_x 50%
+password_y 122
+username_shadow_color #FFFFFF
+username_shadow_xoffset 1
+username_shadow_yoffset 1
+
+username_msg Username:
+password_msg Password:
diff -Nru slim-1.3.6/debian/patches/fix-hyphen-used-as-minus-sign.patch
slim-1.3.6/debian/patches/fix-hyphen-used-as-minus-sign.patch
--- slim-1.3.6/debian/patches/fix-hyphen-used-as-minus-sign.patch
1970-01-01 01:00:00.000000000 +0100
+++ slim-1.3.6/debian/patches/fix-hyphen-used-as-minus-sign.patch
2014-12-20 12:13:32.000000000 +0100
@@ -0,0 +1,23 @@
+Description: Fix hyphen used as minus sign
+Author: Mateusz Łukasik <mat...@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
diff -Nru slim-1.3.6/debian/patches/fix-systemd-service.patch
slim-1.3.6/debian/patches/fix-systemd-service.patch
--- slim-1.3.6/debian/patches/fix-systemd-service.patch 2014-03-14
23:01:58.000000000 +0100
+++ slim-1.3.6/debian/patches/fix-systemd-service.patch 2014-12-21
13:22:46.000000000 +0100
@@ -1,11 +1,18 @@
-Description: Add WantedBy field to systemd slim.service
-Author: Mateusz Łukasik <mat...@linuxmint.pl>
-Bug-Debian: http://bugs.debian.org/741511
+Description: Ensure we are starting slim under systemd only when selected
+Author: Didier Roche <didro...@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/748668
---- a/slim.service
-+++ b/slim.service
-@@ -7,3 +7,4 @@ ExecStart=/usr/bin/slim -nodaemon
+Index: slim-1.3.6/slim.service
+===================================================================
+--- slim-1.3.6.orig/slim.service
++++ slim-1.3.6/slim.service
+@@ -3,7 +3,6 @@ Description=SLiM Simple Login Manager
+ After=systemd-user-sessions.service
- [Install]
- Alias=display-manager.service
-+WantedBy=graphical.target
+ [Service]
++ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager
2>/dev/null)" = "/usr/bin/slim" ]'
+ ExecStart=/usr/bin/slim -nodaemon
+-
+-[Install]
+-Alias=display-manager.service
++Restart=always
diff -Nru slim-1.3.6/debian/patches/series slim-1.3.6/debian/patches/series
--- slim-1.3.6/debian/patches/series 2014-04-25 16:22:32.000000000 +0200
+++ slim-1.3.6/debian/patches/series 2014-12-20 12:11:05.000000000 +0100
@@ -4,3 +4,4 @@
no-slimlock-with-pam.patch
libslim-cmake-fixes.patch
fix-systemd-service.patch
+fix-hyphen-used-as-minus-sign.patch
diff -Nru slim-1.3.6/debian/patches/slim-conf.patch
slim-1.3.6/debian/patches/slim-conf.patch
--- slim-1.3.6/debian/patches/slim-conf.patch 2014-03-01
23:02:52.000000000 +0100
+++ slim-1.3.6/debian/patches/slim-conf.patch 2014-12-20
11:59:34.000000000 +0100
@@ -1,5 +1,4 @@
-diff --git a/slim.conf b/slim.conf
-index a8e2e1c..36ee57f 100644
+Description: Debian changes for slim.conf
--- a/slim.conf
+++ b/slim.conf
@@ -52,7 +51,7 @@
# current theme, use comma separated list to specify a set to
# randomly choose from
-current_theme default
-+current_theme debian-joy
++current_theme debian-lines
# Lock file
lockfile /var/run/slim.lock
diff -Nru slim-1.3.6/debian/rules slim-1.3.6/debian/rules
--- slim-1.3.6/debian/rules 2014-04-25 16:23:17.000000000 +0200
+++ slim-1.3.6/debian/rules 2014-12-19 22:09:25.000000000 +0100
@@ -3,14 +3,14 @@
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes -DBUILD_SHARED_LIBS=no
-DBUILD_SLIMLOCK=yes
+CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=no -DBUILD_SHARED_LIBS=no
-DBUILD_SLIMLOCK=yes
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
- CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
-DBUILD_SHARED_LIBS=no -DBUILD_SLIMLOCK=no
+ CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=no -DBUILD_SHARED_LIBS=no
-DBUILD_SLIMLOCK=no
endif
ifeq ($(DEB_HOST_ARCH_OS),hurd)
- CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
-DBUILD_SHARED_LIBS=no -DBUILD_SLIMLOCK=no
+ CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=no -DBUILD_SHARED_LIBS=no
-DBUILD_SLIMLOCK=no
endif
%:
@@ -38,4 +38,5 @@
debian/slim/usr/share/slim/themes/debian-moreblue-orbit/COPYING
\
debian/slim/usr/share/slim/themes/debian-moreblue/COPYING \
debian/slim/usr/share/slim/themes/debian-spacefun/COPYING \
- debian/slim/usr/share/slim/themes/debian-joy/COPYING
+ debian/slim/usr/share/slim/themes/debian-joy/COPYING \
+ debian/slim/usr/share/slim/themes/debian-lines/COPYING
diff -Nru slim-1.3.6/debian/slim.install slim-1.3.6/debian/slim.install
--- slim-1.3.6/debian/slim.install 2012-06-28 02:06:21.000000000 +0200
+++ slim-1.3.6/debian/slim.install 2014-12-19 22:06:13.000000000 +0100
@@ -6,6 +6,8 @@
debian/debian-spacefun usr/share/slim/themes/
# joy
debian/debian-joy usr/share/slim/themes/
+# lines
+debian/debian-lines usr/share/slim/themes/
debian/local/Xsession.d/20slim_locale etc/X11/Xsession.d
diff -Nru slim-1.3.6/debian/slim.lintian-overrides
slim-1.3.6/debian/slim.lintian-overrides
--- slim-1.3.6/debian/slim.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
+++ slim-1.3.6/debian/slim.lintian-overrides 2014-12-20
15:42:36.000000000 +0100
@@ -0,0 +1,2 @@
+slim: spelling-error-in-binary usr/bin/slim accesss access
+slim: unused-debconf-template slim/daemon_name
diff -Nru slim-1.3.6/debian/slim.postinst slim-1.3.6/debian/slim.postinst
--- slim-1.3.6/debian/slim.postinst 2014-01-08 19:18:55.000000000 +0100
+++ slim-1.3.6/debian/slim.postinst 2014-12-21 13:22:46.000000000 +0100
@@ -45,6 +45,24 @@
invoke-rc.d dbus reload || true
fi
+DEFAULT_SERVICE=/etc/systemd/system/display-manager.service
+# set default-display-manager systemd service link according to our config
+if [ "$1" = configure ] && [ -d /etc/systemd/system/ ]; then
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ SERVICE=/lib/systemd/system/$(basename $(cat
"$DEFAULT_DISPLAY_MANAGER_FILE")).service
+ if [ -h "$DEFAULT_SERVICE" ] && [ $(readlink "$DEFAULT_SERVICE") =
/dev/null ]; then
+ echo "Display manager service is masked" >&2
+ elif [ -e "$SERVICE" ]; then
+ ln -sf "$SERVICE" "$DEFAULT_SERVICE"
+ else
+ echo "WARNING: $SERVICE is the selected default display manager
but does not exist" >&2
+ rm -f "$DEFAULT_SERVICE"
+ fi
+ else
+ rm -f "$DEFAULT_SERVICE"
+ fi
+fi
+
#DEBHELPER#
exit 0
diff -Nru slim-1.3.6/debian/slim.templates slim-1.3.6/debian/slim.templates
--- slim-1.3.6/debian/slim.templates 2014-01-08 19:18:55.000000000 +0100
+++ slim-1.3.6/debian/slim.templates 2014-12-20 15:30:16.000000000 +0100
@@ -8,6 +8,7 @@
# changes should be coordinated with translators and reviewers.
#
#
+
Template: slim/daemon_name
Type: string
Default: /usr/bin/slim
diff -Nru slim-1.3.6/debian/source/include-binaries
slim-1.3.6/debian/source/include-binaries
--- slim-1.3.6/debian/source/include-binaries 2014-01-08
19:18:55.000000000 +0100
+++ slim-1.3.6/debian/source/include-binaries 2014-12-19
22:15:33.000000000 +0100
@@ -6,3 +6,6 @@
debian/debian-moreblue-orbit/panel.png
debian/debian-joy/panel.png
debian/debian-joy/background.png
+debian/debian-lines/panel.png
+debian/debian-lines/background.png
+
diff -Nru slim-1.3.6/debian/source/lintian-overrides
slim-1.3.6/debian/source/lintian-overrides
--- slim-1.3.6/debian/source/lintian-overrides 1970-01-01
01:00:00.000000000 +0100
+++ slim-1.3.6/debian/source/lintian-overrides 2014-10-14
20:31:51.000000000 +0200
@@ -0,0 +1,2 @@
+# The sourceforge site does not support GPG signatures for tarballs
+debian-watch-may-check-gpg-signature
diff -Nru slim-1.3.6/debian/watch slim-1.3.6/debian/watch
--- slim-1.3.6/debian/watch 2014-01-08 19:27:39.000000000 +0100
+++ slim-1.3.6/debian/watch 2014-12-19 20:22:54.000000000 +0100
@@ -1,3 +1,3 @@
version=3
opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//
\
-http://slim.berlios.de/
(?:.*/)?slim[_\-\.]?(\d\S*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://sf.net/slim.berlios/slim-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
