reverted: --- xcolorsel-1.1a/debian/postrm +++ xcolorsel-1.1a.orig/debian/postrm @@ -1,3 +0,0 @@ -#!/bin/sh -e - -if [ -x /usr/bin/update-menus ] ; then update-menus ; fi diff -u xcolorsel-1.1a/debian/rules xcolorsel-1.1a/debian/rules --- xcolorsel-1.1a/debian/rules +++ xcolorsel-1.1a/debian/rules @@ -2,85 +2,24 @@ -# Debian rules file for xcolorsel (1.1a), adapted by Larry Daffner from -# Sample debian.rules file - for GNU Hello (1.3). -# Copyright 1994,1995 by Ian Jackson. -# I hereby give you perpetual unlimited permission to copy, -# modify and relicense this file, provided that you do not remove -# my name from the file itself. (I assert my moral right of -# paternity under the Copyright, Designs and Patents Act 1988.) -# This file may have to be extensively modified - -PACKAGE = xcolorsel - -DEB_CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -DEB_CFLAGS += -O0 -else -DEB_CFLAGS += -O2 -endif +CFLAGS = -Wall +CFLAGS += $(shell dpkg-buildflags --get CFLAGS) +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -build: - $(checkdir) +%: + dh $@ + +override_dh_auto_configure: xmkmf -a -DHasSELinux=0 - $(MAKE) XAWLIB=-lXaw3d CFLAGS='$(DEB_CFLAGS)' - touch build -clean: - $(checkdir) - # Need to do cleandir first, because purge doesn't - -$(MAKE) cleandir - -$(MAKE) purge - -rm -f build - -rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars - -binary-indep: checkroot build - $(checkdir) - -binary-arch: checkroot build - $(checkdir) - -rm -rf debian/tmp - install -d debian/tmp debian/tmp/DEBIAN - install -d debian/tmp/usr/share/doc/$(PACKAGE) - install -d debian/tmp/usr/share/menu - cp debian/conffiles debian/postinst debian/postrm debian/tmp/DEBIAN/. - chmod 755 debian/tmp/DEBIAN/postinst debian/tmp/DEBIAN/postrm - $(MAKE) DESTDIR=debian/tmp BINDIR='$(DESTDIR)/usr/bin' LIBDIR='$(DESTDIR)/usr/lib' install - $(MAKE) DESTDIR=debian/tmp MANPATH='$(DESTDIR)/usr/share/man' PROJECTMANSUFFIX='' install.man -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - strip --strip-unneeded --remove-section=.note \ - --remove-section=.comment \ - debian/tmp/usr/bin/xcolorsel -endif - cp debian/menu debian/tmp/usr/share/menu/xcolorsel - cp debian/copyright debian/tmp/usr/share/doc/$(PACKAGE)/. - cp debian/changelog debian/tmp/usr/share/doc/$(PACKAGE)/changelog.Debian - cp 01-CHANGELOG debian/tmp/usr/share/doc/$(PACKAGE)/changelog - cp 00-ANNOUNCE debian/tmp/usr/share/doc/$(PACKAGE)/ANNOUNCE - cp 00-README debian/tmp/usr/share/doc/$(PACKAGE)/README - gzip -9v debian/tmp/usr/share/doc/$(PACKAGE)/changelog - gzip -9v debian/tmp/usr/share/doc/$(PACKAGE)/changelog.Debian - gzip -9v debian/tmp/usr/share/doc/$(PACKAGE)/ANNOUNCE - gzip -9v debian/tmp/usr/share/doc/$(PACKAGE)/README - gzip -9v debian/tmp/usr/share/man/man1/xcolorsel.1 - dpkg-shlibdeps xcolorsel - dpkg-gencontrol -isp - chown -R root.root debian/tmp - chmod -R u+w debian/tmp - chmod -R g-ws debian/tmp - dpkg --build debian/tmp .. - -define checkdir - test -f xcolorsel.c -a -f debian/rules -endef - -# Below here is fairly generic really - -binary: binary-indep binary-arch - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -checkroot: - $(checkdir) - test root = "`whoami`" +override_dh_auto_build: + $(MAKE) XAWLIB=-lXaw3d CDEBUGFLAGS='$(CFLAGS)' LOCAL_LDFLAGS='$(LDFLAGS)' + +override_dh_auto_clean: + [ ! -f Makefile ] || $(MAKE) cleandir + [ ! -f Makefile ] || $(MAKE) purge + +override_dh_auto_install: + $(MAKE) DESTDIR=debian/xcolorsel BINDIR='$(DESTDIR)/usr/bin' LIBDIR='$(DESTDIR)/usr/lib' install + $(MAKE) DESTDIR=debian/xcolorsel MANPATH='$(DESTDIR)/usr/share/man' PROJECTMANSUFFIX='' install.man -.PHONY: binary binary-arch binary-indep clean checkroot +override_dh_installchangelogs: + dh_installchangelogs 01-CHANGELOG diff -u xcolorsel-1.1a/debian/control xcolorsel-1.1a/debian/control --- xcolorsel-1.1a/debian/control +++ xcolorsel-1.1a/debian/control @@ -1,13 +1,14 @@ Source: xcolorsel Section: x11 Priority: optional -Maintainer: Decklin Foster -Build-Depends: libx11-dev, libxt-dev, xaw3dg-dev, libxaw7-dev, xutils-dev +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 9), + libx11-dev, libxt-dev, xaw3dg-dev, libxaw7-dev, xutils-dev Standards-Version: 3.6.2 Package: xcolorsel Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: display colors and names in X xcolorsel is an X utility that displays the contents of the X color list file (/etc/X11/rgb.txt) together with tiles showing how the color looks on reverted: --- xcolorsel-1.1a/debian/postinst +++ xcolorsel-1.1a.orig/debian/postinst @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ "$1" = configure ]; then - - if [ -x /usr/bin/update-menus ] ; then update-menus ; fi - - # Clean up after old versions. This must stay in until etch. N.b. /usr/doc - # itself MAY be a symlink so we cannot do this unconditionally. - if [ -L /usr/doc/xcolorsel ]; then - rm -f /usr/doc/xcolorsel - fi - -fi diff -u xcolorsel-1.1a/debian/menu xcolorsel-1.1a/debian/menu --- xcolorsel-1.1a/debian/menu +++ xcolorsel-1.1a/debian/menu @@ -1,2 +1,2 @@ -?package(xcolorsel):needs="x11" section="Apps/Tools" title="Xcolorsel" \ +?package(xcolorsel):needs="x11" section="Applications/System/Administration" title="Xcolorsel" \ command="/usr/bin/xcolorsel" diff -u xcolorsel-1.1a/debian/copyright xcolorsel-1.1a/debian/copyright --- xcolorsel-1.1a/debian/copyright +++ xcolorsel-1.1a/debian/copyright @@ -4,7 +4,47 @@ from sources obtained from: ftp://ftp.x.org/R5contrib/xcolorsel-1.1a-src.tar.gz -This software has been released under the GNU General Public License + +/*********************************************************************************/ +/* This file is part of Xcolorsel, a multipurpose viewer for X11 rgb.txt files. */ +/* Copyright (C) 1993, 1994 Michael Weller */ +/* */ +/* This program is free software; you can redistribute it and/or modify it under */ +/* the terms of the GNU General Public License as published be the Free Software */ +/* Foundation; either version 2 of the License, or (at your opinion) 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 MERCHANBILITY or FITNESS */ +/* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more */ +/* details. */ +[...] +/* */ +/* Part of the files are derived from the Template Widget of the Athena Widgets */ +/* as published by the Massachusetts Institute of Technology. Actually these */ +/* files do not contain any code by the M.I.T but only variable declarations. */ +/* Nevertheless these parts of these files are still distributed under the terms */ +/* of the M.I.T copyright which are here repeated: */ +/* */ +/* Copyright Massachusetts Institute of Technology 1987, 1988 */ +/* */ +/* Permission to use, copy, modify, distribute, and sell this software and its */ +/* documentation for any purpose is hereby granted without fee, provided that */ +/* the above copyright notice appear in all copies and that both that */ +/* copyright notice and this permission notice appear in supporting */ +/* documentation, and that the name of M.I.T. not be used in advertising or */ +/* publicity pertaining to distribution of the software without specific, */ +/* written prior permission. M.I.T. makes no representations about the */ +/* suitability of this software for any purpose. It is provided "as is" */ +/* without express or implied warranty. */ +/* */ +/* M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL */ +/* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL M.I.T. */ +/* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ +/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION */ +/* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN */ +/* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*********************************************************************************/ On GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff -u xcolorsel-1.1a/debian/changelog xcolorsel-1.1a/debian/changelog --- xcolorsel-1.1a/debian/changelog +++ xcolorsel-1.1a/debian/changelog @@ -1,3 +1,13 @@ +xcolorsel (1.1a-18) unstable; urgency=low + + * QA upload. + * Change maintainer to QA group. + * Convert packaging from handwritten to debhelper + * Use dpkg-buildflags + * Change menu section to Applications/System/Administration + + -- Frank Lichtenheld Tue, 04 Dec 2012 23:46:57 +0100 + xcolorsel (1.1a-17) unstable; urgency=low * Correct xutils build-dep to xutils-dev (Closes: #485541) reverted: --- xcolorsel-1.1a/debian/conffiles +++ xcolorsel-1.1a.orig/debian/conffiles @@ -1,2 +0,0 @@ -/etc/X11/app-defaults/Xcolorsel -/etc/X11/app-defaults/Xcolorsel-color only in patch2: unchanged: --- xcolorsel-1.1a.orig/xcolorsel.man +++ xcolorsel-1.1a/xcolorsel.man @@ -418,7 +418,7 @@ .SH INTERNALS Most of the functionality of Xcolorsel is defined in an RgbText Widget. This is a child of a TextWidget linking an RgbSrc and RgbSink Widget together, which -are childs of AsciiSrc and AsciiSink, resp. Feel free to use these +are children of AsciiSrc and AsciiSink, resp. Feel free to use these Widgets in your own programs. Most of Xcolorsel's resources are resources of these Widgets. Interested programmers should be able to find all needed information about the programming interface of these Widgets in the corresponding @@ -567,7 +567,7 @@ Maybe I should have announced xcolorsel louder when it still was called xpalette. This way the long existing segmentation fault problem would have been found earlier. Many people searching for a bug on several -machines are obviously more succesful than a single one. +machines are obviously more successful than a single one. .LP Thus once again the power of the Internet community was shown. .SH COPYRIGHTS only in patch2: unchanged: --- xcolorsel-1.1a.orig/defhelp.h +++ xcolorsel-1.1a/defhelp.h @@ -95,12 +95,12 @@ "CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n" "\n" "When you see this default message, Xcolorsel could not load its helpfile.\n" -"Set the helpfile Resource of Xcolorsel to the absolut filename of the\n" +"Set the helpfile Resource of Xcolorsel to the absolute filename of the\n" "helpfile.\n" "You can also use the -helpfile >name< command line parameter to do this or\n" "put Xcolorsel.help in the current directory.\n" "\n" -"To skip searching for an explicit file you may set the absolut filename to\n" +"To skip searching for an explicit file you may set the absolute filename to\n" "the empty string.\n" "\n" "But before looking in the current directory, Xcolorsel searches its helpfile\n" @@ -113,5 +113,5 @@ " /usr/lib/X11/help/Xcolorsel:/usr/lib/X11/help/Xcolorsel.help:\\\n" " /usr/lib/X11/Xcolorsel.help\n" "\n" -"The actual absolut setting where to find the help file is:\n" +"The actual absolute setting where to find the help file is:\n" " %s\n"; only in patch2: unchanged: --- xcolorsel-1.1a.orig/debian/docs +++ xcolorsel-1.1a/debian/docs @@ -0,0 +1,2 @@ +00-ANNOUNCE +00-README only in patch2: unchanged: --- xcolorsel-1.1a.orig/debian/compat +++ xcolorsel-1.1a/debian/compat @@ -0,0 +1 @@ +9