[SCM] jack-tools/master: Merge branch 'temporary'
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Wed Oct 15 12:54:41 UTC 2014
Imported Debian patch 20101210-2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: adf8998b7c3d13c2d3d580f50e703e1bc19fbe69
X-Git-Newrev: ada05ef90dea06a30ef9d28b2290cbc951a1e2b8
The following commit has been merged in the master branch:
commit ada05ef90dea06a30ef9d28b2290cbc951a1e2b8
Merge: adf8998b7c3d13c2d3d580f50e703e1bc19fbe69 d76a650915919720f0817b5c4c1dece2c053c0ec
Author: Alessio Treglia <alessio at debian.org>
Date: Wed Oct 15 13:54:22 2014 +0100
Merge branch 'temporary'
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index 960843c,bb00174..1533279
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,11 +1,29 @@@
+jack-tools (20131226-2) unstable; urgency=medium
+
+ * Hardening flags
+ * Canonical VCS path
+ * Remove common object on 'clean'
+
+ -- Arnout Engelen <arnouten at bzzt.net> Thu, 09 Jan 2014 22:34:35 +0100
+
+jack-tools (20131226-1) unstable; urgency=medium
+
+ * New upstream version
+ - renamed tools from 'jack.*' to 'jack-*'
+ - bugfixes
+ - better documentation
+ - no more autoconf
+
+ -- Arnout Engelen <arnouten at bzzt.net> Sun, 05 Jan 2014 21:33:01 +0100
+
+ jack-tools (20101210-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control, debian/rules: Switch to automake1.11. (Closes:
+ #724395)
+
+ -- Eric Dorland <eric at debian.org> Sun, 16 Feb 2014 15:27:09 -0500
+
jack-tools (20101210-2) unstable; urgency=low
* Team upload.
diff --combined debian/control
index 59046de,9688c51..ffbabea
--- a/debian/control
+++ b/debian/control
@@@ -6,6 -6,8 +6,8 @@@ Uploaders: Arnout Engelen <arnouten at bzz
Jonas Smedegaard <dr at jones.dk>
Build-Depends: cdbs,
libtool,
+ automake1.11,
+ autoconf,
debhelper (>= 6),
bzip2,
flex,
@@@ -21,49 -23,49 +23,49 @@@
libxml2-utils,
docbook-xml,
docbook-xsl
-Standards-Version: 3.9.2
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jack-tools.git
-Vcs-Git: git://git.debian.org/pkg-multimedia/jack-tools.git
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/jack-tools.git
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/jack-tools.git
Homepage: http://slavepianos.org/rd/?t=rju
Package: jack-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, jackd
Description: various JACK tools: dl, record, scope, osc, plumbing, udp, play, transport
- jack.* is a collection of small tools for the JACK Audio Connection
+ jack-tools is a collection of small tools for the JACK Audio Connection
Kit.
.
JACK allows the connection of multiple applications to an audio device,
as well as allowing them to share audio between themselves.
.
- jack.dl loads dsp algorithms from shared libraries. Commands are sent
+ jack-dl loads dsp algorithms from shared libraries. Commands are sent
as OSC packets over a UDP connection.
.
- jack.record is a light-weight JACK capture client to write an arbitrary
+ jack-record is a light-weight JACK capture client to write an arbitrary
number of channels to disk.
.
- jack.scope draws either a time domain signal trace or a self
+ jack-scope draws either a time domain signal trace or a self
correlation trace. Multiple input channels are superimposed, each
- channel is drawn in a different color. jack.scope accepts OSC packets
+ channel is drawn in a different color. jack-scope accepts OSC packets
for interactive control of drawing parameters.
.
- jack.osc publishes the transport state of the local JACK server as OSC
- packets over a UDP connection. jack.osc allows any OSC enabled
+ jack-osc publishes the transport state of the local JACK server as OSC
+ packets over a UDP connection. jack-osc allows any OSC enabled
application to act as a JACK transport client, receiving sample
accurate pulse stream timing data, and monitoring and initiating
transport state change.
.
- jack.plumbing maintains a set of port connection rules and manages
+ jack-plumbing maintains a set of port connection rules and manages
these as clients register ports with JACK. Port names are implicitly
bounded regular expressions and support sub-expression patterns.
.
- jack.udp is a UDP audio transport mechanism for JACK. jack.udp is
+ jack-udp is a UDP audio transport mechanism for JACK. jack-udp is
obsolete: use net driver instead.
.
- jack.play is a light-weight JACK sound file player. It creates as many
+ jack-play is a light-weight JACK sound file player. It creates as many
output ports as there are channels in the input file.
.
- jack.transport is a JACK session manager. It reads configuration
+ jack-transport is a JACK session manager. It reads configuration
information from a system wide and a user specific configuration file
and manages sessions involving the JACK daemon proper and optionally a
set of secondary jack daemons.
diff --combined debian/rules
index b4d3e9c,88bb48b..4e9b513
--- a/debian/rules
+++ b/debian/rules
@@@ -17,25 -17,37 +17,30 @@@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+ DEB_AUTO_UPDATE_LIBTOOL = pre
+ DEB_AUTO_UPDATE_ACLOCAL = 1.11
+ DEB_AUTO_UPDATE_AUTOCONF = 2.60
+ DEB_AUTO_UPDATE_AUTOMAKE = 1.11
+ include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+DEB_MAKE_BUILD_TARGET = mk-local-c-common all
+DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/jack-tools/usr
+DEB_MAKE_ENVVARS = CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112 " LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+DEB_MAKE_INVOKE = make -C $(DEB_BUILDDIR) $(DEB_MAKE_ENVVARS)
# Suppress optional build-dependencies
CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
# bootstrap autotools files (CDBS by default only update, not create)
DEB_MAKE_CLEAN_TARGET = distclean
-DEB_AUTOMAKE_ARGS = --add-missing --copy --foreign
-pre-build::
- touch aclocal.m4
-clean::
- rm -f Makefile.in common/Makefile.in
- rm -f configure
- rm -f aclocal.m4
- rm -rf config
# avoid shipping header file for now
install/jack-tools::
rm -rf $(cdbs_curdestdir)/usr/include
-# dh_installman installs jack.dl.1 in wrong path
-binary-post-install/jack-tools::
- mv $(cdbs_curdestdir)/usr/share/man/dl/man1/jack.1 $(cdbs_curdestdir)/usr/share/man/man1/jack.dl.1
- rmdir $(cdbs_curdestdir)/usr/share/man/dl/man1 $(cdbs_curdestdir)/usr/share/man/dl
-
# looks like manpages aren't covered by upstream build rules
# so we handle it ourselves
build/jack-tools::
@@@ -43,3 -55,12 +48,3 @@@
clean::
rm -f *.1
-TARBALL = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-get-orig-source:
- rm -rf get-orig-source '$(TARBALL)'
- mkdir get-orig-source
- darcs get 'http://www.slavepianos.org/rd/sw/jack.*' 'get-orig-source/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig'
- rm -rf 'get-orig-source/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig/_darcs'
- GZIP='--best --no-name' tar czf '$(TARBALL)' -C get-orig-source '$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig'
- rm -rf get-orig-source
- echo ' "$(TARBALL)" created; now git-import-orig and remove it again.'
--
jack-tools packaging
More information about the pkg-multimedia-commits
mailing list