--- qink-0.3.5.orig/debian/changelog +++ qink-0.3.5/debian/changelog @@ -0,0 +1,77 @@ +qink (0.3.5-3) unstable; urgency=low + + * Fix libinklevel version detection for 0.8.0 (Closes: #552955). + * Bump Standards-Version to 3.8.4. + * Add README.source (quilt template). + * Add patches' descriptions. + * Update debian/copyright. + + -- Adam Cécile (Le_Vert) Mon, 15 Mar 2010 17:23:29 +0100 + +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 --- qink-0.3.5.orig/debian/watch +++ qink-0.3.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://code.google.com/p/qink/downloads/list http://qink.googlecode.com/files/qink-(.*).tar.gz --- qink-0.3.5.orig/debian/control +++ qink-0.3.5/debian/control @@ -0,0 +1,16 @@ +Source: qink +Section: admin +Priority: extra +Maintainer: Adam Cécile (Le_Vert) +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.4 + +Package: qink +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple printer ink level monitor based on libinklevel and Qt4 + QInk is a simple printer ink level monitor based on libinklevel. + . + It is a fork of KInk (development of which ceased in 2003), but ported to + Qt4 and the most recent, API-incompatible versions of libinklevel. --- qink-0.3.5.orig/debian/copyright +++ qink-0.3.5/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Adam Cécile (Le_Vert) on +Thu, 26 Jul 2007 11:11:50 +0200. + +It was downloaded from http://code.google.com/p/qink/ + +Upstream Authors: + + Moris Ravasio + Matvey Kozhev (current maintainer) + +Copyright: + + Copyright (C) 2003 Moris Ravasio + Copyright (C) 2007 Matvey Kozhev + +License: + + 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; either version 2 of the License, or + (at your option) any later version. + + 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 + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +The Debian packaging is Copyright (C) 2007-2010, Adam Cécile (Le_Vert) + and is licensed under the GPL, see above. + +"src/aboutdlg.*" are Copyright (C) 2001-2003 Justin Karneges, +Michail Pishchagin and Copyright (C) 2007 Matvey Kozhev. --- qink-0.3.5.orig/debian/README.Debian +++ qink-0.3.5/debian/README.Debian @@ -0,0 +1,15 @@ +qink for Debian +--------------- + +Supported printers list can be found in : +/usr/share/doc/libinklevel5/README.Debian + +This software needs to access printers devices nodes, so users that run QInk +must belong to the group 'lp'. The easiest way is to add your user to this +group : + + (as root) adduser myuser lp + +Otherwise you may consider using sudo instead. + + -- Adam Cécile (Le_Vert) Thu, 26 Jul 2007 11:11:50 +0200 --- qink-0.3.5.orig/debian/docs +++ qink-0.3.5/debian/docs @@ -0,0 +1,2 @@ +THANKS +AUTHORS --- qink-0.3.5.orig/debian/rules +++ qink-0.3.5/debian/rules @@ -0,0 +1,64 @@ +#!/usr/bin/make -f + +# Quilt patch system +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +# Append some needed FLAGS (crap upstream build system) +CFLAGS += -pipe -D_REENTRANT -W \$$(DEFINES) + +DESTDIR = $(CURDIR)/debian/qink + +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) + dh_testdir + ./configure --prefix=/usr --qtdir=/usr/share/qt4 + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp conf.log conf.pri + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + # Do not strip binary (nostrip option) + sed -i 's!^\(.*strip.*\)$$!#\1!' $(CURDIR)/src/Makefile + $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/qink + rm -r $(CURDIR)/debian/qink/usr/share/doc + +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installmenu + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- qink-0.3.5.orig/debian/menu +++ qink-0.3.5/debian/menu @@ -0,0 +1,7 @@ +?package(qink):\ + needs="X11" \ + section="Applications/System/Monitoring" \ + title="QInk" \ + longtitle="QInk: ink level monitor" \ + icon="/usr/share/pixmaps/qink.xpm" \ + command="/usr/bin/qink" --- qink-0.3.5.orig/debian/compat +++ qink-0.3.5/debian/compat @@ -0,0 +1 @@ +5 --- qink-0.3.5.orig/debian/README.source +++ qink-0.3.5/debian/README.source @@ -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. --- qink-0.3.5.orig/debian/patches/series +++ qink-0.3.5/debian/patches/series @@ -0,0 +1,2 @@ +000_gcc4.3_fix.patch +001_libinklevel0.8_fix.patch --- qink-0.3.5.orig/debian/patches/000_gcc4.3_fix.patch +++ qink-0.3.5/debian/patches/000_gcc4.3_fix.patch @@ -0,0 +1,12 @@ +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 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + ++#include ++ + #ifndef QINK_H + #define QINK_H + --- qink-0.3.5.orig/debian/patches/001_libinklevel0.8_fix.patch +++ qink-0.3.5/debian/patches/001_libinklevel0.8_fix.patch @@ -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"; +