[Pkg-mono-svn-commits] [SCM] mono-debugger branch, master, updated. debian/2.6.3-2-8-g54bd189

Jo Shields directhex at apebox.org
Sat Mar 26 19:46:46 UTC 2011


The following commit has been merged in the master branch:
commit 54bd18936cd622c7befa3ff852307a85ded7fdfe
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Mar 25 19:31:04 2011 +0000

    Convert packaging to use DebHelper 7, and build against Mono 2.10

diff --git a/debian/control b/debian/control
index 853f9bb..56b01ca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,13 @@ Section: devel
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5),
- dpatch,
+Build-Depends: debhelper (>= 7.0.50~),
+ dh-autoreconf,
  cli-common-dev (>= 0.4.4),
- mono-devel (>= 2.6.3),
+ mono-devel (>= 2.10),
  nunit-console,
  libnunit-cil-dev,
- autoconf,
- automake,
- autotools-dev,
- libtool,
- libmono-dev (>= 2.0),
+ libmono-2.0-dev,
  libglib2.0-dev,
  libreadline-dev
 Standards-Version: 3.9.1
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8e729e2..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-use_real_nunit
-fix_dllmap
diff --git a/debian/patches/fix_Makefile.am.dpatch b/debian/patches/fix_Makefile.am.dpatch
deleted file mode 100755
index 8db9be3..0000000
--- a/debian/patches/fix_Makefile.am.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_Makefile.am.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-debugger-0.12+svn.r59605~/build/Makefile.am mono-debugger-0.12+svn.r59605/build/Makefile.am
---- mono-debugger-0.12+svn.r59605~/build/Makefile.am	2006-04-18 20:02:56.000000000 +0200
-+++ mono-debugger-0.12+svn.r59605/build/Makefile.am	2006-04-18 20:06:41.000000000 +0200
-@@ -8,7 +8,7 @@
- 
- noinst_SCRIPTS = Mono.Debugger.dll Mono.Debugger.Frontend.dll Mono.Debugger.Test.dll
- 
--EXTRA_DATA = Mono.Debugger.Cecil.dll
-+#EXTRA_DATA = Mono.Debugger.Cecil.dll
- 
- LANGUAGE_SPECIFIC_FILES = \
- 	$(top_builddir)/frontend/CSharpExpressionParser.cs	\
diff --git a/debian/patches/fix_build_with_libc_r98147_r98369.dpatch b/debian/patches/fix_build_with_libc_r98147_r98369.dpatch
deleted file mode 100755
index eda9ae7..0000000
--- a/debian/patches/fix_build_with_libc_r98147_r98369.dpatch
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_build_with_libc_r98147.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-debugger-0.60+dfsg~/backend/server/i386-arch.h mono-debugger-0.60+dfsg/backend/server/i386-arch.h
---- mono-debugger-0.60+dfsg~/backend/server/i386-arch.h	2008-06-01 15:16:40.000000000 +0200
-+++ mono-debugger-0.60+dfsg/backend/server/i386-arch.h	2008-06-01 15:17:40.000000000 +0200
-@@ -7,10 +7,10 @@
- 
- #if defined(__i386__)
- 
--#include <asm/user.h>
-+#include <sys/user.h>
- 
- #define INFERIOR_REGS_TYPE	struct user_regs_struct
--#define INFERIOR_FPREGS_TYPE	struct user_i387_struct
-+#define INFERIOR_FPREGS_TYPE	struct user_fpregs_struct
- 
- #define INFERIOR_REG_EIP(r)	r.eip
- #define INFERIOR_REG_ESP(r)	r.esp
-@@ -23,12 +23,12 @@
- #define INFERIOR_REG_EDI(r)	r.edi
- #define INFERIOR_REG_EFLAGS(r)	r.eflags
- #define INFERIOR_REG_ESP(r)	r.esp
--#define INFERIOR_REG_FS(r)	r.fs
--#define INFERIOR_REG_ES(r)	r.es
--#define INFERIOR_REG_DS(r)	r.ds
--#define INFERIOR_REG_CS(r)	r.cs
--#define INFERIOR_REG_SS(r)	r.ss
--#define INFERIOR_REG_GS(r)	r.gs
-+#define INFERIOR_REG_FS(r)	r.xfs
-+#define INFERIOR_REG_ES(r)	r.xes
-+#define INFERIOR_REG_DS(r)	r.xds
-+#define INFERIOR_REG_CS(r)	r.xcs
-+#define INFERIOR_REG_SS(r)	r.xss
-+#define INFERIOR_REG_GS(r)	r.xgs
- 
- G_END_DECLS
- 
-diff -urNad mono-debugger-0.60+dfsg~/backend/server/x86_64-arch.h mono-debugger-0.60+dfsg/backend/server/x86_64-arch.h
---- mono-debugger-0.60+dfsg~/backend/server/x86_64-arch.h	2008-06-01 15:16:40.000000000 +0200
-+++ mono-debugger-0.60+dfsg/backend/server/x86_64-arch.h	2008-06-01 15:17:25.000000000 +0200
-@@ -7,10 +7,10 @@
- 
- #if defined(__x86_64__)
- 
--#include <asm/user.h>
-+#include <sys/user.h>
- 
- #define INFERIOR_REGS_TYPE	struct user_regs_struct
--#define INFERIOR_FPREGS_TYPE	struct user_i387_struct
-+#define INFERIOR_FPREGS_TYPE	struct user_fpregs_struct
- 
- #define INFERIOR_REG_R15(r)	r.r15
- #define INFERIOR_REG_R14(r)	r.r14
diff --git a/debian/patches/fix_dllmap.dpatch b/debian/patches/fix_dllmap.patch
similarity index 100%
rename from debian/patches/fix_dllmap.dpatch
rename to debian/patches/fix_dllmap.patch
diff --git a/debian/patches/link_system_libs.dpatch b/debian/patches/link_system_libs.dpatch
deleted file mode 100755
index 393e707..0000000
--- a/debian/patches/link_system_libs.dpatch
+++ /dev/null
@@ -1,110 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## link_system_libs.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-debugger-0.60+dfsg~/build/Makefile.am mono-debugger-0.60+dfsg/build/Makefile.am
---- mono-debugger-0.60+dfsg~/build/Makefile.am	2007-12-23 01:56:41.000000000 +0100
-+++ mono-debugger-0.60+dfsg/build/Makefile.am	2007-12-23 01:57:01.000000000 +0100
-@@ -12,7 +12,6 @@
- 	Mono.Debugger.Frontend.dll			\
- 	Mono.Debugger.Test.dll
- 
--EXTRA_DATA = Mono.Debugger.Cecil.dll
- 
- LANGUAGE_SPECIFIC_FILES = \
- 	$(top_builddir)/frontend/CSharpExpressionParser.cs	\
-@@ -61,7 +60,7 @@
- 	-r:Mono.GetOptions				\
- 	-r:Mono.CompilerServices.SymbolWriter		\
- 	-r:System.Runtime.Serialization.Formatters.Soap	\
--	-r:$(srcdir)/Mono.Debugger.Cecil.dll		\
-+	$$(pkg-config --libs mono-cecil)		\
- 	-r:./Mono.Debugger.dll
- 
- MDB_DEPS = \
-@@ -77,7 +76,7 @@
- 	-r:./Mono.Debugger.Frontend.dll			\
- 	$$(pkg-config --libs nunit)
- 
--Mono.Debugger.Backend.dll: Makefile $(srcdir)/Mono.Debugger.Cecil.dll $(BACKEND_SRCLIST) Mono.Debugger.dll
-+Mono.Debugger.Backend.dll: Makefile $(BACKEND_SRCLIST) Mono.Debugger.dll
- 	$(MCS) -target:library -out:Mono.Debugger.Backend.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk -resource:$(top_srcdir)/classes/DebuggerConfiguration.xsd,DebuggerConfiguration $(BACKEND_DEPS) $(BACKEND_SRCLIST)
- 
- Mono.Debugger.dll: Makefile $(INTERFACE_SRCLIST)
-@@ -114,21 +113,18 @@
- 
- EXTRA_DIST = \
- 	mdb.in mono.snk AssemblyInfo.cs.in Mono.Debugger.dll.config.in \
--	Mono.Debugger.Cecil.dll
- 
- mdb: mdb.in Makefile
- 	sed -e 's^\@onedir\@^$(onedir)^g' < $(srcdir)/mdb.in > mdb.tmp \
- 	&& mv mdb.tmp mdb 
- 
- install-data-local:
--	$(GACUTIL) /i $(srcdir)/Mono.Debugger.Cecil.dll /f $(GACUTIL_FLAGS) || exit 1;
- 	$(GACUTIL) /i Mono.Debugger.Backend.dll /f $(GACUTIL_FLAGS) || exit 1;
- 	$(GACUTIL) /i Mono.Debugger.dll /f $(GACUTIL_FLAGS) || exit 1;
- 
- uninstall-local:
- 	$(GACUTIL) /u Mono.Debugger $(GACUTIL_FLAGS) || exit 1;
- 	$(GACUTIL) /u Mono.Debugger.Backend $(GACUTIL_FLAGS) || exit 1;
--	$(GACUTIL) /u Mono.Debugger.Cecil $(GACUTIL_FLAGS) || exit 1;
- 
- NUNIT_CONSOLE_FLAGS =
- 
-diff -urNad mono-debugger-0.60+dfsg~/build/Makefile.in mono-debugger-0.60+dfsg/build/Makefile.in
---- mono-debugger-0.60+dfsg~/build/Makefile.in	2007-12-23 01:56:41.000000000 +0100
-+++ mono-debugger-0.60+dfsg/build/Makefile.in	2007-12-23 01:57:12.000000000 +0100
-@@ -201,7 +201,6 @@
- 	Mono.Debugger.Frontend.dll			\
- 	Mono.Debugger.Test.dll
- 
--EXTRA_DATA = Mono.Debugger.Cecil.dll
- LANGUAGE_SPECIFIC_FILES = \
- 	$(top_builddir)/frontend/CSharpExpressionParser.cs	\
- 	$(top_srcdir)/frontend/CSharpTokenizer.cs
-@@ -249,7 +248,7 @@
- 	-r:Mono.GetOptions				\
- 	-r:Mono.CompilerServices.SymbolWriter		\
- 	-r:System.Runtime.Serialization.Formatters.Soap	\
--	-r:$(srcdir)/Mono.Debugger.Cecil.dll		\
-+	$$(pkg-config --libs mono-cecil)		\
- 	-r:./Mono.Debugger.dll
- 
- MDB_DEPS = \
-@@ -273,7 +272,6 @@
- 
- EXTRA_DIST = \
- 	mdb.in mono.snk AssemblyInfo.cs.in Mono.Debugger.dll.config.in \
--	Mono.Debugger.Cecil.dll
- 
- NUNIT_CONSOLE_FLAGS = 
- all: all-am
-@@ -493,7 +491,7 @@
- 	uninstall-binSCRIPTS uninstall-local uninstall-oneSCRIPTS
- 
- 
--Mono.Debugger.Backend.dll: Makefile $(srcdir)/Mono.Debugger.Cecil.dll $(BACKEND_SRCLIST) Mono.Debugger.dll
-+Mono.Debugger.Backend.dll: Makefile $(BACKEND_SRCLIST) Mono.Debugger.dll
- 	$(MCS) -target:library -out:Mono.Debugger.Backend.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk -resource:$(top_srcdir)/classes/DebuggerConfiguration.xsd,DebuggerConfiguration $(BACKEND_DEPS) $(BACKEND_SRCLIST)
- 
- Mono.Debugger.dll: Makefile $(INTERFACE_SRCLIST)
-@@ -526,14 +524,12 @@
- 	&& mv mdb.tmp mdb 
- 
- install-data-local:
--	$(GACUTIL) /i $(srcdir)/Mono.Debugger.Cecil.dll /f $(GACUTIL_FLAGS) || exit 1;
- 	$(GACUTIL) /i Mono.Debugger.Backend.dll /f $(GACUTIL_FLAGS) || exit 1;
- 	$(GACUTIL) /i Mono.Debugger.dll /f $(GACUTIL_FLAGS) || exit 1;
- 
- uninstall-local:
- 	$(GACUTIL) /u Mono.Debugger $(GACUTIL_FLAGS) || exit 1;
- 	$(GACUTIL) /u Mono.Debugger.Backend $(GACUTIL_FLAGS) || exit 1;
--	$(GACUTIL) /u Mono.Debugger.Cecil $(GACUTIL_FLAGS) || exit 1;
- 
- check-local: Mono.Debugger.Test.dll $(TEST_CASE_SRCLIST)
- 	LD_LIBRARY_PATH="$(top_builddir)/backend/server/.libs:$$LD_LIBRARY_PATH" $(NUNIT_CONSOLE) $(NUNIT_CONSOLE_FLAGS) /output:TestResult.log /exclude:NotWorking /xml:TestResult.xml Mono.Debugger.Test.dll || ok=false; \
diff --git a/debian/patches/lower_required_mono_version.dpatch b/debian/patches/lower_required_mono_version.dpatch
deleted file mode 100755
index 8482785..0000000
--- a/debian/patches/lower_required_mono_version.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lower_required_mono_version.dpatch by Mirco Bauer <meebey at meebey.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mono-debugger-0.12+svn.r59605~/configure.in mono-debugger-0.12+svn.r59605/configure.in
---- mono-debugger-0.12+svn.r59605~/configure.in	2006-04-18 20:02:56.000000000 +0200
-+++ mono-debugger-0.12+svn.r59605/configure.in	2006-04-18 20:08:42.000000000 +0200
-@@ -136,7 +136,7 @@
- 
- ## Versions of dependencies
- GLIB_REQUIRED_VERSION=2.0.0
--MONO_REQUIRED_VERSION=1.1.15
-+MONO_REQUIRED_VERSION=1.1.13.6
- 
- 
- PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f72ab6e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+use_real_nunit.patch
+fix_dllmap.patch
diff --git a/debian/patches/use_real_nunit.dpatch b/debian/patches/use_real_nunit.patch
similarity index 100%
rename from debian/patches/use_real_nunit.dpatch
rename to debian/patches/use_real_nunit.patch
diff --git a/debian/rules b/debian/rules
index 6968373..a5662de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,79 +9,24 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/cli-common/cli.make
 
