Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
collectd-pkg-debian
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
github-mirror
collectd-pkg-debian
Commits
e280f950
Commit
e280f950
authored
Aug 27, 2015
by
Sebastian Harl
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2 from mfournier/preparing-5.5.0-3
Preparing for 5.5.0-3
parents
44de5b8d
5aba2b46
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
5 deletions
+26
-5
debian/changelog
debian/changelog
+13
-0
debian/collectd-core.overrides
debian/collectd-core.overrides
+1
-0
debian/control
debian/control
+2
-2
debian/rules
debian/rules
+10
-3
No files found.
debian/changelog
View file @
e280f950
collectd (5.5.0-3) UNRELEASED; urgency=medium
* debian/rules, debian/control:
- Avoid hiding compiler options, allowing the buildd log scanner to do
it's job.
- Disable smart plugin on non-linux platforms, due to missing
libatasmart-dev build-dependency.
- Strip out non-deterministic bits out of generated jar files.
* debian/collectd-core.overrides:
- Update 'capitalization-error-in-description' lintian override.
-- Marc Fournier <marc.fournier@camptocamp.com> Tue, 25 Aug 2015 06:55:52 +0200
collectd (5.5.0-2) unstable; urgency=low
* debian/rules:
...
...
debian/collectd-core.overrides
View file @
e280f950
...
...
@@ -4,6 +4,7 @@ collectd-core [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel]: shlib-with-non-p
# All plugin names are spelled in lower-case.
collectd-core: capitalization-error-in-description apache Apache
collectd-core: capitalization-error-in-description mysql MySQL
collectd-core: capitalization-error-in-description openldap OpenLDAP
collectd-core: capitalization-error-in-description postgresql PostgreSQL
collectd-core: capitalization-error-in-description python Python
...
...
debian/control
View file @
e280f950
...
...
@@ -3,12 +3,12 @@ Section: utils
Priority: optional
Maintainer: Sebastian Harl <tokkee@debian.org>
Uploaders: Marc Fournier <marc.fournier@camptocamp.com>
Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5),
Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5),
dh-strip-nondeterminism,
bison, flex, autotools-dev, libltdl-dev, pkg-config,
iptables-dev (>= 1.4.3.2-2) [linux-any],
javahelper,
kfreebsd-kernel-headers [kfreebsd-any],
libatasmart-dev,
libatasmart-dev
[linux-any]
,
libcap-dev [linux-any],
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
...
...
debian/rules
View file @
e280f950
...
...
@@ -59,6 +59,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
--without-libstatgrab \
--without-included-ltdl \
--disable-static \
--disable-silent-rules \
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
...
...
@@ -150,6 +151,11 @@ ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH)))
--disable-turbostat
endif
# libatasmart isn't available on these platforms.
ifneq (,$(filter hurd-i386 kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += --disable-smart
endif
# The hppa buildds currently do not keep up with Java related stuff, thus
# prevending testing transitions. sparc is also having trouble building the
# java plugin.
...
...
@@ -202,7 +208,7 @@ clean:
install-indep:
dh_testdir
dh_testroot
dh_
clean -k
dh_
prep
dh_installdirs -i
dh_install -i
...
...
@@ -220,7 +226,7 @@ install-indep:
install-arch: build
dh_testdir
dh_testroot
dh_
clean -k
dh_
prep
dh_installdirs -a
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
...
...
@@ -277,9 +283,10 @@ binary-arch: build install-arch
dh_installdebconf -a
dh_systemd_enable -pcollectd-core --name=collectd collectd.service
dh_installinit -pcollectd-core --name=collectd -- defaults 95
dh_systemd_start
dh_systemd_start
-pcollectd-core
dh_link -a
dh_strip -a --dbg-package=collectd-dbg
dh_strip_nondeterminism -pcollectd-core
dh_compress -a -Xexamples/
dh_fixperms -a
dh_makeshlibs -a
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment