From adec2dec0e3b906d605148dcc10c2ff4801af404 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 16 Nov 2012 07:54:59 +0100 Subject: [PATCH] core: sync debian files with debian git repository --- debian/changelog | 7 +++++++ debian/rules | 27 +++++++-------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6663efd53..3a45b9d44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +weechat (0.3.9.1-1) unstable; urgency=low + + * New upstream release + - fix crash when decoding IRC colors in strings + + -- Emmanuel Bouthenot Fri, 09 Nov 2012 23:11:09 +0000 + weechat (0.3.9-1) unstable; urgency=low * New upstream release diff --git a/debian/rules b/debian/rules index b94cae8b9..4e29100be 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,11 @@ LDFLAGS = -Wl,-Bsymbolic-functions DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk -builddir/Makefile: - mkdir -p builddir - cd builddir && \ +BUILDDIR = builddir + +$(BUILDDIR)/Makefile: + mkdir -p $(BUILDDIR) + cd $(BUILDDIR) && \ cmake .. \ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ @@ -19,14 +21,7 @@ builddir/Makefile: -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -#build: build-stamp -#build-stamp: builddir/Makefile -# dh_testdir -# $(MAKE) -C builddir VERBOSE=1 -# touch $@ - -override_dh_auto_build: builddir/Makefile - $(MAKE) -C builddir +override_dh_auto_build: $(BUILDDIR)/Makefile dh_auto_build override_dh_auto_configure: @@ -34,16 +29,8 @@ override_dh_auto_configure: # debhelper try to use it but that's not needed echo -override_dh_install: - $(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install - dh_install - override_dh_strip: dh_strip --dbg-package=weechat-dbg -clean: - rm -rf builddir - dh $@ - %: - dh $@ + dh $@ --parallel --builddirectory=$(BUILDDIR)