-CFLAGS = -Wall -g
+override_dh_auto_configure:
+	dh_auto_configure -- --prefix=/usr MCS=/usr/bin/mono-csc
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-
-	libtoolize
-	aclocal
-	autoconf
-	automake --add-missing --copy	
-
-	./configure --prefix=/usr MCS=/usr/bin/mono-csc
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -fr autom4te.cache
-	[ ! -f Makefile ] || $(MAKE) distclean
-	find . -name "Makefile.in" | xargs rm -fr
-	dh_clean config.sub config.guess aclocal.m4
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/mono-debugger
+override_dh_install:
+	dh_install
 	cp $(CURDIR)/debian/mdb.exe.config $(CURDIR)/debian/mono-debugger/usr/lib/mono/2.0/
 	rm $(CURDIR)/debian/mono-debugger/usr/lib/*.so
 	rm $(CURDIR)/debian/mono-debugger/usr/lib/*.la
 
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_clifixperms
+override_dh_makeshlibs:
 	dh_makeshlibs -V
+
+override_dh_makeclilibs:
 	dh_makeclilibs -r
-	dh_installdeb
-	dh_shlibdeps
-	dh_clideps -d
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
+override_dh_auto_test:
 
 get-orig-source:
 	uscan \
@@ -93,4 +38,5 @@ get-orig-source:
 		--force-download \
 		--rename
 
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+	dh --with autoreconf $@

-- 
mono-debugger



More information about the Pkg-mono-svn-commits mailing list