Changeset 17cc2fe


Ignore:
Timestamp:
2018-05-27T03:04:01Z (7 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
49ab3cb
Parents:
5c163e5 (diff), f8d2cff (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 branch 'develop'

Location:
debian
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • debian/bitlbee-common.postinst

    r5c163e5 r17cc2fe  
    3535fi
    3636
    37 chmod 700 /var/lib/bitlbee/
     37if [ -d /var/lib/bitlbee ]; then
     38    chmod 700 /var/lib/bitlbee/
     39fi
    3840
    3941## Can't do this in packaging phase: Don't know the UID yet. Access to

  • debian/changelog

    r5c163e5 r17cc2fe  
    11bitlbee (3.5.1-1.1) UNRELEASED; urgency=medium
    22
     3  [ dequis ]
    34  * Remove bitlbee-plugin-skype and skyped (obsolete)
    45  * Enable only bitlbee.service, not bitlbee.socket too
     6
     7  [ Sean Whitton ]
     8  * Add existence check to chmod call in bitlbee-common.postinst
     9    (Closes: #816200).
     10
     11  [ dequis ]
     12  * Fix lintian pkg-config-unavailable-for-cross-compilation
    513
    614 -- dequis <dx@dxzone.com.ar>  Mon, 19 Mar 2018 22:18:43 -0300

  • debian/control

    r5c163e5 r17cc2fe  
    1212Package: bitlbee
    1313Architecture: any
    14 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
     14Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
    1515Conflicts: bitlbee-libpurple
    1616Replaces: bitlbee-libpurple
    … …  
    2222Package: bitlbee-libpurple
    2323Architecture: any
    24 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
     24Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${binary:Version})
    2525Conflicts: bitlbee
    2626Replaces: bitlbee
    … …  
    3838
    3939Package: bitlbee-common
    40 Architecture: all
     40Architecture: any
    4141Depends: ${misc:Depends}, adduser
    4242Replaces: bitlbee
    … …  
    5050
    5151Package: bitlbee-dev
    52 Architecture: all
    53 Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
     52Architecture: any
     53Depends: ${misc:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
    5454Description: IRC to other chat networks gateway (dev files)
    5555 This program can be used as an IRC server which forwards everything you
    … …  
    6161Package: bitlbee-plugin-otr
    6262Architecture: any
    63 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
     63Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${binary:Version})
    6464Description: IRC to other chat networks gateway (OTR plugin)
    6565 This program can be used as an IRC server which forwards everything you

  • debian/rules

    r5c163e5 r17cc2fe  
    3535HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
    3636
    37 # No difference at the build stage so just call main build target.
    38 # (Well indep could be docs-only but we prebuild them plus it's really
    39 # not that much work.)
    40 build-arch build-indep: build
     37build-arch: build
    4138
    4239build: build-stamp
    … …  
    4542
    4643        mkdir -p debian/build-native
    47         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)
     44        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)
    4845        $(MAKE) -C debian/build-native
    4946
    5047ifeq ($(BITLBEE_LIBPURPLE),1)
    5148        mkdir -p debian/build-libpurple
    52         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)
     49        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)
    5350        $(MAKE) -C debian/build-libpurple
    5451endif
    … …  
    9895        dh_installchangelogs doc/CHANGES
    9996        dh_installexamples
    100         dh_installdocs #--link-doc=bitlbee-common
    101         # TODO: Restore --link-doc up here and remove the hack below once
    102         # Hardy and Lenny are deprecated.
    103         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
     97        dh_installdocs --link-doc=bitlbee-common
    10498        dh_installdebconf
    10599ifeq ($(HAS_DH_SYSTEMD),1)
    … …  
    123117        dh_builddeb
    124118
    125 binary-indep: build install
    126         DH_OPTIONS=-i $(MAKE) -f debian/rules binary-common
    127 
    128119binary-arch: build install
    129120        DH_OPTIONS=-a $(MAKE) -f debian/rules binary-common
    … …  
    132123        DH_OPTIONS=-p$* $(MAKE) -f debian/rules binary-common
    133124
    134 binary: binary-indep binary-arch
    135 .PHONY: build clean binary-indep binary-arch binary-common binary install
     125binary: binary-arch
     126.PHONY: build clean binary-arch binary-common binary install
Note: See TracChangeset for help on using the changeset viewer.