[SCM] jack-tools/master: New upstream version, replacing autotools with make
raboof-guest at users.alioth.debian.org
raboof-guest at users.alioth.debian.org
Sun Jan 5 21:41:05 UTC 2014
The following commit has been merged in the master branch:
commit 1b966b85bf1ca94e0faa46eb14ddceb033218428
Author: Arnout Engelen <arnouten at bzzt.net>
Date: Sun Jan 5 22:36:39 2014 +0100
New upstream version, replacing autotools with make
diff --git a/debian/changelog b/debian/changelog
index 4825280..b2e5c33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jack-tools (20131226-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+ - bugfixes
+ - better documentation
+ - no more autoconf
+
+ -- Arnout Engelen <arnouten at bzzt.net> Sun, 05 Jan 2014 21:33:01 +0100
+
jack-tools (20101210-2) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index f43e4f4..cd8d4fd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,6 @@ Uploaders: Arnout Engelen <arnouten at bzzt.net>,
Jonas Smedegaard <dr at jones.dk>
Build-Depends: cdbs,
libtool,
- automake1.10,
- autoconf,
debhelper (>= 6),
bzip2,
flex,
diff --git a/debian/patches/fix_ftbfs_ld_as_needed.patch b/debian/patches/fix_ftbfs_ld_as_needed.patch
deleted file mode 100644
index 7de7a2b..0000000
--- a/debian/patches/fix_ftbfs_ld_as_needed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Declaring math lib and dynamic loaded lib to LIBS to fix FTBFS.
-Author: Leo Iannacone <l3on at ubuntu.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/913459
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655216
-Forwarded: no
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
---- jack-tools.orig/configure.ac
-+++ jack-tools/configure.ac
-@@ -50,6 +50,8 @@ AC_CHECK_HEADERS(sys/inotify.h, AC_DEFIN
-
- AC_SUBST(AM_CFLAGS)
- AM_CFLAGS="-D_POSIX_C_SOURCE=200112 -std=c99 -O3 -funroll-loops -Wall"
-+AC_SUBST(LIBS)
-+LIBS="-lm -ldl"
-
- # Write Makefile.
-
diff --git a/debian/patches/fix_ftbfs_with_printf.patch b/debian/patches/fix_ftbfs_with_printf.patch
deleted file mode 100644
index ee15501..0000000
--- a/debian/patches/fix_ftbfs_with_printf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix FTBFS with printf where no format is specified
-Author: IOhannes m zmölnig
-Forwarded: Yes (Mail)
----
- jack.dl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- jack-tools.orig/jack.dl.c
-+++ jack-tools/jack.dl.c
-@@ -17,7 +17,7 @@
-
- void fail(char *s)
- {
-- fprintf(stderr, s);
-+ fprintf(stderr, "%s", s);
- exit(EXIT_FAILURE);
- }
-
diff --git a/debian/patches/make-installation-directories.patch b/debian/patches/make-installation-directories.patch
new file mode 100644
index 0000000..e88e71b
--- /dev/null
+++ b/debian/patches/make-installation-directories.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 41feb23..6079d20 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@ bin=jack-dl jack-osc jack-play jack-plumbing jack-record jack-scope jack-transpo
+
+ CFLAGS=-Wall -D_POSIX_C_SOURCE=200112 -std=c99 -O3 -g
+ LDLIBS=c-common/lib-c-common.a -ljack -lpthread -lm
++INSTALL=install
+
+ all: $(bin)
+
+@@ -25,8 +26,9 @@ clean:
+ rm -f $(bin) *.o
+
+ install:
+- cp $(bin) $(prefix)/bin
+- cp jack-dl.h $(prefix)/include
++ $(INSTALL) -d $(prefix)/bin $(prefix)/include
++ $(INSTALL) $(bin) $(prefix)/bin
++ $(INSTALL) jack-dl.h $(prefix)/include
+
+ uninstall:
+ (cd $(prefix)/bin ; rm -f $(bin))
diff --git a/debian/patches/series b/debian/patches/series
index c8a3551..418f8c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_ftbfs_with_printf.patch
-fix_ftbfs_ld_as_needed.patch
+make-installation-directories.patch
diff --git a/debian/rules b/debian/rules
index 5722266..1862bec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,37 +17,25 @@
# 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.10
-DEB_AUTO_UPDATE_AUTOCONF = 2.60
-DEB_AUTO_UPDATE_AUTOMAKE = 1.10
-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) -std=c99 -D_POSIX_C_SOURCE=200112 "
+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::
@@ -55,12 +43,3 @@ build/jack-tools::
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