diff -u microcom-2012.06.0/debian/changelog microcom-2012.06.0/debian/changelog --- microcom-2012.06.0/debian/changelog +++ microcom-2012.06.0/debian/changelog @@ -1,3 +1,23 @@ +microcom (2012.06.0-3ubuntu1) trusty; urgency=low + + * Merge from Debian unstable (LP: #1256058). Remaining change: + - Fix FTBFS with --as-needed linker option. + + -- Roy Jamison Thu, 28 Nov 2013 17:43:36 +0000 + +microcom (2012.06.0-3) unstable; urgency=low + + * Orphan package + * Bump standards to 3.9.4 (no changes needed) + + -- Alexander Reichle-Schmehl Wed, 30 Oct 2013 01:05:37 +0100 + +microcom (2012.06.0-2ubuntu1) quantal; urgency=low + + * Fix FTBFS with --as-needed linker option. + + -- Ilya Barygin Wed, 20 Jun 2012 22:10:28 +0400 + microcom (2012.06.0-2) unstable; urgency=low * Make the package arch: linux-any, as the new upsteam release only @@ -35,0 +56 @@ + diff -u microcom-2012.06.0/debian/control microcom-2012.06.0/debian/control --- microcom-2012.06.0/debian/control +++ microcom-2012.06.0/debian/control @@ -1,9 +1,10 @@ Source: microcom Section: comm Priority: extra -Maintainer: Alexander Reichle-Schmehl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian QA Group Build-Depends: debhelper (>= 9), docbook-to-man, libreadline6-dev, dpkg-dev (>= 1.16.1~) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://git.pengutronix.de/?p=tools/microcom.git;a=tags Package: microcom only in patch2: unchanged: --- microcom-2012.06.0.orig/Makefile +++ microcom-2012.06.0/Makefile @@ -20,7 +20,7 @@ #****************************************************************************/ CFLAGS += -Wall -O2 -g -LDFLAGS += -lreadline -lpthread +LDLIBS += -lreadline -lpthread CPPFLAGS += -DPKG_VERSION="\"2012.06.0\"" -DPF_CAN=29 -DAF_CAN=PF_CAN