diff -Nru monobristol-0.60.3/debian/changelog monobristol-0.60.3/debian/changelog --- monobristol-0.60.3/debian/changelog 2012-02-22 01:28:54.000000000 +0000 +++ monobristol-0.60.3/debian/changelog 2013-05-13 05:29:38.000000000 +0000 @@ -1,3 +1,31 @@ +monobristol (0.60.3-2.1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/03_attach_events: Apply patch from Takashi Sakamoto + resolving inability to call Moog Voyager Blue Ice, Prophet-52, Pro-1 and + YAMAHA DX. + * debian/patches/04_fix_automake_1.11.3: Drop, as a similar patch was made + in Debian. + + -- Logan Rosen Mon, 13 May 2013 01:27:24 -0400 + +monobristol (0.60.3-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Pass '-I .' to autoreconf to fix the configure generation + (Closes: #704558) + + -- Andrey Rahmatullin Wed, 03 Apr 2013 23:43:33 +0600 + +monobristol (0.60.3-2) unstable; urgency=low + + * [2b806d4] Update debian/rules for DH8-compatible "--with cli" + * [56aee4e] Use dh-autoreconf rather than doing it manually + * [6cf8750] Automake 1.11.2 enforces C-libs-only in pkglib, so + reuse the custom-defined programfilesdir for installing the main assembly. + + -- Jo Shields Fri, 20 Jan 2012 13:12:02 +0000 + monobristol (0.60.3-1ubuntu2) precise; urgency=low * Fix FTBFS with automake 1.11.3 (LP: #934976). diff -Nru monobristol-0.60.3/debian/control monobristol-0.60.3/debian/control --- monobristol-0.60.3/debian/control 2012-02-22 01:28:54.000000000 +0000 +++ monobristol-0.60.3/debian/control 2013-05-13 05:26:23.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian CLI Applications Team -Build-Depends: debhelper (>= 7.0.50), cli-common-dev (>= 0.7), autoconf, +Build-Depends: debhelper (>= 7.0.50), cli-common-dev (>= 0.7), dh-autoreconf, imagemagick, automake, libtool Build-Depends-Indep: mono-devel (>= 2.4.3), libgtk2.0-cil-dev, libglib2.0-cil-dev, libglade2.0-cil-dev diff -Nru monobristol-0.60.3/debian/patches/04_fix_automake_1.11.3 monobristol-0.60.3/debian/patches/04_fix_automake_1.11.3 --- monobristol-0.60.3/debian/patches/04_fix_automake_1.11.3 2012-02-22 01:28:54.000000000 +0000 +++ monobristol-0.60.3/debian/patches/04_fix_automake_1.11.3 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Description: Resolve FTBFS with automake 1.11.3: - + pkglib_SCRIPT is compatible with last automake version. - Use instead a simple workaround to install file in the same place. -Author: Leo Iannacone -Bug-Ubuntu: https://bugs.launchpad.net/bugs/934976 ---- - Makefile.include | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- monobristol.orig/Makefile.include -+++ monobristol/Makefile.include -@@ -62,12 +62,11 @@ EXTRA_DIST += $(build_sources) $(build_r - CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list) - DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/* - --pkglib_SCRIPTS = $(ASSEMBLY) - bin_SCRIPTS = $(BINARIES) - - programfilesdir = @libdir@/@PACKAGE@ - programfiles_DATA = $(PROGRAMFILES) -- -+programfiles_SCRIPTS = $(ASSEMBLY) - - # macros - diff -Nru monobristol-0.60.3/debian/patches/dont_use_pkglibdir_because_automake_sucks monobristol-0.60.3/debian/patches/dont_use_pkglibdir_because_automake_sucks --- monobristol-0.60.3/debian/patches/dont_use_pkglibdir_because_automake_sucks 1970-01-01 00:00:00.000000000 +0000 +++ monobristol-0.60.3/debian/patches/dont_use_pkglibdir_because_automake_sucks 2013-05-13 05:23:55.000000000 +0000 @@ -0,0 +1,17 @@ +Index: monobristol/Makefile.include +=================================================================== +--- monobristol.orig/Makefile.include 2012-01-20 13:09:42.000000000 +0000 ++++ monobristol/Makefile.include 2012-01-20 13:10:01.000000000 +0000 +@@ -62,11 +62,10 @@ + CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list) + DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/* + +-pkglib_SCRIPTS = $(ASSEMBLY) + bin_SCRIPTS = $(BINARIES) + + programfilesdir = @libdir@/@PACKAGE@ +-programfiles_DATA = $(PROGRAMFILES) ++programfiles_DATA = $(PROGRAMFILES) $(ASSEMBLY) + + + # macros diff -Nru monobristol-0.60.3/debian/patches/series monobristol-0.60.3/debian/patches/series --- monobristol-0.60.3/debian/patches/series 2012-02-22 01:28:54.000000000 +0000 +++ monobristol-0.60.3/debian/patches/series 2013-05-13 05:27:00.000000000 +0000 @@ -1,4 +1,4 @@ +dont_use_pkglibdir_because_automake_sucks 01_use_mono-csc 02_fix_config 03_attach_events -04_fix_automake_1.11.3 diff -Nru monobristol-0.60.3/debian/rules monobristol-0.60.3/debian/rules --- monobristol-0.60.3/debian/rules 2012-02-22 01:28:54.000000000 +0000 +++ monobristol-0.60.3/debian/rules 2013-05-13 05:23:55.000000000 +0000 @@ -10,9 +10,6 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2) VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//') -include /usr/share/cli-common/cli.make - - get-orig-source: uscan \ --package $(DEB_SOURCE_NAME) \ @@ -24,7 +21,6 @@ --rename override_dh_auto_configure: - autoreconf -f -i -s -I . dh_auto_configure -- GMCS=/usr/bin/mono-csc override_dh_auto_install: @@ -37,7 +33,10 @@ rm -rf configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/ find . -name "Makefile.in" -delete +override_dh_autoreconf: + dh_autoreconf autoreconf -- -f -i -I . + %: - dh $@ + dh $@ --with cli,autoreconf .PHONY: get-orig-source