diff -Nru qink-0.3.5/debian/changelog qink-0.3.5~lffl~karmic~ppa/debian/changelog --- qink-0.3.5/debian/changelog 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/changelog 2010-06-03 14:17:46.000000000 +0100 @@ -1,80 +1,5 @@ -qink (0.3.5-2ubuntu1) karmic; urgency=low +qink (0.3.5~lffl~karmic~ppa) karmic; urgency=low - * Added 001_qconf_test.patch: - - Fix qconf test on amd64, armel, ia64 and sparc. + * Initial Release. - -- Maia Kozheva Sat, 12 Sep 2009 12:56:18 +0700 - -qink (0.3.5-2build1) karmic; urgency=low - - * No-change-rebuild to pick up libinklevel5 dependency on all archs. - - -- Andreas Moog Thu, 30 Jul 2009 11:35:43 +0200 - -qink (0.3.5-2) unstable; urgency=low - - * Bump Standards-Version. - * Fix build with GCC 4.3. - * Bump libinklevel-dev build dependency to link against libinklevel5. - - -- Adam Cécile (Le_Vert) Fri, 13 Feb 2009 21:16:34 +0100 - -qink (0.3.5-1) unstable; urgency=low - - * New upstream release: - - No longer print wrong device node in help message (Closes: #451576). - * Drop 000-Fix_FTBFS_with_gcc4.3 patch, fixed upstream. - - -- Adam Cécile (Le_Vert) Thu, 21 Feb 2008 19:21:46 +0100 - -qink (0.3.4-2) unstable; urgency=low - - * Add quilt patch system dependency. - * Add 000-Fix_FTBFS_with_gcc4.3 patch (Closes: #461771). - - -- Adam Cécile (Le_Vert) Wed, 06 Feb 2008 21:11:02 +0100 - -qink (0.3.4-1) unstable; urgency=low - - * New upstream release. - * Drop 000-Fix-manpage-whatis-entry patch, fixed upstream. - * Drop imagemagick b-depends and icons conversion in debian/rules, - fixed upstream. - * Drop dpatch b-depends and debian/rules patch targets. - * Bump Standards-Version to 3.7.3. - - -- Adam Cécile (Le_Vert) Tue, 11 Dec 2007 21:01:22 +0100 - -qink (0.3.3-1) unstable; urgency=low - - * New upstream release. - - Drop 000-Fix_broken_makefile_install_target patch, fixed upstream. - * Add 000-Fix-manpage-whatis-entry patch, fix whatis entry. - * Move to new dpkg 'Homepage' field. - - -- Adam Cécile (Le_Vert) Wed, 24 Oct 2007 14:23:52 +0200 - -qink (0.3.2-1) unstable; urgency=low - - * New upstream release: - - Drop 000-Fix_full_gpl_text_path patch, fixed upstream. - - Drop .desktop improved file installation, merged upstream. - - Drop manpage manual installation, merged upstream. - - Add 000-Fix_broken_makefile_install_target patch. - * Add debian/watch. - - -- Adam Cécile (Le_Vert) Sat, 18 Aug 2007 13:32:52 +0200 - -qink (0.3.1-2) unstable; urgency=low - - * Upstream makefile doesn't strip binary anymore (Closes: 437857). - * Menu: move to Applications/System/Monitoring. - * Drop deprecated 'Encoding' and duplicated 'Type' entry in desktop file. - - -- Adam Cécile (Le_Vert) Wed, 15 Aug 2007 00:28:14 +0200 - -qink (0.3.1-1) unstable; urgency=low - - * Initial release (Closes: #434748). - - -- Adam Cécile (Le_Vert) Thu, 26 Jul 2007 11:11:50 +0200 + -- Ferramosca Roberto Wed, 02 Jun 2010 20:30:22 +0200 diff -Nru qink-0.3.5/debian/control qink-0.3.5~lffl~karmic~ppa/debian/control --- qink-0.3.5/debian/control 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/control 2010-06-03 13:34:12.000000000 +0100 @@ -1,11 +1,10 @@ Source: qink Section: admin Priority: extra -Maintainer: Ubuntu MOTU Developers -XSBC-Original-Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.2), libinklevel-dev (>= 0.8.0~), quilt +Maintainer: Ferramosca Roberto +Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.2), libinklevel-dev (>= 0.8.0), quilt Homepage: http://code.google.com/p/qink/ -Standards-Version: 3.8.0 +Standards-Version: 3.8.4 Package: qink Architecture: any diff -Nru qink-0.3.5/debian/copyright qink-0.3.5~lffl~karmic~ppa/debian/copyright --- qink-0.3.5/debian/copyright 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/copyright 2010-05-28 14:13:39.000000000 +0100 @@ -1,23 +1,26 @@ -This package was debianized by Adam Cécile (Le_Vert) on -Thu, 26 Jul 2007 11:11:50 +0200. +This work was packaged for Debian by: -It was downloaded from http://code.google.com/p/qink/ + Ferramosca Roberto on Fri, 28 May 2010 15:13:37 +0200 -Upstream Authors: +It was downloaded from: - Moris Ravasio - Matvey Kozhev (current maintainer) + + +Upstream Author(s): + + + Copyright: - Copyright (C) 2003 Moris Ravasio - Copyright (C) 2007 Matvey Kozhev + + License: - This package is free software; you can redistribute it and/or modify + 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 + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, @@ -26,14 +29,22 @@ 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 + along with this program. If not, see . On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +The Debian packaging is: + + Copyright (C) 2010 Ferramosca Roberto + +# Please chose a license for your packaging work. If the program you package +# uses a mainstream license, using the same license is the safest choice. +# Please avoid to pick license terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. +# If you just want it to be GPL version 3, leave the following line in. -The Debian packaging is (C) 2007-2009, Adam Cécile (Le_Vert) - and is licensed under the GPL, see above. +and is licensed under the GPL version 3, see above. -"src/aboutdlg.*" are (C) 2001-2003 Justin Karneges, Michail Pishchagin and -(C) 2007 Matvey Kozhev. +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. diff -Nru qink-0.3.5/debian/patches/000_gcc4.3_fix.patch qink-0.3.5~lffl~karmic~ppa/debian/patches/000_gcc4.3_fix.patch --- qink-0.3.5/debian/patches/000_gcc4.3_fix.patch 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/patches/000_gcc4.3_fix.patch 2010-06-03 13:32:53.000000000 +0100 @@ -1,3 +1,4 @@ +Fix compilation with GCC 4.3.x or newer. --- qink-0.3.5/src.orig/qink.h 2009-02-13 21:22:43.402291000 +0100 +++ qink-0.3.5/src/qink.h 2009-02-13 21:23:20.186307440 +0100 @@ -18,6 +18,8 @@ diff -Nru qink-0.3.5/debian/patches/001_libinklevel0.8_fix.patch qink-0.3.5~lffl~karmic~ppa/debian/patches/001_libinklevel0.8_fix.patch --- qink-0.3.5/debian/patches/001_libinklevel0.8_fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/patches/001_libinklevel0.8_fix.patch 2010-06-03 13:32:53.000000000 +0100 @@ -0,0 +1,23 @@ +libinklevel >= 0.8.0 changed version strings from vX.Y.Z to X.Z. Fix build against theses newer releases. +--- qink-0.3.5/qconf/libinklevel070.qcm 2007-12-06 16:09:12.000000000 +0100 ++++ qink-0.3.5/qconf/libinklevel070.qcm.new 2010-03-15 17:22:00.387865747 +0100 +@@ -99,7 +99,7 @@ + + "int main() {\n" + " int major, minor, revision;\n" +- " sscanf(get_version_string(), \"libinklevel v%i.%i.%i\", &major, &minor, &revision);\n" ++ " sscanf(get_version_string(), \"libinklevel %i.%i.%i\", &major, &minor, &revision);\n" + + " if((major > 0) || ((major == 0) && (minor >= 7))) return 0; else return 1; }\n"; + +--- qink-0.3.5/configure 2007-08-18 11:29:32.000000000 +0200 ++++ qink-0.3.5/configure.new 2010-03-15 17:26:10.643870431 +0100 +@@ -423,7 +423,7 @@ + + "int main() {\n" + " int major, minor, revision;\n" +- " sscanf(get_version_string(), \"libinklevel v%i.%i.%i\", &major, &minor, &revision);\n" ++ " sscanf(get_version_string(), \"libinklevel %i.%i.%i\", &major, &minor, &revision);\n" + + " if((major > 0) || ((major == 0) && (minor >= 7))) return 0; else return 1; }\n"; + diff -Nru qink-0.3.5/debian/patches/001_qconf_test.patch qink-0.3.5~lffl~karmic~ppa/debian/patches/001_qconf_test.patch --- qink-0.3.5/debian/patches/001_qconf_test.patch 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/patches/001_qconf_test.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -Index: qink-0.3.5/qconf/libinklevel070.qcm -=================================================================== ---- qink-0.3.5.orig/qconf/libinklevel070.qcm 2009-09-12 13:01:52.153996315 +0700 -+++ qink-0.3.5/qconf/libinklevel070.qcm 2009-09-12 13:02:04.465998123 +0700 -@@ -99,7 +99,7 @@ - - "int main() {\n" - " int major, minor, revision;\n" -- " sscanf(get_version_string(), \"libinklevel v%i.%i.%i\", &major, &minor, &revision);\n" -+ " sscanf(get_version_string(), \"libinklevel v%d.%d.%d\", &major, &minor, &revision);\n" - - " if((major > 0) || ((major == 0) && (minor >= 7))) return 0; else return 1; }\n"; - diff -Nru qink-0.3.5/debian/patches/series qink-0.3.5~lffl~karmic~ppa/debian/patches/series --- qink-0.3.5/debian/patches/series 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/patches/series 2010-06-03 13:32:53.000000000 +0100 @@ -1,2 +1,2 @@ 000_gcc4.3_fix.patch -001_qconf_test.patch +001_libinklevel0.8_fix.patch diff -Nru qink-0.3.5/debian/README.source qink-0.3.5~lffl~karmic~ppa/debian/README.source --- qink-0.3.5/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/debian/README.source 2010-06-03 13:32:53.000000000 +0100 @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. diff -Nru qink-0.3.5/qconf/libinklevel070.qcm qink-0.3.5~lffl~karmic~ppa/qconf/libinklevel070.qcm --- qink-0.3.5/qconf/libinklevel070.qcm 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/qconf/libinklevel070.qcm 2007-12-06 15:09:12.000000000 +0000 @@ -111,7 +111,7 @@ return false; } - if(ret == 1) + if(ret) { qWarning("libinklevel version too low!"); return false; diff -Nru qink-0.3.5/qconf/patches/series qink-0.3.5~lffl~karmic~ppa/qconf/patches/series --- qink-0.3.5/qconf/patches/series 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/qconf/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -02_qconf_test diff -Nru qink-0.3.5/qconf/.pc/02_qconf_test/libinklevel070.qcm qink-0.3.5~lffl~karmic~ppa/qconf/.pc/02_qconf_test/libinklevel070.qcm --- qink-0.3.5/qconf/.pc/02_qconf_test/libinklevel070.qcm 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/qconf/.pc/02_qconf_test/libinklevel070.qcm 1970-01-01 01:00:00.000000000 +0100 @@ -1,122 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2007 by Matvey Kozhev * - * sikon@lucidfox.org * - * * - * 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. * - ***************************************************************************/ -/* ------BEGIN QCMOD----- -name: libinklevel >= 0.7.0 -arg: with-libinklevel-inc=[path],Path to inklevel.h -arg: with-libinklevel-lib=[path],Path to libinklevel library files ------END QCMOD----- -*/ -class qc_libinklevel070 : public ConfObj -{ -public: - qc_libinklevel070(Conf *c) : ConfObj(c) {} - QString name() const { return "libinklevel >= 0.7.0"; } - QString shortname() const { return "libinklevel070"; } - - bool exec() - { - QString inc; - QString lib; - - QString s = conf->getenv("QC_WITH_LIBINKLEVEL_INC"); - - if(!s.isEmpty()) - { - if(!conf->checkHeader(s, "inklevel.h")) - { - qWarning("libinklevel includes not found!"); - return false; - } - - inc = s; - conf->addIncludePath(inc); - } - else - { - if(!conf->findHeader("inklevel.h", QStringList(), &s)) - { - qWarning("libinklevel includes not found!"); - return false; - } - - inc = s; - conf->addIncludePath(inc); - } - - s = conf->getenv("QC_WITH_LIBINKLEVEL_LIB"); - - if(!s.isEmpty()) - { - if(!conf->checkLibrary(s, "inklevel")) - { - qWarning("libinklevel library not found!"); - return false; - } - - lib = "-L" + s + " -Wl,-rpath -Wl," + s; - conf->addLib(lib); - } - else - { - if(!conf->findLibrary("inklevel", &s)) - { - qWarning("libinklevel library not found!"); - return false; - } - - if (!s.isEmpty()) - { - lib = "-L" + s + " -Wl,-rpath -Wl," + s; - conf->addLib(lib); - } - } - - conf->addLib("-linklevel"); - - QString text = - "#include \n" - "extern \"C\" {\n" - "#include \n" - "}\n" - - "int main() {\n" - " int major, minor, revision;\n" - " sscanf(get_version_string(), \"libinklevel v%i.%i.%i\", &major, &minor, &revision);\n" - - " if((major > 0) || ((major == 0) && (minor >= 7))) return 0; else return 1; }\n"; - - int ret; - - if(!conf->doCompileAndLink(text, QStringList(inc), lib + " -linklevel", "", &ret)) - { - qWarning("Cannot compile!"); - return false; - } - - if(ret == 1) - { - qWarning("libinklevel version too low!"); - return false; - } - - return true; - } -}; diff -Nru qink-0.3.5/qconf/.pc/applied-patches qink-0.3.5~lffl~karmic~ppa/qconf/.pc/applied-patches --- qink-0.3.5/qconf/.pc/applied-patches 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/qconf/.pc/applied-patches 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -02_qconf_test diff -Nru qink-0.3.5/qconf/.pc/.version qink-0.3.5~lffl~karmic~ppa/qconf/.pc/.version --- qink-0.3.5/qconf/.pc/.version 2010-06-03 14:24:16.000000000 +0100 +++ qink-0.3.5~lffl~karmic~ppa/qconf/.pc/.version 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -2