Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
dequis committed May 27, 2018
2 parents 5c163e5 + f8d2cff commit 17cc2fe53806232b2cb61042f238b34c87da0724
Showing with 23 additions and 22 deletions.
  1. +3 −1 debian/bitlbee-common.postinst
  2. +8 −0 debian/changelog
  3. +6 −6 debian/control
  4. +6 −15 debian/rules
@@ -34,7 +34,9 @@ else
adduser --system --group --disabled-login --disabled-password --home /var/lib/bitlbee/ bitlbee
fi
chmod 700 /var/lib/bitlbee/
if [ -d /var/lib/bitlbee ]; then
chmod 700 /var/lib/bitlbee/
fi
## Can't do this in packaging phase: Don't know the UID yet. Access to
## the file should be limited, now that it stores passwords. Added
View
@@ -1,8 +1,16 @@
bitlbee (3.5.1-1.1) UNRELEASED; urgency=medium
[ dequis ]
* Remove bitlbee-plugin-skype and skyped (obsolete)
* Enable only bitlbee.service, not bitlbee.socket too
[ Sean Whitton ]
* Add existence check to chmod call in bitlbee-common.postinst
(Closes: #816200).
[ dequis ]
* Fix lintian pkg-config-unavailable-for-cross-compilation
-- dequis <dx@dxzone.com.ar> Mon, 19 Mar 2018 22:18:43 -0300
bitlbee (3.5.1-1) unstable; urgency=medium
View
@@ -11,7 +11,7 @@ Vcs-Browser: https://github.com/bitlbee/bitlbee
Package: bitlbee
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
Conflicts: bitlbee-libpurple
Replaces: bitlbee-libpurple
Description: IRC to other chat networks gateway (default version)
@@ -21,7 +21,7 @@ Description: IRC to other chat networks gateway (default version)
Package: bitlbee-libpurple
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
Conflicts: bitlbee
Replaces: bitlbee
Description: IRC to other chat networks gateway (using libpurple)
@@ -37,7 +37,7 @@ Description: IRC to other chat networks gateway (using libpurple)
If you don't need the extra features, it's better to use the built-in code.
Package: bitlbee-common
Architecture: all
Architecture: any
Depends: ${misc:Depends}, adduser
Replaces: bitlbee
Description: IRC to other chat networks gateway (common files/docs)
@@ -49,8 +49,8 @@ Description: IRC to other chat networks gateway (common files/docs)
bitlbee-libpurple.
Package: bitlbee-dev
Architecture: all
Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
Architecture: any
Depends: ${misc:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
Description: IRC to other chat networks gateway (dev files)
This program can be used as an IRC server which forwards everything you
say to people on other chat networks: Jabber (which includes Google
@@ -60,7 +60,7 @@ Description: IRC to other chat networks gateway (dev files)
Package: bitlbee-plugin-otr
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
Description: 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
View
@@ -34,22 +34,19 @@ CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAG
HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
# No difference at the build stage so just call main build target.
# (Well indep could be docs-only but we prebuild them plus it's really
# not that much work.)
build-arch build-indep: build
build-arch: build
build: build-stamp
build-stamp:
dh_testdir
mkdir -p debian/build-native
ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --systemdsystemunitdir=/lib/systemd/system $(BITLBEE_CONFIGURE_FLAGS)
ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig $(BITLBEE_CONFIGURE_FLAGS)
$(MAKE) -C debian/build-native
ifeq ($(BITLBEE_LIBPURPLE),1)
mkdir -p debian/build-libpurple
ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --systemdsystemunitdir=/lib/systemd/system --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $(CONFIGURE_OVERRIDES) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --systemdsystemunitdir=/lib/systemd/system --pcdir=/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig --purple=1 $(BITLBEE_CONFIGURE_FLAGS)
$(MAKE) -C debian/build-libpurple
endif
@@ -97,10 +94,7 @@ binary-common:
dh_installchangelogs doc/CHANGES
dh_installexamples
dh_installdocs #--link-doc=bitlbee-common
# TODO: Restore --link-doc up here and remove the hack below once
# Hardy and Lenny are deprecated.
for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
dh_installdocs --link-doc=bitlbee-common
dh_installdebconf
ifeq ($(HAS_DH_SYSTEMD),1)
dh_systemd_enable -p bitlbee-common --no-enable bitlbee.socket
@@ -122,14 +116,11 @@ endif
dh_md5sums
dh_builddeb
binary-indep: build install
DH_OPTIONS=-i $(MAKE) -f debian/rules binary-common
binary-arch: build install
DH_OPTIONS=-a $(MAKE) -f debian/rules binary-common
binary-%: build install
DH_OPTIONS=-p$* $(MAKE) -f debian/rules binary-common
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary-common binary install
binary: binary-arch
.PHONY: build clean binary-arch binary-common binary install

0 comments on commit 17cc2fe

Please sign in to comment.