clean-up last commits

This commit is contained in:
Mike Gabriel
2014-04-21 20:51:26 +02:00
parent 3ce55edff0
commit 16954de756
4 changed files with 4 additions and 14 deletions

4
debian/changelog vendored
View File

@ -1,7 +1,5 @@
mate-power-manager (1.8.0-1.1) UNRELEASED; urgency=low
mate-power-manager (1.8.0-1) UNRELEASED; urgency=low
* Initial release. (Closes: #734868)
* debian/watch:
+ Use tagged CGit tarball snapshots as upstream source.
-- Vangelis Mouhtsis <vangelis@gnugr.org> Mon, 21 Apr 2014 21:09:20 +0300

View File

@ -1 +0,0 @@

10
debian/rules vendored
View File

@ -1,9 +1,9 @@
#!/usr/bin/make -f
DEB_BUILD_PARALLEL = 1
DHFLAGS=--parallel
%:
dh $@ --with quilt
dh $@ $(DHFLAGS) --with quilt
override_dh_install:
dh_install --list-missing
@ -11,11 +11,7 @@ override_dh_install:
override_dh_auto_configure:
# ustream is without configure. autogen.sh will create it
NOCONFIGURE=1 ./autogen.sh
# We patched the configure.ac, rebuild configure
REQUIRED_AUTOMAKE_VERSION=1.9 USE_MATE2_MACROS=1 USE_COMMON_DOC_BUILD=yes \
PKG_NAME=mate-power-manager mate-autogen
dh_auto_configure -- \
dh_auto_configure $(DHFLAGS) -- \
--disable-silent-rules \
--libexecdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/mate-power-manager \
--disable-scrollkeeper \

3
debian/watch vendored
View File

@ -1,7 +1,4 @@
version=3
<<<<<<< HEAD
=======
opts=dversionmangle=s/\+dfsg1// \
>>>>>>> d01ec962a4ae8edfcf4bfc83ed869dce8a77a10d
http://git.mate-desktop.org/mate-power-manager/ \
snapshot/mate-power-manager-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz