debian/0000775000000000000000000000000012253666151007177 5ustar debian/copyright0000664000000000000000000000303411756426454011141 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: TuxOnIce userui Upstream-Contact: Nigel Cunningham Source: http://tuxonice.net/ Files: * Copyright: 2004-2012 Bernard Blackham , Henrix Brix Andersen , Nigel Cunningham , Michal Januszewski License: GPL-2+ Files: debian/* Copyright: 2005 martin f. krafft 2006 Thomas Schoepf 2006-2012 Arnaud Fontaine 2012 Andrey Rahmatullin License: GPL-2+ License: GPL-2+ 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 package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/postrm0000664000000000000000000000015611756426454010457 0ustar #!/bin/sh set -e if [ -x /usr/sbin/update-initramfs ]; then update-initramfs -u fi #DEBHELPER# exit 0 debian/changelog0000664000000000000000000001525712253666151011063 0ustar tuxonice-userui (1.1-1ubuntu2) trusty; urgency=low * Add missing stdio includes, resolving FTBFS. -- Daniel T Chen Mon, 16 Dec 2013 16:10:28 -0500 tuxonice-userui (1.1-1ubuntu1) trusty; urgency=low * Fix paths to FreeType, resolving FTBFS. -- Daniel T Chen Mon, 16 Dec 2013 14:11:49 -0500 tuxonice-userui (1.1-1build1) trusty; urgency=medium * No-change rebuild for libmng soname bump. -- Matthias Klose Mon, 16 Dec 2013 16:54:44 +0100 tuxonice-userui (1.1-1) unstable; urgency=low * New upstream version (Closes: #648125). * Adopt the package (Closes: #647875). * Update Standards-Version to 3.9.3 (no change needed). * Add Vcs-* fields. * Replace CDBS with dh(1), bump debian/compat to 9, update Build-Depends accordingly. * Drop obsolete shlibs.local. * Drop lintian-overrides as the binary is now linked dynamically. * Change Priority to optional. * Replace libpng12-dev build dependency with libpng-dev (Closes: #662527). * Initramfs hook: do not check whether the loaded kernel supports ToI and whether the kernel being processed has tuxonice_userui as a module; always install the binary into initramfs instead (Closes: #574604). * Call update-initramfs in maintainer scripts only if it's available (Closes: #660332). * Fix debian/watch. * Convert debian/copyright to the machine-readable format. * Fix "implicit declaration of printk" warning. * Fix "symbol alignments of progress_text differ" warning. * Build all code with -g to help with debugging. * Fix mode switching which is broken in 1.1. -- Andrey Rahmatullin Sat, 28 Apr 2012 16:44:00 +0600 tuxonice-userui (1.0-2) unstable; urgency=low * Disable usplash following usplash removal (#593702). Closes: #593708. * Switch source format to 3.0 (quilt). * debian/control: + Update Standards-Version to 3.9.2. No changes needed. * debian/lintian-overrides: + Change overridden tag from embedded-zlib to embedded-library. -- Arnaud Fontaine Sat, 05 Nov 2011 17:41:35 +0900 tuxonice-userui (1.0-1) unstable; urgency=low * New upstream release. + Get rid of the patch as it has been applied upstream. * debian/control: + Update Standards-Version to 3.8.1. No changes needed. -- Arnaud Fontaine Mon, 04 May 2009 14:41:31 +0100 tuxonice-userui (0.7.3-1) unstable; urgency=low * New upstream release. Closes: #512302. * Add debian/watch. * Get rid of deprecated linda override. * Get rid of now useless suspend2-userui dummy package. * debian/control: + Fix mispelling in description. + Add ${misc:Depends} to Depends in case the result of a call to debhelper tools adds extra dependencies. + Bump debhelper Build-Depends to take advantage of dh_lintian. * debian/copyright: + Update copyright years. + Reorganize to make it clearer. * Add ramdisk support. Thanks to Dylan Thurston. Closes: #499856. + Add debian/postinst and debian/postrm. + debian/control: - Add Depends against initramfs-tools. + debian/NEWS: - Add entry explaining how to use it. * Add 01_dont-display-reboot-option-on-resume.patch to not display reboot option when resuming. Closes: #424943. + Add debian/README.source according to the policy. + debian/control: - Add Build-Depends on quilt. + debian/rules: - Include CDBS patchsys-quilt.mk. -- Arnaud Fontaine Thu, 05 Mar 2009 22:42:46 +0000 tuxonice-userui (0.7.2+clean-4) unstable; urgency=low * New email address. * Drop useless debian/control.in. * debian/control: + Update Standards-Version to 3.8.0. + Wrap Build-Depends field. * Drop patches which are now useless because this is done in debian/rules directly. * Don't build tuxoniceui_usplash binary on ia64 because usplash is unavailable on ia64. Closes: #423714. -- Arnaud Fontaine Mon, 30 Jun 2008 16:13:53 +0200 tuxonice-userui (0.7.2+clean-3) unstable; urgency=low * Rename suspend2-userui to tuxonice-userui. Closes: #446147. * Add debian/shlibs.local because libusplash doesn't provide a shlibs file yet, see #453847. Closes: #453816. * debian/control*: + Move Homepage field to the source package (dpkg supports it now). -- Arnaud Fontaine Sat, 01 Dec 2007 14:52:59 +0000 suspend2-userui (0.7.2+clean-2) unstable; urgency=low * Add debian/patches/01_nostrip.diff for handling nostrip build option. Closes: #438077. -- Arnaud Fontaine Mon, 27 Aug 2007 15:35:40 +0200 suspend2-userui (0.7.2+clean-1) unstable; urgency=low * New upstream release. Closes: #426189. * Drop useless debian/patches/fix-ftbfs-ia64.diff. * debian/control*: + Add depends against libusplash-dev. -- Arnaud Fontaine Sun, 22 Jul 2007 11:07:59 +0200 suspend2-userui (0.7.0-1) unstable; urgency=low * New upstream release. - Fix bug which happened with suspend2 > 2.2.9. Closes: #409511. - Remove fix-syscall.diff which has been added upstream. * Add lintian and linda overrides for statically linked binaries. -- Arnaud Fontaine Sat, 17 Feb 2007 14:28:54 +0100 suspend2-userui (0.6.4-3) unstable; urgency=low * debian/patches/fix-ftbfs-ia64.diff: - New patch which fixes FTBFS on ia64 because PAGE_MASK shouldn't be used from userspace. -- Arnaud Fontaine Thu, 4 Jan 2007 20:48:51 +0100 suspend2-userui (0.6.4-2) unstable; urgency=low * Adopted package with maintainers permission. * Switch to cdbs and hereby support build-indep target. Closes: #395774. * debian/control: - Replace any in favor of the architectures supported by suspend2. Closes: #389325. * New patch which fixes obsolete syscall usage. Thanks to Ted Percival . Closes: #389317. * Move binaries from /usr/sbin to /usr/lib/suspend2-userui according to the FHS. - New patch which fixes makefile install path. -- Arnaud Fontaine Sun, 31 Dec 2006 17:16:47 +0100 suspend2-userui (0.6.4-1) unstable; urgency=low * New upstream release. * Updated to Standards-Version 3.7.2. No changes necessary. -- Thomas Schoepf Tue, 29 Aug 2006 18:53:51 +0200 suspend2-userui (0.6.3-1) unstable; urgency=low * New upstream release. * New maintainer. Thanks Martin! * Closes: #324988: ITP: suspend2-userui -- user-space interfaces for software suspend2 -- Thomas Schoepf Wed, 8 Feb 2006 21:08:21 +0100 suspend2-userui (0.5.3-1) unstable; urgency=low * Initial release. -- martin f. krafft Tue, 23 Aug 2005 15:30:13 +0200 debian/tuxonice-userui.install0000664000000000000000000000004311756426454013743 0ustar tuxoniceui usr/lib/tuxonice-userui debian/dirs0000664000000000000000000000007211756426454010071 0ustar usr/lib/tuxonice-userui/ usr/share/initramfs-tools/hooks/ debian/docs0000664000000000000000000000005211756426454010056 0ustar AUTHORS KERNEL_API README USERUI_API TODO debian/patches/0000775000000000000000000000000012253666074010632 5ustar debian/patches/fix-duplicate-symbol-definition.patch0000664000000000000000000000153311756426454020047 0ustar Description: Fix alignment warning about progress_text by removing the redundant definition userui_fbsplash.o link command yields "/usr/bin/ld: Warning: alignment 8 of symbol `progress_text' in common.o is smaller than 16 in userui_fbsplash_core.o" while progress_text should be defined only in common.c. Author: Andrey Rahmatullin Bug: https://github.com/NigelCunningham/Tuxonice-Userui/issues/1 Last-Update: 2012-04-02 diff --git a/fbsplash/userui_fbsplash_core.c b/fbsplash/userui_fbsplash_core.c index 63be820..3315122 100644 --- a/fbsplash/userui_fbsplash_core.c +++ b/fbsplash/userui_fbsplash_core.c @@ -29,7 +29,6 @@ #include "../userui.h" int fb_fd, fbsplash_fd = -1, no_silent_image = 0; -char *progress_text; static char rendermessage[512]; static int lastloglevel; static unsigned long cur_value, cur_maximum, last_pos; debian/patches/trim-libs.patch0000664000000000000000000000071711756426454013565 0ustar Description: Do not link against libz and liblcms. Author: Andrey Rahmatullin Last-Update: 2012-03-05 diff --git a/Makefile b/Makefile index 553a9ff..dd9e088 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ LIBS = # FBSPLASH ifdef USE_FBSPLASH OBJECTS += fbsplash -LIBS += -lmng -lpng -ljpeg -lz -lfreetype -llcms -lm +LIBS += -lmng -lpng -ljpeg -lfreetype -lm LIB_TARGETS = fbsplash/userui_fbsplash.o CFLAGS += -DUSE_FBSPLASH endif debian/patches/build-with-debug.patch0000664000000000000000000000051711756426454015015 0ustar Description: Build the main code with -g Author: Andrey Rahmatullin Last-Update: 2012-04-22 diff --git a/Makefile b/Makefile index 553a9ff..f6bf0c5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CFLAGS := -Wall -O3 +CFLAGS := -Wall -O3 -g DESTDIR := PREFIX := /usr/local INSTDIR := $(DESTDIR)$(PREFIX)/sbin debian/patches/fix-libmng-transition-freetype.patch0000664000000000000000000000344312253666074017724 0ustar Index: tuxonice-userui-1.1/fbsplash/ttf.h =================================================================== --- tuxonice-userui-1.1.orig/fbsplash/ttf.h 2013-12-16 16:08:59.457936477 -0500 +++ tuxonice-userui-1.1/fbsplash/ttf.h 2013-12-16 16:10:18.070576137 -0500 @@ -1,8 +1,8 @@ #ifndef _TTF_H #define _TTF_H #include -#include -#include +#include +#include #define CACHED_METRICS 0x10 #define CACHED_BITMAP 0x01 Index: tuxonice-userui-1.1/fbsplash/ttf.c =================================================================== --- tuxonice-userui-1.1.orig/fbsplash/ttf.c 2013-12-16 16:08:59.465936135 -0500 +++ tuxonice-userui-1.1/fbsplash/ttf.c 2013-12-16 16:10:18.070576137 -0500 @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "splash.h" Index: tuxonice-userui-1.1/fbsplash/mng_callbacks.c =================================================================== --- tuxonice-userui-1.1.orig/fbsplash/mng_callbacks.c 2011-12-18 00:53:50.000000000 -0500 +++ tuxonice-userui-1.1/fbsplash/mng_callbacks.c 2013-12-16 16:10:18.070576137 -0500 @@ -9,6 +9,7 @@ * */ +#include #include #include #include Index: tuxonice-userui-1.1/fbsplash/mng_render.c =================================================================== --- tuxonice-userui-1.1.orig/fbsplash/mng_render.c 2011-12-18 00:53:50.000000000 -0500 +++ tuxonice-userui-1.1/fbsplash/mng_render.c 2013-12-16 16:10:18.070576137 -0500 @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include "splash.h" debian/patches/series0000664000000000000000000000030312253666066012044 0ustar trim-libs.patch fix-implicit-declaration.patch fix-duplicate-symbol-definition.patch build-with-debug.patch fix-mode-switch.patch fix-module-load-logic.patch fix-libmng-transition-freetype.patch debian/patches/fix-module-load-logic.patch0000664000000000000000000000207511756426454015743 0ustar Description: Do not crash if fbsplash failed to load and usplash is not enabled Bug: https://github.com/NigelCunningham/Tuxonice-Userui/issues/5 Author: Andrey Rahmatullin Last-Update: 2012-04-28 --- a/userui_core.c +++ b/userui_core.c @@ -1043,16 +1043,17 @@ /* Initialise all that we can, use the first */ // active_ops = NULL; for (i = 0; i < NUM_UIS; i++) { - if (userui_ops[i] && userui_ops[i]->load) + if (userui_ops[i] && userui_ops[i]->load) { result = userui_ops[i]->load(); - if (result) { - if (test_run) - fprintf(stderr, "Failed to initialise %s module.\n", userui_ops[i]->name); - else - printk("Failed to initialise %s module.\n", userui_ops[i]->name); - } else - if (!active_ops) - active_ops = userui_ops[i]; + if (result) { + if (test_run) + fprintf(stderr, "Failed to initialise %s module.\n", userui_ops[i]->name); + else + printk("Failed to initialise %s module.\n", userui_ops[i]->name); + } else + if (!active_ops) + active_ops = userui_ops[i]; + } } if (active_ops->prepare) debian/patches/fix-mode-switch.patch0000664000000000000000000000340611756426454014670 0ustar Description: Fix userui mode switching via command line and key presses. Bug: https://github.com/NigelCunningham/Tuxonice-Userui/issues/4 Author: Дамјан Георгиевски Last-Update: 2012-04-22 diff --git a/userui_core.c b/userui_core.c index 632ecd3..a7908da 100644 --- a/userui_core.c +++ b/userui_core.c @@ -358,13 +358,13 @@ int common_keypress_handler(int key) toggle_debug_state(key); break; case 0x2D: /* X: Text */ - next_ops = 3; + next_ops = 1; break; case 0x21: /* F: Fbsplash */ next_ops = 2; break; case 0x16: /* U: Usplash */ - next_ops = 1; + next_ops = 3; break; default: return 0; @@ -463,16 +463,16 @@ static void handle_params(int argc, char **argv) { fprintf(stderr, ")\n"); exit(1); case 'u': - if (userui_ops[0]) - active_ops = userui_ops[0]; + if (userui_ops[2]) + active_ops = userui_ops[2]; break; case 'f': if (userui_ops[1]) active_ops = userui_ops[1]; break; case 'x': - if (userui_ops[2]) - active_ops = userui_ops[2]; + if (userui_ops[0]) + active_ops = userui_ops[0]; break; default: for (i = 0; i < NUM_UIS; i++) { @@ -1022,8 +1022,8 @@ int main(int argc, char **argv) { int i; userui_ops[0] = &userui_text_ops; - userui_ops[1] = USPLASH_OPS; - userui_ops[2] = FBSPLASH_OPS; + userui_ops[1] = FBSPLASH_OPS; + userui_ops[2] = USPLASH_OPS; active_ops = &userui_text_ops; handle_params(argc, argv); @@ -1041,7 +1041,7 @@ int main(int argc, char **argv) { prepare_console(); /* Initialise all that we can, use the first */ - active_ops = NULL; +// active_ops = NULL; for (i = 0; i < NUM_UIS; i++) { if (userui_ops[i] && userui_ops[i]->load) result = userui_ops[i]->load(); debian/patches/fix-implicit-declaration.patch0000664000000000000000000000176711756426454016552 0ustar Description: Fix "warning: implicit declaration of function ‘printk’" Author: Andrey Rahmatullin Bug: https://github.com/NigelCunningham/Tuxonice-Userui/issues/2 Last-Update: 2012-04-02 diff --git a/fbsplash/common.c b/fbsplash/common.c index c828f78..c3eec48 100644 --- a/fbsplash/common.c +++ b/fbsplash/common.c @@ -26,6 +26,7 @@ #include #include +#include "../userui.h" #include "splash.h" struct fb_var_screeninfo fb_var; diff --git a/fbsplash/image.c b/fbsplash/image.c index 982a1c2..936727e 100644 --- a/fbsplash/image.c +++ b/fbsplash/image.c @@ -33,6 +33,7 @@ #include #endif +#include "../userui.h" #include "splash.h" struct fb_image verbose_img; diff --git a/fbsplash/parse.c b/fbsplash/parse.c index 2324c69..3577dc8 100644 --- a/fbsplash/parse.c +++ b/fbsplash/parse.c @@ -19,6 +19,7 @@ #include #include #include +#include "../userui.h" #include "splash.h" struct config_opt { debian/patches/fix-freetype6-includedir.patch0000664000000000000000000000171012253651113016453 0ustar Index: tuxonice-userui-1.1/fbsplash/ttf.h =================================================================== --- tuxonice-userui-1.1.orig/fbsplash/ttf.h 2011-12-18 00:53:50.000000000 -0500 +++ tuxonice-userui-1.1/fbsplash/ttf.h 2013-12-16 14:11:22.549750638 -0500 @@ -1,8 +1,8 @@ #ifndef _TTF_H #define _TTF_H #include -#include -#include +#include +#include #define CACHED_METRICS 0x10 #define CACHED_BITMAP 0x01 Index: tuxonice-userui-1.1/fbsplash/ttf.c =================================================================== --- tuxonice-userui-1.1.orig/fbsplash/ttf.c 2011-12-18 00:53:50.000000000 -0500 +++ tuxonice-userui-1.1/fbsplash/ttf.c 2013-12-16 14:19:36.240778322 -0500 @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "splash.h" debian/watch0000664000000000000000000000010511756426454010233 0ustar version=3 http://tuxonice.net/ (?:.*/)?tuxonice-userui-(.*)\.tar\.gz debian/initramfs.hook0000664000000000000000000000064111756426454012065 0ustar #!/bin/sh # -*- shell-script -*- PREREQ="" prereqs() { echo "$PREREQ" } case $1 in prereqs) prereqs exit 0 ;; esac . /usr/share/initramfs-tools/hook-functions if [ -f ${MODULESDIR}/kernel/power/tuxonice_userui.ko ]; then force_load tuxonice_userui fi TUXONICEDIR=/usr/lib/tuxonice-userui mkdir -p ${DESTDIR}${TUXONICEDIR} copy_exec ${TUXONICEDIR}/tuxoniceui ${TUXONICEDIR} debian/postinst0000664000000000000000000000023511756426454011014 0ustar #!/bin/sh set -e if [ "$1" = "configure" ]; then if [ -x /usr/sbin/update-initramfs ]; then update-initramfs -u fi fi #DEBHELPER# exit 0 debian/control0000664000000000000000000000207212253646350010602 0ustar Source: tuxonice-userui Priority: optional Section: misc Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Andrey Rahmatullin Build-Depends: debhelper (>= 9~), libmng-dev (>= 1.0.5), libfreetype6-dev, libpng-dev, Standards-Version: 3.9.3 Homepage: http://www.tuxonice.net/userui Vcs-Git: git://git.debian.org/collab-maint/tuxonice-userui.git Vcs-Browser: http://git.debian.org/?p=collab-maint/tuxonice-userui.git;a=summary Package: tuxonice-userui Architecture: i386 ia64 powerpc ppc64 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, initramfs-tools Recommends: hibernate Description: user-space interfaces for TuxOnIce TuxOnIce is an alternative implementation to suspend a Linux machine by writing its state to memory for later resuming. A kernel patch for TuxOnIce is available separately. . This package provides several user interfaces which improve the user's experience during the suspend and resume processes. It is not needed for TuxOnIce functionality. debian/source/0000775000000000000000000000000011756426454010506 5ustar debian/source/format0000664000000000000000000000001411756426454011714 0ustar 3.0 (quilt) debian/compat0000664000000000000000000000000211756426454010404 0ustar 9 debian/rules0000775000000000000000000000056311756426454010272 0ustar #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- %: dh $@ override_dh_auto_build: dh_auto_build -- USE_FBSPLASH=1 override_dh_auto_install: install -m 755 -t $(CURDIR)/debian/tuxonice-userui/usr/lib/tuxonice-userui/ \ tuxoniceui install -m 755 debian/initramfs.hook \ $(CURDIR)/debian/tuxonice-userui/usr/share/initramfs-tools/hooks/tuxonice_userui debian/NEWS0000664000000000000000000000314211756426454007705 0ustar tuxonice-userui (1.1-1) unstable; urgency=low There is one binary now, called /usr/lib/tuxonice-userui/tuxoniceui (using the text mode by default and the fbsplash mode with -f command line parameter), so you should update your scripts. tuxonice-userui binary is now included in initramfs even for kernels that do not support TuxOnIce. The binary is now linked dynamically so libc.so.6 and other dependencies will be pulled into initramfs. -- Andrey Rahmatullin Sun, 18 Mar 2012 16:17:55 +0600 tuxonice-userui (0.7.3-1) unstable; urgency=low * Add ramdisk support, which means you can now include tuxonice-userui binaries within a ramdisk by simply running 'update-initramfs -u'. This command is automatically run on package installation. -- Arnaud Fontaine Tue, 20 Jan 2009 11:51:00 +0000 tuxonice-userui (0.7.2+clean-3) unstable; urgency=low * Rename suspend2-userui packages to tuxonice-userui. -- Arnaud Fontaine Sat, 01 Dec 2007 15:12:57 +0000 suspend2-userui (0.7.2-1) unstable; urgency=low * suspend2-userui binaries prefix has been changed from 'suspend2_' to 'tuxonice_'. -- Arnaud Fontaine Sun, 22 Jul 2007 11:41:46 +0200 suspend2-userui (0.6.4-2) unstable; urgency=low * Move binaries from /usr/sbin to /usr/lib/suspend2-userui because these binaries aren't intended to be executed directly by users. You have to update your configuration in order to modify the path of binaries. -- Arnaud Fontaine Mon, 1 Jan 2007 23:39:50 +0100 debian/gbp.conf0000664000000000000000000000007211756426454010624 0ustar [DEFAULT] upstream-tag = v%(version)s pristine-tar = True