diff options
author | Matteo F. Vescovi <mfv@debian.org> | 2018-06-14 17:27:40 -0300 |
---|---|---|
committer | Matteo F. Vescovi <mfv@debian.org> | 2018-06-14 17:27:40 -0300 |
commit | 5cff6498825b211f87352540835cacd0ea8e6959 (patch) | |
tree | 004f66e197f6e3851891c1af1a456941f8b1d9ee | |
parent | c9cecdbd764570d3a89f0b27265b9a6c1b066f4c (diff) | |
parent | 047c19464482e3ad95760eeee30c245759aa2efe (diff) |
emacs-jabber (0.8.92+git98dc8e-4) unstable; urgency=medium
* debian/: debhelper bump 10 -> 11
* debian/control:
- S-V bump 3.9.8 -> 4.1.4 (no changes needed)
- Vcs-* fields updated poiting to salsa
* debian/rules: drop '--parallel' parameter
[dgit import unpatched emacs-jabber 0.8.92+git98dc8e-4]
-rw-r--r-- | debian/changelog | 187 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 34 | ||||
-rw-r--r-- | debian/copyright | 50 | ||||
-rw-r--r-- | debian/dirs | 1 | ||||
-rw-r--r-- | debian/docs | 3 | ||||
-rw-r--r-- | debian/elpa | 2 | ||||
-rw-r--r-- | debian/emacsen-install.in | 21 | ||||
-rw-r--r-- | debian/emacsen-install.template | 87 | ||||
-rw-r--r-- | debian/emacsen-remove.in | 5 | ||||
-rw-r--r-- | debian/emacsen-remove.template | 10 | ||||
-rw-r--r-- | debian/emacsen-startup | 17 | ||||
-rw-r--r-- | debian/gbp.conf | 12 | ||||
-rwxr-xr-x | debian/rules | 47 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 3 |
16 files changed, 251 insertions, 230 deletions
diff --git a/debian/changelog b/debian/changelog index b9eb776..ef82992 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,46 +1,179 @@ -emacs-jabber (0.7.dev) unstable; urgency=low +emacs-jabber (0.8.92+git98dc8e-4) unstable; urgency=medium - * Development snapshot; unofficial as far as Debian is concerned. + * debian/: debhelper bump 10 -> 11 + * debian/control: + - S-V bump 3.9.8 -> 4.1.4 (no changes needed) + - Vcs-* fields updated poiting to salsa + * debian/rules: drop '--parallel' parameter - -- Magnus Henoch <mange@freemail.hu> Mon, 17 Jul 2006 08:42:33 +0200 + -- Matteo F. Vescovi <mfv@debian.org> Thu, 14 Jun 2018 22:27:40 +0200 -emacs-jabber (0.7) unstable; urgency=low +emacs-jabber (0.8.92+git98dc8e-3) unstable; urgency=medium - * SSL connections - * Roster display optimized - * Uncountable minor features and bugfixes + * Team upload. + * Rebuild with dh-elpa 1.13 to fix byte-compilation with unversioned + emacs - -- Magnus Henoch <mange@freemail.hu> Tue, 27 Dec 2005 12:55:10 +0100 + -- David Bremner <bremner@debian.org> Sat, 02 Jun 2018 20:21:08 -0300 -emacs-jabber (0.6.1) unstable; urgency=low +emacs-jabber (0.8.92+git98dc8e-2) unstable; urgency=medium - * Message history - * Activity tracking - * Notification for specific people going online - * Support for /me - * Improved MUC support + * Upload to unstable - -- Magnus Henoch <mange@freemail.hu> Thu, 23 Dec 2004 19:04:58 +0100 + -- Matteo F. Vescovi <mfv@debian.org> Sat, 17 Dec 2016 14:15:10 +0100 -emacs-jabber (0.6) unstable; urgency=low +emacs-jabber (0.8.92+git98dc8e-1) experimental; urgency=medium - * Chat buffer no longer uses minibuffer - * Roster and chat buffer prompts are customizable + * New upstream snapshot release - -- Magnus Henoch <mange@freemail.hu> Sat, 16 Oct 2004 21:11:58 +0200 + -- Matteo F. Vescovi <mfv@debian.org> Thu, 15 Dec 2016 22:32:27 +0100 -emacs-jabber (0.5.1) unstable; urgency=low +emacs-jabber (0.8.92-1) experimental; urgency=medium - * Nicknames are accepted where JIDs are accepted. - * Roster line spacing customizable (default is none) - * Experimental file transfer support (see README) + * New upstream release (Closes: #665954) + - debian/compat: 7 -> 10 version bump + - debian/copyright: DEP-5 compliance and refresh + - debian/control: new structure based on dh-elpa + - debian/control: transition package added + - debian/rules: new skeleton based on dh-elpa + - debian/rules: overrides added for correct building + - debian/: new files following dh-elpa structure + - elpa + - gbp.conf + - watch + - debian/: old packaging files removed + - debian/dirs: remove obsolete emacs-jabber path + - debian/elpa: old installation path removed - -- Magnus Henoch <mange@freemail.hu> Sat, 8 May 2004 21:49:26 +0200 + -- Matteo F. Vescovi <mfv@debian.org> Tue, 06 Dec 2016 09:30:46 +0100 -emacs-jabber (0.5) unstable; urgency=low +emacs-jabber (0.8.0-3) unstable; urgency=low - * Initial debianization. + * Orphaned. - -- Magnus Henoch <mange@freemail.hu> Fri, 2 Apr 2004 23:04:36 +0200 + -- Milan Zamazal <pdm@debian.org> Tue, 27 Mar 2012 11:33:28 +0200 +emacs-jabber (0.8.0-2) unstable; urgency=low + * Switch to dpkg-source 3.0 (quilt) format. + * Make sure `dir' file is not included in the package. + * Standards 3.8.4. + + -- Milan Zamazal <pdm@debian.org> Mon, 15 Mar 2010 09:32:18 +0100 + +emacs-jabber (0.8.0-1) unstable; urgency=low + + * New upstream version. + * Depend on install-info. + * Build-Depend on gconf2. + * Standards 3.8.3. + + -- Milan Zamazal <pdm@debian.org> Mon, 14 Sep 2009 15:50:05 +0200 + +emacs-jabber (0.7.93-2) unstable; urgency=low + + * Simplify dependencies on Emacsen; closes: #540244. + * Standards 3.8.2 (no real change). + * Support emacs23. + + -- Milan Zamazal <pdm@debian.org> Mon, 10 Aug 2009 12:27:51 +0200 + +emacs-jabber (0.7.93-1) unstable; urgency=low + + * New upstream version. + + -- Milan Zamazal <pdm@debian.org> Tue, 24 Feb 2009 10:33:44 +0100 + +emacs-jabber (0.7.92-1) experimental; urgency=low + + * New upstream version. + * Don't depend on flim, depend on gnutls-bin | starttls; thanks to + Magnus Henoch; closes: #501166. + * Uploaded to experimental because lenny is frozen. + + -- Milan Zamazal <pdm@debian.org> Mon, 06 Oct 2008 12:23:42 +0200 + +emacs-jabber (0.7.91+20080729-2) experimental; urgency=low + + * Fix creation of log file in insecure directory. + * Uploaded to experimental because lenny is frozen. + + -- Milan Zamazal <pdm@debian.org> Tue, 26 Aug 2008 13:10:01 +0200 + +emacs-jabber (0.7.91+20080729-1) experimental; urgency=low + + * CVS snapshot. It fixes some problems with MUC functions in Emacs 22.2 + and TLS handling. + * Additional fix applied to make groupchat invitiations work. + * Standards 3.8.0 (no real change). + * Uploaded to experimental because lenny is frozen. + + -- Milan Zamazal <pdm@debian.org> Tue, 29 Jul 2008 16:02:36 +0200 + +emacs-jabber (0.7.91-1) unstable; urgency=low + + * New upstream (pretest) version. + + -- Milan Zamazal <pdm@debian.org> Sat, 31 May 2008 09:48:51 +0200 + +emacs-jabber (0.7.90-1) unstable; urgency=low + + * New upstream (pretest) version. + * debian/copyright updated. + * Standards 3.7.3 (no real change). + * Home page URL moved from description to control fields. + + -- Milan Zamazal <pdm@debian.org> Wed, 30 Apr 2008 16:59:07 +0200 + +emacs-jabber (0.7.1-5) unstable; urgency=low + + * Fix of TLS connection creation, thanks to Valery V. Vorotyntsev. + Closes: #476333. + + -- Milan Zamazal <pdm@debian.org> Wed, 23 Apr 2008 10:47:43 +0200 + +emacs-jabber (0.7.1-4) unstable; urgency=low + + * jabber-keepalive.el updated from upstream CVS. This avoids annoying + verbosity when keepalive is enabled. + + -- Milan Zamazal <pdm@debian.org> Mon, 18 Feb 2008 20:28:44 +0100 + +emacs-jabber (0.7.1-3) unstable; urgency=low + + * Prefer emacs22 in emacsen dependencies; closes: #434023. + + -- Milan Zamazal <pdm@debian.org> Sat, 21 Jul 2007 10:08:00 +0200 + +emacs-jabber (0.7.1-2) unstable; urgency=low + + * Updated for emacs22. + + -- Milan Zamazal <pdm@debian.org> Tue, 22 May 2007 20:39:45 +0200 + +emacs-jabber (0.7.1-1) experimental; urgency=low + + * New upstream version. + * Upload to experimental because etch is in freeze. + + -- Milan Zamazal <pdm@debian.org> Mon, 5 Feb 2007 10:12:18 +0100 + +emacs-jabber (0.7-3) unstable; urgency=low + + * Upstream CVS backport: fix of jabber-password rewriting. + + -- Milan Zamazal <pdm@debian.org> Wed, 5 Jul 2006 15:15:30 +0200 + +emacs-jabber (0.7-2) unstable; urgency=low + + * Don't depend on flim, recommend it. + * Upstream CVS backport: jabber-autoaway.el added. + + -- Milan Zamazal <pdm@debian.org> Wed, 28 Jun 2006 08:30:13 +0200 + +emacs-jabber (0.7-1) unstable; urgency=low + + * Initial release, based on unofficial packaging by Magnus Henoch; + closes: #372882. + + -- Milan Zamazal <pdm@debian.org> Mon, 12 Jun 2006 19:01:19 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control index 455f4bd..cd44654 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,29 @@ Source: emacs-jabber Section: net Priority: optional -Maintainer: Magnus Henoch <mange@freemail.hu> -Build-Depends: debhelper (>= 4.0.0), texinfo -Standards-Version: 3.6.1 +Maintainer: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org> +Uploaders: Matteo F. Vescovi <mfv@debian.org> +Build-Depends: debhelper (>= 11~), dh-elpa +Standards-Version: 4.1.4 +Homepage: http://emacs-jabber.sourceforge.net/ +Vcs-Browser: https://salsa.debian.org/emacsen-team/emacs-jabber +Vcs-Git: https://salsa.debian.org/emacsen-team/emacs-jabber.git +Testsuite: autopkgtest-pkg-elpa + +Package: elpa-jabber +Architecture: all +Depends: ${elpa:Depends}, ${misc:Depends}, emacs +Recommends: emacs (>= 46.0), xprintidle, gnutls-bin | starttls +Enhances: emacs, emacs24, emacs25 +Built-Using: ${misc:Built-Using} +Description: Jabber client for Emacsen + jabber.el (emacs-jabber) is a Jabber client for Emacs and XEmacs. + While this is still a development version, it offers all the basic + instant messaging functions and is highly customizable. Package: emacs-jabber Architecture: all -Depends: gnus (>= 5.10.6-1.NO.20050713-1) | flim | emacs-snapshot | emacs22 -Description: Jabber client for Emacs/XEmacs - jabber.el (emacs-jabber) is an XMPP (Jabber) client for Emacs and XEmacs. - . - XMPP is an open instant messaging system. For more information on - XMPP, see http://xmpp.org/. - . - Homepage: http://emacs-jabber.sourceforge.net/ +Depends: ${misc:Depends}, elpa-jabber +Description: Transition package, emacs-jabber to elpa-jabber + The emacs-jabber addon has been elpafied. This dummy package + helps ease transition from emacs-jabber to elpa-jabber. diff --git a/debian/copyright b/debian/copyright index f84a3fd..363f9ba 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,16 +1,40 @@ -jabber.el was debianized by Magnus Henoch <mange@freemail.hu>. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: emacs-jabber +Upstream-Author: Magnus Henoch +Source: http://sourceforge.net/projects/emacs-jabber/ -jabber.el can be found at http://emacs-jabber.sourceforge.net +Files: * +Copyright: 2002-2008 Tom Berger + 2003-2008 Magnus Henoch + 2004 Mathias Dahl + 2004-2005 Carl Henrik Lunde + 2005 Georg Lehner + 2005 Mario Domenech Goulart + 2006-2007 Kirill A. Kroinskiy + 2007 Valery V. Vorotyntsev + 2007 Detlev Zundel + 2007 Serguei Jidkov + 2008 Terechkov Evgenii +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. +Files: debian/* +Copyright: 2006-2012 Milan Zamazal <pdm@debian.org> + 2016 Matteo F. Vescovi <mfv@debian.org> +License: GPL-2+ -;; 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. - -On Debian GNU/Linux systems you can find a copy of the GPL in -/usr/share/common-licenses/GPL +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 program. If not, see <http://www.gnu.org/licenses/>. + . + 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 --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..3c67d7c --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +etc/emacs/site-start.d diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..6f83607 --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/debian/elpa b/debian/elpa new file mode 100644 index 0000000..2db9641 --- /dev/null +++ b/debian/elpa @@ -0,0 +1,2 @@ +*.el +jabber-fallback-lib/*.el diff --git a/debian/emacsen-install.in b/debian/emacsen-install.in deleted file mode 100644 index b203990..0000000 --- a/debian/emacsen-install.in +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/bash -e -# /usr/lib/emacsen-common/packages/install/emacs-jabber - -# Written by Jim Van Zandt <jrv@vanzandt.mv.com>, borrowing heavily -# from the install scripts for gettext by Santiago Vila -# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>. -# -# Patched by Roland Mas <lolando@debian.org> to add support for lists -# of flavor-dependently included/excluded files - -FLAVOR=$1 -STAMPFILE=jabber.elc -PACKAGE=emacs-jabber - -# INCLUDED_emacs20="" -# INCLUDED_emacs21="" -# INCLUDED_xemacs21="" - -# EXCLUDED_emacs20="" -# EXCLUDED_emacs21="" -# EXCLUDED_xemacs21="" diff --git a/debian/emacsen-install.template b/debian/emacsen-install.template deleted file mode 100644 index dca8669..0000000 --- a/debian/emacsen-install.template +++ /dev/null @@ -1,87 +0,0 @@ - -UNDERSCORED_FLAVOR=$(echo $FLAVOR | sed 's/-/_/g') -eval included_here=\$$(echo INCLUDED_$UNDERSCORED_FLAVOR) -eval excluded_here=\$$(echo EXCLUDED_$UNDERSCORED_FLAVOR) - -included_all=$(for i in ${!INCLUDED_*} ; do - eval echo \$$i - done | sort -u) - -excluded_all=$(for i in ${!EXCLUDED_*} ; do - eval echo \$$i - done | sort -u) - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz -fi - -LOG=`tempfile -pelc_ -s.log -m644` -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} -if test -e "${ELCDIR}/${STAMPFILE}"; then - echo "${PACKAGE} files already compiled in ${ELCDIR}." - exit -fi -echo install/${PACKAGE}: Handling ${FLAVOR}, logged in ${LOG} - -if [ -z "$FLAGS" ] ; then - FLAGS="-q -no-site-file --no-site-file -batch -l path.el -f batch-byte-compile" -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} - -# Now to compute the list of files to install... - -FILES=$(ls -1 *.el) -# Here we have all of them - -PATTERN="" -for i in $included_all $excluded_all ; do - [ ! -z "$PATTERN" ] && PATTERN="${PATTERN}\|" - PATTERN="${PATTERN}^$i\$" -done -FILES2=$FILES -if [ ! -z "$PATTERN" ] ; then - FILES=$(for i in $FILES2 ; do echo $i | grep -v $PATTERN || true ; done) -fi -# Here we only have those not explicitly included or excluded by any flavour - -FILES="$FILES $included_here" -# Here we also have those included for the current flavour - -for i in $excluded_all ; do - include_i="yes" - for j in $excluded_here ; do - [ $i = $j ] && include_i="no" - done - [ $include_i = "yes" ] && FILES="$FILES $i" -done -# And now we have those excluded by other flavours but not the current one - -FILES=$(for i in $FILES ; do echo $i ; done | sort -u) -# And now for my last trick... The list is now uniquified! - -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -if test "${APPEND_LOAD_PATH}" != "" -then - cat << EOF >> path.el -(setq load-path (append ${APPEND_LOAD_PATH} load-path)) -EOF -fi - -echo ${FLAVOR} ${FLAGS} ${FILES} >> ${LOG} -${FLAVOR} ${FLAGS} ${FILES} >> ${LOG} &> ${LOG} -rm -f *.el path.el - -exit 0 diff --git a/debian/emacsen-remove.in b/debian/emacsen-remove.in deleted file mode 100644 index 5486985..0000000 --- a/debian/emacsen-remove.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/emacs-jabber - -FLAVOR=$1 -PACKAGE=emacs-jabber diff --git a/debian/emacsen-remove.template b/debian/emacsen-remove.template deleted file mode 100644 index c6a062e..0000000 --- a/debian/emacsen-remove.template +++ /dev/null @@ -1,10 +0,0 @@ - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/debian/emacsen-startup b/debian/emacsen-startup deleted file mode 100644 index 0be558b..0000000 --- a/debian/emacsen-startup +++ /dev/null @@ -1,17 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file for jabber.el as packaged for Debian - -(if (not (file-exists-p "/usr/share/emacs/site-lisp/emacs-jabber")) - (message - "Package emacs-jabber removed but not purged. Skipping setup.") - (debian-pkg-add-load-path-item - (concat "/usr/share/" (symbol-name flavor) "/site-lisp/emacs-jabber")) - - ;; Make sure that the uncompiled files are also in the load-path, near the - ;; end. This is for moving point to the code when view help. - (setq load-path - (nconc load-path (list "/usr/share/emacs/site-lisp/emacs-jabber"))) - - (require 'jabber)) - diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..5cc34d4 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,12 @@ +[DEFAULT] +# upstream-branch = upstream +debian-branch = master +upstream-tag = %(version)s +debian-tag = debian/%(version)s + +sign-tags = True +pristine-tar = True +pristine-tar-commit = True + +compression = xz +compression-level = 9 diff --git a/debian/rules b/debian/rules index d31e5dc..ebc4ffe 100755 --- a/debian/rules +++ b/debian/rules @@ -1,44 +1,13 @@ #!/usr/bin/make -f -export DH_COMPAT=4 +PKG_VER = 0.8.92 -build: build-stamp -build-stamp: - dh_testdir - makeinfo jabber.texi - makeinfo --html -o html jabber.texi - touch build-stamp +%: + dh $@ --with elpa -clean: - dh_testdir - dh_testroot - rm -f build-stamp - rm -rf html - dh_clean +override_dh_autoreconf: -binary: binary-arch binary-indep - -binary-arch: - -binary-indep: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs usr/share/emacs/site-lisp/emacs-jabber - - install -m 644 *.el debian/emacs-jabber/usr/share/emacs/site-lisp/emacs-jabber - cat debian/emacsen-install.in debian/emacsen-install.template > debian/emacsen-install - cat debian/emacsen-remove.in debian/emacsen-remove.template > debian/emacsen-remove - dh_installemacsen - dh_installdocs html README AUTHORS NEWS - dh_installinfo jabber.info - dh_installchangelogs - - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: binary-indep binary-arch binary clean build +override_dh_auto_build: + sed "s|@""PACKAGE_VERSION@""|$(PKG_VER)|" < \ + $(CURDIR)/jabber-pkg.el.in > \ + $(CURDIR)/jabber-pkg.el diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..6374ced --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \ +http://qa.debian.org/watch/sf.php/emacs-jabber/emacs-jabber-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) |