Merge lp:~noskcaj/ubuntu/trusty/check/merge into lp:ubuntu/trusty/check

[Jackson Doak]

Merge from debian

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

16. By Jackson Doak on 2013-12-07

Run update-maintainer

15. By Jackson Doak on 2013-12-06

Merge from debian

=== modified file 'check.pc.in'
--- check.pc.in	2013-06-21 11:23:31 +0000
+++ check.pc.in	2013-12-07 00:20:41 +0000
@@ -8,6 +8,6 @@
 URL: http://check.sourceforge.net
 Version: @VERSION@
 Requires.private: @LIBSUBUNIT_PC@
-Libs: -L${libdir} -lcheck_pic @GCOV_LIBS@ @PTHREAD_LIBS@ @LIBS@
+Libs: -L${libdir} -lcheck_pic @GCOV_LIBS@ -pthread @LIBS@
 Libs.private: 
 Cflags: -I${includedir} -pthread

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-13 13:57:23 +0000
+++ debian/changelog	2013-12-07 00:20:41 +0000
@@ -1,3 +1,27 @@
+check (0.9.10-6ubuntu1) trusty; urgency=low
+
+  * Merge from debian. Remaining changes:
+    - Update config.{guess,sub} for Aarch64.
+
+ -- Jackson Doak <[e-mail]>  Sat, 07 Dec 2013 10:57:13 +1100
+
+check (0.9.10-6) unstable; urgency=low
+
+  * add -pthread to both --libs and --cflags of check.pc (sigh)
+
+ -- Robert Lemmen <[e-mail]>  Mon, 25 Nov 2013 20:10:47 +0000
+
+check (0.9.10-5) unstable; urgency=low
+
+  * debian/patches/03texi.patch: Update patch and remove version and date
+    information from check.info to handle Multi-Arch:Same (closes: #718200).
+  * debian/rules:
+    - Remove doc/check.info before build so it gets regenerated.
+    - Remove first line from doc/check.info to handle Multi-Arch:Same.
+  * debian/control: Add Build-Depends texinfo to build check.info.
+
+ -- Thomas Bechtold <[e-mail]>  Sat, 17 Aug 2013 20:15:46 +0200
+
 check (0.9.10-4ubuntu1) saucy; urgency=low
 
   * Update config.{guess,sub} for Aarch64.

=== modified file 'debian/control'
--- debian/control	2013-07-10 09:46:55 +0000
+++ debian/control	2013-12-07 00:20:41 +0000
@@ -1,9 +1,10 @@
 Source: check
 Section: devel
 Priority: optional
-Maintainer: Robert Lemmen <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Robert Lemmen <[e-mail]>
 Uploaders: Thomas Bechtold <[e-mail]>
-Build-Depends: debhelper (>= 8.0), mawk
+Build-Depends: debhelper (>= 8.0), mawk, texinfo
 Build-Conflicts: gawk
 Standards-Version: 3.9.4
 Homepage: http://check.sourceforge.net/

=== modified file 'debian/patches/01pkgconfig.patch'
--- debian/patches/01pkgconfig.patch	2013-06-21 11:23:31 +0000
+++ debian/patches/01pkgconfig.patch	2013-12-07 00:20:41 +0000
@@ -7,6 +7,6 @@
 -Libs: -L${libdir} -lcheck
 -Libs.private: @GCOV_LIBS@ @PTHREAD_LIBS@ @LIBS@
 -Cflags: -I${includedir} @PTHREAD_CFLAGS@
-+Libs: -L${libdir} -lcheck_pic @GCOV_LIBS@ @PTHREAD_LIBS@ @LIBS@
++Libs: -L${libdir} -lcheck_pic @GCOV_LIBS@ -pthread @LIBS@
 +Libs.private: 
 +Cflags: -I${includedir} -pthread

=== modified file 'debian/patches/03texi.patch'
--- debian/patches/03texi.patch	2013-06-21 11:23:31 +0000
+++ debian/patches/03texi.patch	2013-12-07 00:20:41 +0000
@@ -1,8 +1,16 @@
-diff --git a/doc/check.texi b/doc/check.texi
-index 7fef034..6602b73 100644
+Description: Remove dynamic information to handle Multi-Arch:same
+ and also remove dircategory and direntry.
+Last-Update: 2013-07-30
 --- a/doc/check.texi
 +++ b/doc/check.texi
-@@ -8,6 +8,11 @@
+@@ -2,16 +2,19 @@
+ @c %**start of header
+ @setfilename check.info
+ @include version.texi
+-@settitle Check @value{VERSION}
++@settitle Check
+ @syncodeindex fn cp
+ @syncodeindex tp cp
  @syncodeindex vr cp
  @c %**end of header
  
@@ -12,9 +20,14 @@
 +@end direntry
 +
  @copying
- This manual is for Check
- (version @value{VERSION}, @value{UPDATED}),
-@@ -26,11 +31,6 @@ entitled ``@acronym{GNU} Free Documentation License.''
+-This manual is for Check
+-(version @value{VERSION}, @value{UPDATED}),
+-a unit testing framework for C.
++This manual is for Check, a unit testing framework for C.
+ 
+ Copyright @copyright{} 2001--2011 Arien Malec, Branden Archer, Chris Pickett, 
+ Fredrik Hugosson, and Robert Lemmen.
+@@ -26,11 +29,6 @@
  @end quotation
  @end copying
  

=== modified file 'debian/rules'
--- debian/rules	2013-07-10 09:46:55 +0000
+++ debian/rules	2013-12-07 00:20:41 +0000
@@ -38,11 +38,15 @@
 
 build-pic: configure-stamp-pic build-stamp-pic
 build-stamp-pic:
+	#remove check.info so it will be regenerated
+	rm -f doc/check.info
 	dh_testdir
 	$(MAKE)
 	mv src/.libs/libcheck.a src/libcheck_pic.a
 	#run the testsuite
 	dh_auto_test
+	#remove dynamic content for Multi-Arch:same (see #718200)
+	sed -i -e "1d" doc/check.info
 	touch build-stamp-pic
 
 clean:

=== modified file 'doc/check.texi'
--- doc/check.texi	2013-06-07 11:52:15 +0000
+++ doc/check.texi	2013-12-07 00:20:41 +0000
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename check.info
 @include version.texi
-@settitle Check @value{VERSION}
+@settitle Check
 @syncodeindex fn cp
 @syncodeindex tp cp
 @syncodeindex vr cp
@@ -14,9 +14,7 @@
 @end direntry
 
 @copying
-This manual is for Check
-(version @value{VERSION}, @value{UPDATED}),
-a unit testing framework for C.
+This manual is for Check, a unit testing framework for C.
 
 Copyright @copyright{} 2001--2011 Arien Malec, Branden Archer, Chris Pickett, 
 Fredrik Hugosson, and Robert Lemmen.