Changeset ebed81c for debian

Timestamp:

2017-01-08T22:57:19Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

79b83da

Parents:

e2a5be7 (diff), 8dbecd23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge debian stuff to prepare for 3.5

Location:

debian

Files:

• NEWS (added)
• README.Debian (modified) (1 diff)
• bitlbee-common.config (deleted)
• bitlbee-common.init (modified) (3 diffs)
• bitlbee-common.postinst (modified) (2 diffs)
• bitlbee-common.postrm (modified) (1 diff)
• bitlbee-common.preinst (added)
• bitlbee-common.templates (deleted)
• changelog (modified) (1 diff)
• control (modified) (6 diffs)
• copyright (modified) (1 diff)
• po/POTFILES.in (deleted)
• po/cs.po (deleted)
• po/da.po (deleted)
• po/de.po (deleted)
• po/es.po (deleted)
• po/fr.po (deleted)
• po/it.po (deleted)
• po/ja.po (deleted)
• po/nl.po (deleted)
• po/pt.po (deleted)
• po/pt_BR.po (deleted)
• po/ru.po (deleted)
• po/sv.po (deleted)
• po/templates.pot (deleted)
• po/vi.po (deleted)

debian/README.Debian

@@ -1 @@
-                   *** NEWS (Version 1.2 and later) ***
-
-Starting from version 1.2, BitlBee has a forking daemon mode. The Debian
-package now uses this mode by default, instead of inetd mode. If you don't
-want to use this, you can disable the init scripts (best way to do this is
-by editing /etc/default/bitlbee) and restore the inetd.conf entry. This
-should be necessary only once, it won't be touched during upgrades.
-
-Another important change in BitlBee 1.2 is the file format used for your
-personal settings. Everything's now saved in a single .xml (per account,
-of course) file instead of $nick.accounts and $nick.nicks. One advantage
-of this new format is that the passwords are actually encrypted instead of
-just vaguely obfuscated. BitlBee can still read the old files, and will
-save things in the new format when you save/disconnect. After that, you
-can safely remove the old-style files (this is recommended).
-
-I tried making this transition (the new file format but especially, in this
-case, the inetd->forkdaemon mode change) as smooth as possible, but I'm
-aware that many BitlBee users will have their own hacks already to run the
-program. I hope the package won't break any of this for anyone. 1.2-2
-should fix at least some of the issues.
-
----------------------------------------------------------------------------
-
-Debconf should have asked you on what port you want BitlBee to run. If it
-did not, the port number should be 6667 or 6668. (6668 if you already got
-something running at 6667)
-
-Fire up your favourite IRC client and connect to localhost:6667 (or 6668),
+Fire up your favourite IRC client and connect to localhost:6667,
 and read the documentation (type help for a list of commands).
 

debian/bitlbee-common.init

@@ -23 +23 @@
 [ -x $DAEMON ] || exit 0
 
-# Default value
-BITLBEE_PORT=6667
 BITLBEE_OPTS=-F
-
-# Read config file if it is present.
-if [ -r /etc/default/$NAME ]; then
-        . /etc/default/$NAME
-fi
 
 
@@ -42 +35 @@
         
         start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
+                --exec $DAEMON -- -P $PIDFILE $BITLBEE_OPTS
 }
 
@@ -56 +49 @@
 case "$1" in
   start)
-        [ "$BITLBEE_DISABLED" = "1" ] && exit 0
-
         echo -n "Starting $DESC: $NAME"
         d_start

debian/bitlbee-common.postinst

@@ -3 +3 @@
 set -e
 
-. /usr/share/debconf/confmodule
-
-db_get bitlbee/serveport
-PORT="$RET"
-
 CONFDIR=/var/lib/bitlbee/
 
