Control: tags -1 + patch pending
attaching patch, and uploading to delayed.
diff -Nru ocp-0.1.21/debian/changelog ocp-0.1.21/debian/changelog --- ocp-0.1.21/debian/changelog 2012-09-16 17:21:01.000000000 +0200 +++ ocp-0.1.21/debian/changelog 2015-07-10 14:20:39.000000000 +0200 @@ -1,3 +1,11 @@ +ocp (1:0.1.21-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix GCC version detection. Closes: #778033. + * Build using dh-autoreconf. Closes: #744480. + + -- Matthias Klose <d...@debian.org> Fri, 10 Jul 2015 14:07:58 +0200 + ocp (1:0.1.21-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru ocp-0.1.21/debian/control ocp-0.1.21/debian/control --- ocp-0.1.21/debian/control 2011-12-01 09:52:43.000000000 +0100 +++ ocp-0.1.21/debian/control 2015-07-10 14:14:25.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Gürkan Sengün <gur...@phys.ethz.ch> Uploaders: Debian Multimedia Team <debian-multime...@lists.debian.org> -Build-Depends: debhelper (>= 8), libmad0-dev, libid3tag0-dev, zlib1g-dev, libncurses5-dev, libogg-dev, libvorbis-dev, libsidplay1-dev, libx11-dev, libxext-dev, texi2html, libxxf86dga-dev, libxxf86vm-dev, texinfo, libbinio-dev, libadplug-dev (>= 2.0.1-2), libflac-dev, libxpm-dev, libasound2-dev, desktop-file-utils, dpkg (>= 1.15.4) | install-info +Build-Depends: debhelper (>= 8), dh-autoreconf, libmad0-dev, libid3tag0-dev, zlib1g-dev, libncurses5-dev, libogg-dev, libvorbis-dev, libsidplay1-dev, libx11-dev, libxext-dev, texi2html, libxxf86dga-dev, libxxf86vm-dev, texinfo, libbinio-dev, libadplug-dev (>= 2.0.1-2), libflac-dev, libxpm-dev, libasound2-dev, desktop-file-utils, dpkg (>= 1.15.4) | install-info Standards-Version: 3.9.2 Homepage: http://stian.cubic.org/project-ocp.php diff -Nru ocp-0.1.21/debian/patches/gccver.diff ocp-0.1.21/debian/patches/gccver.diff --- ocp-0.1.21/debian/patches/gccver.diff 1970-01-01 01:00:00.000000000 +0100 +++ ocp-0.1.21/debian/patches/gccver.diff 2015-07-10 14:25:25.000000000 +0200 @@ -0,0 +1,13 @@ +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -117,7 +117,7 @@ else + '') + AC_MSG_ERROR([not found]); + ;; +- 2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|4.*) ++ 2.95.[[2-9]]|2.95.[[2-9]][[-.]]*|3.[[0-9]]|3.[[0-9]].[[0-9]]|3.[[0-9]]|3.[[0-9]].[[0-9]]-*|[[4-9]].*) + _cc_major=`echo $cc_version | cut -d '.' -f 1` + _cc_minor=`echo $cc_version | cut -d '.' -f 2` + _cc_mini=`echo $cc_version | cut -d '.' -f 3` diff -Nru ocp-0.1.21/debian/patches/series ocp-0.1.21/debian/patches/series --- ocp-0.1.21/debian/patches/series 2012-09-16 17:15:01.000000000 +0200 +++ ocp-0.1.21/debian/patches/series 2015-07-10 14:20:09.000000000 +0200 @@ -1,3 +1,4 @@ info-compression fix-desktop-file fix-gcc47-pcthunk +gccver.diff diff -Nru ocp-0.1.21/debian/rules ocp-0.1.21/debian/rules --- ocp-0.1.21/debian/rules 2011-12-01 10:07:16.000000000 +0100 +++ ocp-0.1.21/debian/rules 2015-07-10 14:23:46.000000000 +0200 @@ -11,9 +11,9 @@ CFLAGS += -O2 endif -configure: configure-stamp configure-stamp: dh_testdir + AUTOMAKE=true LIBTOOLIZE=true AUTOHEADER=true dh_autoreconf CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ @@ -43,6 +43,7 @@ rm -f build-stamp configure-stamp [ ! -f Makefile ] || $(MAKE) clean distclean rm -f config.log config.status + dh_autoreconf_clean dh_clean install: build
