diff -Nru dict-jargon-4.4.7/debian/changelog dict-jargon-4.4.7/debian/changelog --- dict-jargon-4.4.7/debian/changelog 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/changelog 2015-09-04 05:50:06.000000000 +0000 @@ -1,8 +1,24 @@ -dict-jargon (4.4.7-2ubuntu1) lucid; urgency=low +dict-jargon (4.4.7-3) unstable; urgency=medium - * Replace elinks with w3m. + * Switch to source format "3.0 (quilt)" and dh7 tiny rules + * Remove quilt from Build-Depends. + * Switch to machine-readable format for debian/copyright + * Bump Standards-Version to 3.9.6 (no changes) + * Bump compat level to 9 and update debhelper version on Build-Depends. + * Replace elinks with w3m (Closes: #567418). + Patch provided by: Mathias Gug + * Replace timestamps with the last debian/changelog entry timestamp + before calling dictzip and remove timestamps in call to dictfmt to + make the package build reproducibly (Closes: #792709). + Patch provided by: Dhole + * Add a new patch fixing typos and a missing sense number in a + reference (Closes: #581692, #587744, #587745). + Patches provided by: Oohara Yuuma + * Fix command-with-path-in-maintainer-script in debian/post* + * Add debian/README.source + * Update maintainer email - -- Mathias Gug Thu, 28 Jan 2010 18:14:54 -0500 + -- Ruben Molina Thu, 03 Sep 2015 22:38:38 -0400 dict-jargon (4.4.7-2) unstable; urgency=low diff -Nru dict-jargon-4.4.7/debian/clean dict-jargon-4.4.7/debian/clean --- dict-jargon-4.4.7/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ dict-jargon-4.4.7/debian/clean 2015-09-04 05:42:05.000000000 +0000 @@ -0,0 +1,7 @@ +jargon-web.xml +jargon-web.html +jargon.txt +extracted +ChangeLog +jargon.dict.dz +jargon.index diff -Nru dict-jargon-4.4.7/debian/compat dict-jargon-4.4.7/debian/compat --- dict-jargon-4.4.7/debian/compat 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/compat 2015-09-04 02:11:41.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru dict-jargon-4.4.7/debian/control dict-jargon-4.4.7/debian/control --- dict-jargon-4.4.7/debian/control 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/control 2015-09-04 05:01:26.000000000 +0000 @@ -1,24 +1,23 @@ Source: dict-jargon Section: text Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ruben Molina -Build-Depends: quilt, debhelper (>= 7) +Maintainer: Ruben Molina +Build-Depends: debhelper (>= 9) Build-Depends-Indep: xmlto, w3m, dictfmt, dictzip -Standards-Version: 3.8.2 +Standards-Version: 3.9.6 Homepage: http://catb.org/jargon/ Package: dict-jargon Architecture: all -Depends: dictd | dict-server +Depends: ${misc:Depends}, dictd | dict-server Suggests: dict Provides: dictd-dictionary Description: dict package for The Jargon Lexicon - The Jargon File is a comprehensive compendium of hacker slang + The Jargon File is a comprehensive compendium of hacker slang illuminating many aspects of hackish tradition, folklore, and humor. . - This package includes "The Jargon Lexicon" (main section of The Jargon - File, version 4.4.7, 29 Dec 2003), formatted for use by the dictionary + This package includes "The Jargon Lexicon" (main section of The Jargon + File, version 4.4.7, 29 Dec 2003), formatted for use by the dictionary server in the dictd package. . The complete Jargon File is available in the jargon-text package. diff -Nru dict-jargon-4.4.7/debian/copyright dict-jargon-4.4.7/debian/copyright --- dict-jargon-4.4.7/debian/copyright 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/copyright 2015-09-04 05:55:02.000000000 +0000 @@ -1,36 +1,33 @@ -This package was debianized by: - - Ruben Molina on Fri, 09 Jan 2009 17:06:18 -0500 - -It was downloaded from: - - http://catb.org/jargon/jargsrc.tar.gz - -Upstream Author: - - Eric S. Raymond - -Copyright: - - The Jargon File is in the public domain. - -License: - - This document (the Jargon File) is in the public domain, to be freely - used, shared, and modified. There are (by intention) no legal restraints - on what you can do with it, but there are traditions about its proper use - to which many hackers are quite strongly attached. Please extend the - courtesy of proper citation when you quote the File, ideally with a - version number, as it will change and grow over time. (Examples of - appropriate citation form: "Jargon File 4.4.7" or "The on-line hacker - Jargon File, version 4.4.7, 29 Dec 2003".) - -The Debian packaging is: - - Copyright (C) 2009, Ruben Molina - Copyright (C) 1999,2001,2005 Paul Martin - -and is licensed under the GPL. - -On Debian systems, the complete text of the GNU General Public License -can be found in `/usr/share/common-licenses/GPL-3'. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: dict-jargon +Source: http://catb.org/jargon/jargsrc.tar.gz + +Files: * +Copyright: The Jargon File is in the public domain +License: public-domain + This document (the Jargon File) is in the public domain, to be freely used, shared, and + modified. There are (by intention) no legal restraints on what you can do with it, but there + are traditions about its proper use to which many hackers are quite strongly attached. + Please extend the courtesy of proper citation when you quote the File, ideally with a + version number, as it will change and grow over time. (Examples of appropriate citation + form: "Jargon File 4.4.7" or "The on-line hacker Jargon File, version 4.4.7, 29 Dec 2003".) + +Files: debian/* +Copyright: 2009, 2015 Ruben Molina + 1999, 2001, 2005 Paul Martin +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 + 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 program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru dict-jargon-4.4.7/debian/dirs dict-jargon-4.4.7/debian/dirs --- dict-jargon-4.4.7/debian/dirs 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/dictd diff -Nru dict-jargon-4.4.7/debian/install dict-jargon-4.4.7/debian/install --- dict-jargon-4.4.7/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ dict-jargon-4.4.7/debian/install 2015-09-04 03:24:30.000000000 +0000 @@ -0,0 +1,3 @@ +jargon.dict.dz /usr/share/dictd +jargon.index /usr/share/dictd + diff -Nru dict-jargon-4.4.7/debian/jargon2dict.sh dict-jargon-4.4.7/debian/jargon2dict.sh --- dict-jargon-4.4.7/debian/jargon2dict.sh 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/jargon2dict.sh 2015-09-04 05:53:52.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009 Ruben Molina +# Copyright (C) 2009, 2015 Ruben Molina # # 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 @@ -67,7 +67,7 @@ echo " [+] removing references to 'Crunchly saga' cartoons" C=$(grep 'Crunchly saga' extracted | wc -l) - for i in $(seq $C) + for i in $(seq $C) do N3=$(grep 'Crunchly saga' --max-count=1 --line-number 'extracted' | cut --delimiter=':' --fields=1) sed --expression="$N3,$((N3+2))d" 'extracted' > 'cleaned' @@ -75,9 +75,11 @@ done echo " [+] formatting dictionary database" - dictfmt -j -s "The Jargon File (version 4.4.7, 29 Dec 2003)" \ + dictfmt -j -s "The Jargon File (version 4.4.7, 29 Dec 2003)" --without-time \ -u "http://catb.org/~esr/jargon/jargsrc.tar.gz" \ --utf8 --allchars --columns 79 'jargon' < 'extracted' echo " [+] compressing dictionary" + touch --date="$BUILD_DATE" jargon.dict dictzip 'jargon.dict' + diff -Nru dict-jargon-4.4.7/debian/patches/fix-typos-in-lexicon.diff dict-jargon-4.4.7/debian/patches/fix-typos-in-lexicon.diff --- dict-jargon-4.4.7/debian/patches/fix-typos-in-lexicon.diff 1970-01-01 00:00:00.000000000 +0000 +++ dict-jargon-4.4.7/debian/patches/fix-typos-in-lexicon.diff 2015-09-04 06:07:35.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Fix typos and a missing reference. + Fixes typos in the "black hat" and "I for one welcome our new X overlords" entries. + Adds a missing sense number of a "ACK" reference in the "NAK" entry. +Author: Oohara Yuuma +Bug-Debian: https://bugs.debian.org/581692 +Bug-Debian: https://bugs.debian.org/587744 +Bug-Debian: https://bugs.debian.org/587745 +Reviewed-By: Ruben Molina +Forwarded: no +Last-Update: 2015-09-03 + +--- dict-jargon-4.4.7.orig/jargon.xml ++++ dict-jargon-4.4.7/jargon.xml +@@ -9651,7 +9651,7 @@ bits 0001 0011 0101 0111 1001 1 + + 1. [common among security specialists] A + cracker, someone bent on breaking into the system +- you are protecting. Oppose the less comon white ++ you are protecting. Oppose the less common white + hat for an ally or friendly security specialist; the term + gray hat is in occasional use for + people with cracker skills operating within the law, e.g. in doing security +@@ -37740,7 +37740,7 @@ would be read as ‘foobaz’ or + Simpsons episode (#96, + Homer In Space) X = insect +- and th line is part of a speech in which a smarmy newscaster expresses his ++ and the line is part of a speech in which a smarmy newscaster expresses his + willingness to collaborate with an invading race of giant space + ants. + +@@ -48191,7 +48191,7 @@ retorted, Mu! + 3. Used to politely interrupt someone to tell them you don't + understand their point or that they have suddenly stopped making sense. +- See ACK, sense ++ See ACK, sense 3. + + + 3. And then, after we recode the project in diff -Nru dict-jargon-4.4.7/debian/patches/fix-xsl-files.diff dict-jargon-4.4.7/debian/patches/fix-xsl-files.diff --- dict-jargon-4.4.7/debian/patches/fix-xsl-files.diff 1970-01-01 00:00:00.000000000 +0000 +++ dict-jargon-4.4.7/debian/patches/fix-xsl-files.diff 2015-09-04 06:08:11.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Fix *.xsl files + Remove a missing/unneeded import on jargon.xsl + Disable the ToC generation on jargon-text.xsl +Origin: Debian jargon-text package +Forwarded: no +Reviewed-By: Ruben Molina +Last-Update: 2015-09-03 + +--- dict-jargon-4.4.7.orig.orig/jargon-text.xsl ++++ dict-jargon-4.4.7.orig/jargon-text.xsl +@@ -6,8 +6,8 @@ + + + +- +- ++ ++ + + + +--- dict-jargon-4.4.7.orig.orig/jargon.xsl ++++ dict-jargon-4.4.7.orig/jargon.xsl +@@ -2,7 +2,6 @@ + + +- + + + ../graphics/ diff -Nru dict-jargon-4.4.7/debian/patches/series dict-jargon-4.4.7/debian/patches/series --- dict-jargon-4.4.7/debian/patches/series 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/patches/series 2015-09-04 06:09:56.000000000 +0000 @@ -1 +1,2 @@ -xsl.patch +fix-xsl-files.diff +fix-typos-in-lexicon.diff diff -Nru dict-jargon-4.4.7/debian/patches/xsl.patch dict-jargon-4.4.7/debian/patches/xsl.patch --- dict-jargon-4.4.7/debian/patches/xsl.patch 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/patches/xsl.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -# jargon.xsl: remove an import (missing/unneeded) -# jargon-text.xsl: disable the ToC generation ---- dict-jargon-4.4.7.orig/jargon.xsl -+++ dict-jargon-4.4.7/jargon.xsl -@@ -2,7 +2,6 @@ - - -- - - - ../graphics/ ---- dict-jargon-4.4.7.orig/jargon-text.xsl -+++ dict-jargon-4.4.7/jargon-text.xsl -@@ -6,8 +6,8 @@ - - - -- -- -+ -+ - - - diff -Nru dict-jargon-4.4.7/debian/postinst dict-jargon-4.4.7/debian/postinst --- dict-jargon-4.4.7/debian/postinst 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/postinst 2015-09-04 04:43:30.000000000 +0000 @@ -20,7 +20,7 @@ case "$1" in configure) - if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ; fi + if [ -x "`which dictdconfig 2>/dev/null`" ]; then dictdconfig -w ; fi if [ -x /etc/init.d/dictd ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then invoke-rc.d dictd restart || exit $? diff -Nru dict-jargon-4.4.7/debian/postrm dict-jargon-4.4.7/debian/postrm --- dict-jargon-4.4.7/debian/postrm 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/postrm 2015-09-04 04:43:48.000000000 +0000 @@ -21,7 +21,7 @@ case "$1" in purge|remove) - if [ -x /usr/sbin/dictdconfig ]; then dictdconfig -w ; fi + if [ -x "`which dictdconfig 2>/dev/null`" ]; then dictdconfig -w ; fi if [ -x /etc/init.d/dictd ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then invoke-rc.d dictd restart || exit $? diff -Nru dict-jargon-4.4.7/debian/README.source dict-jargon-4.4.7/debian/README.source --- dict-jargon-4.4.7/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ dict-jargon-4.4.7/debian/README.source 2015-09-04 04:08:29.000000000 +0000 @@ -0,0 +1,10 @@ +dict-jargon for Debian +---------------------- + +The *.orig.tar.gz file was created using 3 files from jargsrc.tar.gz as follows: + +wget http://catb.org/~esr/jargon/jargsrc.tar.gz +tar zxvf jargsrc.tar.gz jargon.xml jargon.xsl jargon-text.xsl +chmod 644 jargon.xml jargon.xsl jargon-text.xsl + + -- Ruben Molina Thu, 03 Sep 2015 22:11:26 -0400 diff -Nru dict-jargon-4.4.7/debian/rules dict-jargon-4.4.7/debian/rules --- dict-jargon-4.4.7/debian/rules 2016-05-23 08:44:20.000000000 +0000 +++ dict-jargon-4.4.7/debian/rules 2015-09-04 05:43:39.000000000 +0000 @@ -1,52 +1,11 @@ #!/usr/bin/make -f -DICTDIR=$(CURDIR)/debian/dict-jargon/usr/share/dictd +# See: https://bugs.debian.org/792709 +BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date) +export BUILD_DATE -include /usr/share/quilt/quilt.make +%: + dh $@ -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp $(QUILT_STAMPFN) - dh_testdir - chmod +x ./debian/jargon2dict.sh - ./debian/jargon2dict.sh - touch $@ - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - rm -f jargon-web.html jargon-web.xml - rm -f jargon.txt extracted cleaned ChangeLog - rm -f jargon.index jargon.dict jargon.dict.dz - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - install -p -o root -g root -m 644 $(CURDIR)/jargon.dict.dz $(DICTDIR) - install -p -o root -g root -m 644 $(CURDIR)/jargon.index $(DICTDIR) - -binary-indep: install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs - dh_install - dh_compress - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_build: + sh debian/jargon2dict.sh diff -Nru dict-jargon-4.4.7/debian/source/format dict-jargon-4.4.7/debian/source/format --- dict-jargon-4.4.7/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ dict-jargon-4.4.7/debian/source/format 2015-09-04 02:11:41.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)