-## Load default option. Don't want to put this in debconf (yet?)
-BITLBEE_OPTS=-F
-BITLBEE_DISABLED=0
-BITLBEE_UPGRADE_DONT_RESTART=0
-[ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
-
-if [ "$BITLBEE_DISABLED" = "0" ] && which update-inetd > /dev/null 2> /dev/null &&
-   ( expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null ); then
-        ## Make sure the inetd entry is gone (can still be there from a
-        ## previous version.
-        update-inetd --remove '.*/usr/sbin/bitlbee'
-        if grep -q /usr/sbin/bitlbee /etc/inetd.conf 2> /dev/null; then
-                # Thanks for breaking update-inetd! (bugs.debian.org/311111)
-                # I hope that it works at least with xinetd, because this
-                # emergency hack doesn't:
-                perl -pi -e 's:^[^#].*/usr/sbin/bitlbee$:## Now using daemon mode\: # $&:' /etc/inetd.conf
-                killall -HUP inetd || true
-        fi
-fi
-
-cat<<EOF>/etc/default/bitlbee
+if [ -e /etc/default/bitlbee ]; then
+   cat <<EOF >/etc/default/bitlbee
 ## /etc/default/bitlbee: Auto-generated/updated script.
 ##
-## If running in (fork)daemon mode, listen on this TCP port.
-BITLBEE_PORT="$PORT"
-
-## Use single-process or forking daemon mode? Can't be changed from debconf,
-## but maintainer scripts will save your changes here.
-BITLBEE_OPTS="$BITLBEE_OPTS"
-
-## In case you want to stick with inetd mode (or if you just want to disable
-## the init scripts for some other reason), you can disable the init script
-## here. (Just set it to 1)
-BITLBEE_DISABLED=$BITLBEE_DISABLED
-
-## As a server operator, you can use the RESTART command to restart only the
-## master process while keeping all the child processes and their IPC
-## connections. By enabling this, the maintainer scripts won't restart
-## BitlBee during upgrades so you can restart the master process by hand.
-BITLBEE_UPGRADE_DONT_RESTART=$BITLBEE_UPGRADE_DONT_RESTART
+## This file is deprecated and no longer used.
+## Please edit /etc/bitlbee/bitlbee.conf instead
 EOF
 
-## Bye-bye DebConf, we don't need you anymore.
-db_stop
+fi
 
 ## Restore the helpfile in case we weren't upgrading but just reconfiguring:
@@ -64 +24 @@
 fi
 
-if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
+if [ -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
         invoke-rc.d bitlbee restart
 fi

debian/bitlbee-common.postrm

@@ -5 +5 @@
 if [ "$1" = "purge" ]; then
         rm -f /etc/default/bitlbee
-        deluser --system bitlbee || true
+        deluser --system bitlbee > /dev/null || true
         rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
 fi

debian/changelog

@@ +1 @@
+bitlbee (3.5-1) UNRELEASED; urgency=medium
+
+  [ Jochen Sprickerhof ]
+  * Drop dependency on net-tools
+
+  [ dequis ]
+  * Use dh_systemd
+  * Drop support for /etc/default/bitlbee
+  * Drop debconf and its translations (only used to ask for the port)
+  * Add preinst script for a smoother transition to systemd units
+  * Ignore the stdout of deluser, fixes postrm error exit code
+  * Remove some mentions of yahoo in control and copyright
+  * Remove outdated stuff from README.debian
+
+ -- dequis <dx@dxzone.com.ar>  Mon, 02 Jan 2017 14:25:05 -0300
+
 bitlbee (3.4.2-1) unstable; urgency=medium
 

debian/control

@@ -18 +18 @@
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
 
 Package: bitlbee-libpurple
@@ -28 +28 @@
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
  .
  This package contains a version of BitlBee that uses the libpurple instant
@@ -44 +44 @@
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
  .
  This package contains common files (mostly documentation) for bitlbee and
@@ -55 +55 @@
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
  .
  This package holds development stuff for compiling plug-ins.
@@ -65 +65 @@
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
  .
  This package contains a plugin that adds support for Off-The-Record
@@ -77 +77 @@
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
- and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ and Facebook Chat), ICQ, AIM, MSN and Twitter/Identica/Status.net.
  .
  This package contains a plugin that adds support for the Skype IM network.

debian/copyright

@@ -11 +11 @@
 
 Bits of third party code, also (L)GPLed:
-* protocols/yahoo/ is libyahoo2 <http://libyahoo2.sf.net/>.
 * Some parts (though there is very little left at this point) are borrowed
   from Gaim (version 0.58), now known as Pidgin <http://www.pidgin.im/>.