[SCM] libbluray/master: Don't use dh-autoreconf.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sat Oct 1 21:22:52 UTC 2011
The following commit has been merged in the master branch:
commit 77c15955b4b6cdb4e9a6ae341e5f7df0b49c055a
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sat Oct 1 17:18:46 2011 -0400
Don't use dh-autoreconf.
diff --git a/debian/control b/debian/control
index f530652..85154de 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 7.0.50~),
texlive-latex-extra,
latex-xcolor,
texlive-fonts-recommended,
- dh-autoreconf
Standards-Version: 3.9.2
Homepage: http://www.videolan.org/developers/libbluray.html
Vcs-Git: git://git.debian.org/git/pkg-multimedia/libbluray.git
diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch
new file mode 100644
index 0000000..d99d717
--- /dev/null
+++ b/debian/patches/autoreconf.patch
@@ -0,0 +1,21 @@
+Description: Patch used to set changes to build system.
+Origin: Debian
+Forwarded: non-needed
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -339,10 +339,10 @@
+ top_srcdir = @top_srcdir@
+
+ # library version info
+-# NOTE: this is not the same as the library's release number
+-LIB_CURRENT = 0
+-LIB_REVISION = 0
+-LIB_AGE = 0
++# NOTE: soname version is retrieved from bluray.h.
++LIB_CURRENT = $(shell grep -e 'define LIBBLURAY_VERSION_MAJOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
++LIB_REVISION = $(shell grep -e 'define LIBBLURAY_VERSION_MINOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
++LIB_AGE = $(shell grep -e 'define LIBBLURAY_VERSION_MICRO' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
+ LIB_VERSION_INFO = "$(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE)"
+ SUBDIRS = . examples
+ SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
diff --git a/debian/patches/series b/debian/patches/series
index 5c35295..ecaa44b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
soname-bump.patch
+autoreconf.patch
diff --git a/debian/rules b/debian/rules
index 6b36c7d..fca541b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,10 +26,10 @@ CFLAGS=$(DEB_CFLAGS)
ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS)))
%:
- dh --with javahelper,autoreconf $@
+ dh --with javahelper $@
else
%:
- dh --with autoreconf $@
+ dh $@
endif
override_dh_auto_configure:
--
libbluray packaging
More information about the pkg-multimedia-commits
mailing list