diff -Nru mono-addins-0.6.2/debian/changelog mono-addins-0.6.2/debian/changelog --- mono-addins-0.6.2/debian/changelog 2011-11-04 02:18:49.000000000 +0000 +++ mono-addins-0.6.2/debian/changelog 2012-01-23 01:12:57.000000000 +0000 @@ -1,11 +1,13 @@ -mono-addins (0.6.2-1ubuntu1) precise; urgency=low +mono-addins (0.6.2-2) unstable; urgency=low - * Merge from Debian Unstable, remaining changes: - - Update Microsoft.Build.Utilities references to - Microsoft.Build.Utilities.v4.0 for the CLR 4.0. Change will arrive in - Debian soon, so we can sync again then. + * [187e884] Correct order of dh arguments + * [c8a1da2] Update debian/rules for DH8-compatible "--with cli" + * [a797178] Add a workaround for Autpmake 1.11.2's insistance + that you can't store SCRIPTS in pkglibdir + * [32bd46f] Add patch from Iain Lane to use the correct version + of Microsoft.Build.Utilities - -- Chow Loong Jin Fri, 04 Nov 2011 10:15:45 +0800 + -- Jo Shields Mon, 23 Jan 2012 01:12:31 +0000 mono-addins (0.6.2-1) unstable; urgency=low @@ -20,15 +22,6 @@ -- Iain Lane Thu, 03 Nov 2011 03:03:42 +0000 -mono-addins (0.6.1-2ubuntu1) oneiric; urgency=low - - * Merge from debian unstable. Remaining changes: - - Update Microsoft.Build.Utilities references to - Microsoft.Build.Utilities.v4.0 for the CLR 4.0. Change will arrive in - Debian soon, so we can sync again then. - - -- Julian Taylor Tue, 02 Aug 2011 23:29:15 +0000 - mono-addins (0.6.1-2) unstable; urgency=high * urgency=high for RC bug fix @@ -38,15 +31,6 @@ -- Iain Lane Tue, 02 Aug 2011 17:30:27 +0100 -mono-addins (0.6.1-1ubuntu1) oneiric; urgency=low - - * Update Microsoft.Build.Utilities references to - Microsoft.Build.Utilities.v4.0 for the CLR 4.0. Change will arrive in - Debian soon, so we can sync again then. - * Bump minimal debhelper BD to 7.0.50~ for override support - - -- Iain Lane Tue, 12 Jul 2011 18:52:40 +0100 - mono-addins (0.6.1-1) unstable; urgency=low * [bdc09da] Imported Upstream version 0.6.1 diff -Nru mono-addins-0.6.2/debian/patches/automake_1.11.2_pkglibdir_workaround.patch mono-addins-0.6.2/debian/patches/automake_1.11.2_pkglibdir_workaround.patch --- mono-addins-0.6.2/debian/patches/automake_1.11.2_pkglibdir_workaround.patch 1970-01-01 00:00:00.000000000 +0000 +++ mono-addins-0.6.2/debian/patches/automake_1.11.2_pkglibdir_workaround.patch 2012-01-23 01:07:36.000000000 +0000 @@ -0,0 +1,15 @@ +Index: mono-addins/mautil/Makefile.am +=================================================================== +--- mono-addins.orig/mautil/Makefile.am 2012-01-23 01:07:13.000000000 +0000 ++++ mono-addins/mautil/Makefile.am 2012-01-23 01:07:33.000000000 +0000 +@@ -36,8 +36,8 @@ + + include $(top_srcdir)/Makefile.include + +-pkglibdir = $(libdir)/mono/mono-addins +-pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles) ++programfilesdir = $(libdir)/mono/mono-addins ++programfiles_SCRIPTS = $(ASSEMBLY) $(build_datafiles) + + man_MANS = mautil.1 + EXTRA_DIST += $(man_MANS) diff -Nru mono-addins-0.6.2/debian/patches/series mono-addins-0.6.2/debian/patches/series --- mono-addins-0.6.2/debian/patches/series 2011-11-04 02:18:49.000000000 +0000 +++ mono-addins-0.6.2/debian/patches/series 2012-01-23 01:09:45.000000000 +0000 @@ -3,4 +3,5 @@ 0003-fix_mono-addins-gui.pc.patch.patch 0004-fix_mono-addins-setup.pc.patch.patch 0005-fix_mono-addins-msbuild.pc.patch.patch +automake_1.11.2_pkglibdir_workaround.patch use-microsoft-build-utilities-4.0 diff -Nru mono-addins-0.6.2/debian/rules mono-addins-0.6.2/debian/rules --- mono-addins-0.6.2/debian/rules 2011-11-04 02:18:49.000000000 +0000 +++ mono-addins-0.6.2/debian/rules 2012-01-23 01:05:16.000000000 +0000 @@ -3,8 +3,6 @@ #export DH_VERBOSE=1 export MONO_SHARED_DIR=$(CURDIR) -include /usr/share/cli-common/cli.make - DEB_CLI_ABI_VERSION=0.2 DEB_CLI_API_VERSION=0.6 @@ -39,4 +37,4 @@ --repack %: - dh --with autoreconf $@ + dh $@ --with autoreconf,cli