Merge lp:~ubuntu-branches/ubuntu/natty/kbarcode/collision into lp:ubuntu/natty/kbarcode

[James Westby]

This would have been what the importer did had it not found a bug.

These are the changes that Daviey put in the branch, and should be
assessed to see if they should be included in the next upload.

[Dave Walker (davewalker)]

Not needed, the divergence between package in archive and this is pretty much cosmetic.

Thanks!

review: Disapprove

Unmerged revisions

15. By Tarun K. Mall on 2011-03-01

* debian/patches/10_fix_ftbfs_binutils-gold:diff
  - Fix FTBFS with binutils-gold. (LP: #726405, Closes: #615967)

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-11 08:50:45 +0000
+++ debian/changelog	2011-03-01 20:44:19 +0000
@@ -1,3 +1,10 @@
+kbarcode (2.0.7-3ubuntu1) natty; urgency=low
+
+  * debian/patches/10_fix_ftbfs_binutils-gold:diff
+    - Fix FTBFS with binutils-gold. (LP: #726405, Closes: #615967)
+
+ -- Tarun Kumar Mall <[e-mail]>  Tue, 01 Mar 2011 12:07:58 +0000
+
 kbarcode (2.0.7-3) unstable; urgency=low
 
   * Add missing Name key to kbarcode-label desktop file. (Closes: #570129)

=== modified file 'debian/control'
--- debian/control	2010-08-11 08:50:45 +0000
+++ debian/control	2011-03-01 20:44:19 +0000
@@ -1,7 +1,8 @@
 Source: kbarcode
 Section: kde
 Priority: optional
-Maintainer: Debian KDE Extras Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian KDE Extras Team <[e-mail]>
 Uploaders: Fathi Boudra <[e-mail]>, Mark Purcell <[e-mail]>
 Build-Depends: cdbs (>= 0.4.52), debhelper (>= 7), quilt, automake, kdelibs4-dev
 Standards-Version: 3.9.1

=== added file 'debian/patches/10_fix_ftbfs_binutils-gold.diff'
--- debian/patches/10_fix_ftbfs_binutils-gold.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/10_fix_ftbfs_binutils-gold.diff	2011-03-01 20:44:19 +0000
@@ -0,0 +1,19 @@
+From: Tarun Kumar Mall <[e-mail]>
+Description: This patch fixex FTBFS problem by adding certain libraries to
+ file kbarcode-2.0.7.orig/kbarcode/Makefile.am
+Bug-Ubuntu: https://launchpad.net/bugs/726405
+Bug-Debian: http://bugs.debian.org/615967
+
+Index: kbarcode-2.0.7/kbarcode/Makefile.am
+===================================================================
+--- kbarcode-2.0.7.orig/kbarcode/Makefile.am	2011-03-01 09:24:57.447560008 +0000
++++ kbarcode-2.0.7/kbarcode/Makefile.am	2011-03-01 09:25:23.667559799 +0000
+@@ -21,7 +21,7 @@
+ 
+ kbarcode_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_KDEPRINT) \
+-	$(LIB_KDEUI) -lkjs -lpcre
++	$(LIB_KDEUI) -lkjs -lpcre -lkio -lqt-mt -lDCOP -lkdecore
+ 
+ noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h commands.h \
+ 	configdialog.h confwizard.h csvimportdlg.h databasebrowser.h definition.h \

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-11 08:50:45 +0000
+++ debian/patches/series	2011-03-01 20:44:19 +0000
@@ -6,3 +6,4 @@
 07_autoconf2.64.diff
 08_automake-1.1x.diff
 09_missing_name_key.diff
+10_fix_ftbfs_binutils-gold.diff