[Pkg-crosswire-devel] [Branch ~pkgcrosswire/libsword/main] Rev 53: Merge Dmitrij's chrpath changes and bug number changelog comments

[noreply at launchpad.net]

------------------------------------------------------------
revno: 53 [merge]
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Mon 2009-05-25 13:37:03 -0700
message:
  Merge Dmitrij's chrpath changes and bug number changelog comments
modified:
  debian/changelog
  debian/rules

=== modified file 'debian/changelog'
--- debian/changelog	2009-05-25 20:08:40 +0000
+++ debian/changelog	2009-05-25 20:37:03 +0000
@@ -1,7 +1,7 @@
 sword (1.6.0+dfsg-1) UNRELEASED; urgency=low
 
   [ Jonathan Marsden ]
-  * New upstream release.
+  * New upstream release. (Closes: #507960) (LP: #320558)
   * debian/patches/02_libver.diff:
     - Bump SONAME to 8 -- SWORD 1.6 is not backward compatible with 1.5.11.
   * debian/patches/series:
@@ -42,14 +42,18 @@
   * debian/libsword8.lintian-overrides: added override for module
     installation directory.
   * debian/copyright: Updated with information about everyfile.
+    Closes: #513448 LP: #322638
   * debian/diatheke.examples: moved examples here from the diatheke.install
   * debian/rules:
     - enabled shell script based testsuite
     - added commented out cppunit testsuite
   * debian/patches/40_missing_includes.diff: 
     - added several missing stdio.h includes to prevent FTBFS of testsuite.
+  
+  [ Closed Bugs ]
+  * FTBFS on intrepid (LP: #305172)
 
- -- Jonathan Marsden <jmarsden at fastmail.fm>  Mon, 25 May 2009 13:07:25 -0700
+ -- Jonathan Marsden <jmarsden at fastmail.fm>  Mon, 25 May 2009 13:28:25 -0700
 
 sword (1.5.11-1) experimental; urgency=low
 

=== modified file 'debian/rules'
--- debian/rules	2009-05-25 19:35:12 +0000
+++ debian/rules	2009-05-25 20:37:03 +0000
@@ -14,14 +14,14 @@
 #DEB_MAKE_CHECK_TARGET := check
 #DEB_OPT_FLAG=-g -O0 -Werror
 
-# The next two rules use chrpath to remove unwanted rpath info 
-# from the compiled binaries when they are built on amd64.
-
 build/libsword8::
 	#Running Shell based Testsuite
 	$(shell cd tests/testsuite && ./runall.sh 1>&2)
+	# The next three rules use chrpath to remove unwanted rpath info 
+	# from the compiled binaries when they are built on amd64.
 	chrpath -d $(CURDIR)/lib/.libs/libsword.so*
 	chrpath -d $(CURDIR)/utilities/.libs/*
+	chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke
 
 	for file in `ls debian/*.pod`;\
 	do\
@@ -30,9 +30,6 @@
 		pod2man --release=$$VERSION --center "" -n $$name $$file > $$base;\
 	done
 
-build/diatheke::
-	chrpath -d $(CURDIR)/utilities/diatheke/.libs/diatheke
-
 binary: list-missing
 	#checking for missing files
 clean/::



--
Main packaging branch
https://code.launchpad.net/~pkgcrosswire/libsword/main

Your team Crosswire Packaging Team is subscribed to branch lp:libsword.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/libsword/main/+edit-subscription.