[Debian-ha-commits] [libqb] 17/19: Replaced manual patch for .tarball-version file, with patch file

myon at debian.org myon at debian.org
Sat Apr 18 17:47:55 UTC 2015


This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository libqb.

commit 870001003eacdadb98c3a625078856b514e6f78f
Author: Richard B Winters <rik at mmogp.com>
Date:   Sat Apr 18 03:45:41 2015 -0400

    Replaced manual patch for .tarball-version file, with patch file
    
    - Updated quilt series
    - Verified works as intended
    
    Change-Id: If927ea4dbe362ba6a16546f4ec7b7636ead8bc10
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/patches/add-tarball-version-file.patch | 9 +++++++++
 debian/patches/series                         | 1 +
 debian/rules                                  | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/patches/add-tarball-version-file.patch b/debian/patches/add-tarball-version-file.patch
new file mode 100644
index 0000000..a2de0a0
--- /dev/null
+++ b/debian/patches/add-tarball-version-file.patch
@@ -0,0 +1,9 @@
+Author: Richard B Winters <rik at mmogp.com>
+Subject: Add .tarball-version file to root of source
+
+Not having this file in source prior to build results in the soversion string
+not being properly generated for pkg-config created files.
+--- /dev/null
++++ b/.tarball-version
+@@ -0,0 +1 @@
++0.17.1
diff --git a/debian/patches/series b/debian/patches/series
index 22a6e5a..d09f4f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix-comment-typo-incomming.patch
 fix-comment-typo-neccessary.patch
 add-qbipc-common-description.patch
 fix-qbutil-description.patch
+add-tarball-version-file.patch
diff --git a/debian/rules b/debian/rules
index d961cbb..9a6040b 100644
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,9 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 	dh $@ --with autoreconf --fail-missing --link-doc=libqb0
 
 override_dh_autoreconf:
-	echo "0.17.1" > .tarball-version
 	dh_autoreconf ./autogen.sh
 
 override_dh_auto_build:
-	echo "0.17.1" > .tarball-version
 	dh_auto_build
 	$(MAKE) doxygen
 	rm docs/html/*.md5
@@ -38,6 +36,3 @@ override_dh_auto_install:
 override_dh_strip:
 	dh_strip --dbg-package=libqb0-dbg
 
-override_dh_auto_clean:
-	dh_auto_clean
-	rm .tarball-version
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/libqb.git



More information about the Debian-HA-Commits mailing list