Changeset 6da18ac for debian

Timestamp:

2010-11-12T22:48:28Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

70d7795

Parents:

389ce9f (diff), 5258d364 (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:

Merging a bunch of Debian packaging fixes from AnAnt, the package should be
Lintian clean now (or at least *much* cleaner than before). Thanks!

Location:

debian

Files:

• bitlbee-common.config (modified) (1 diff)
• bitlbee-common.init (modified) (1 diff)
• bitlbee-common.postinst (modified) (3 diffs)
• bitlbee-common.postrm (modified) (1 diff)
• bitlbee-common.prerm (modified) (1 diff)
• bitlbee-libpurple.lintian-overrides (added)
• bitlbee.lintian-overrides (added)
• bitlbee.prerm (modified) (1 diff)
• changelog (modified) (1 diff)
• control (modified) (5 diffs)
• copyright (modified) (1 diff)
• rules (modified) (1 diff)
• source/format (added)

debian/bitlbee-common.config

@@ -1 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 . /usr/share/debconf/confmodule

debian/bitlbee-common.init

@@ -5 +5 @@
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
-# Default-Stop:      1
+# Default-Stop:      0 1 6
+# Short-Description:       Start and stop BitlBee IRC to other chat networks gateway
 ### END INIT INFO
 #
-# Init script for BitlBee Debian package. Based on skeleton init script:
 #
 # Version:      @(#)skeleton  2.85-23  28-Jul-2004  miquels@cistron.nl

debian/bitlbee-common.postinst

@@ -1 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 . /usr/share/debconf/confmodule
@@ -16 +18 @@
 [ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
 
-if [ "$BITLBEE_DISABLED" = "0" ] && type update-inetd > /dev/null 2> /dev/null &&
+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
@@ -71 +73 @@
 if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
         unset IS_UPGRADE
-        if type netstat > /dev/null 2> /dev/null; then
+        if which netstat > /dev/null 2> /dev/null; then
                 netstat -an | grep -q :$PORT\\b.*LISTEN && IS_UPGRADE=1
         else

debian/bitlbee-common.postrm

@@ -1 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 [ "$1" = "purge" ] || exit 0

debian/bitlbee-common.prerm

@@ -1 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" = "upgrade" ]; then

debian/bitlbee.prerm

@@ -1 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ "$1" != "upgrade" ]; then

debian/changelog

@@ +1 @@
+bitlbee (3.0-2) UNRELEASED; urgency=low
+
+  * debian/bitlbee-common.postinst: Replace 'type' with 'which' to avoid
+    bashism.
+  * debian/{*.prerm, *.postinst, *.postrm, *.config}: use set -e in the body
+    of maintainer scripts.
+  * debian/control:
+    + Corrected short description of bitlbee-plugin-otr
+    + Bumped Standards-Version to 3.9.1
+    + Added ${misc:Depends} for bitlbee & bitlbee-libpurple
+    + Moved dependency on adduser to bitlbee-common
+    + Bumped debhelper version to 6.0.7~ for dh_lintian
+  * debian/copyright: Refer to /usr/share/common-licenses/GPL-2
+  * Added lintian overrides for bitlbee & bitlbee-libpurple
+  * Explicitly set source format to 1.0
+  * debian/bitlbee-common.init:
+    + Add Short-Description header.
+    + Also stop at runlevels 0 and 6.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Mon, 25 Oct 2010 16:56:24 +0200
+
 bitlbee (3.0-1) unstable; urgency=low
 

debian/control

@@ -4 +4 @@
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
-Standards-Version: 3.8.4
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6)
+Standards-Version: 3.9.1
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/
@@ -12 +12 @@
 Package: bitlbee
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
 Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
@@ -22 +22 @@
 Package: bitlbee-libpurple
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
 Conflicts: bitlbee
 Replaces: bitlbee
@@ -40 +40 @@
 Package: bitlbee-common
 Architecture: all
-Depends: ${misc:Depends}, net-tools
+Depends: ${misc:Depends}, net-tools, adduser
 Replaces: bitlbee
 Description: An IRC to other chat networks gateway (common files/docs)
@@ -63 +63 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version}), bitlbee-common (= ${bee:Version})
-Description: An IRC to other chat networks gateway (default version)
+Description: An IRC to other chat networks gateway (OTR plugin)
  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

debian/copyright

@@ -25 +25 @@
 
   You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
+  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
   if not, write to the Free Software Foundation, Inc., 51 Franklin St, 
   Fifth Floor, Boston, MA 02110-1301, USA.

debian/rules

@@ -87 +87 @@
         dh_installinit --init-script=bitlbee
         dh_installman
+        dh_lintian
         dh_strip
         dh_link