7 files changed, 26 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 3dac305ec8..10cf61b8c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+mono (1.1.10-1) unstable; urgency=low
+
+  * New upstream release
+  * Mirco 'meebey' Bauer
+    + debian/patches/00list:
+      - Removed fix_xsp2_inherits, already applied upstream.
+      - Removed datetime_doparse_fix, already applied upstream.
+      - Removed s390_compile_fix, already applied upstream.
+      - Removed 64bit_implicit_pointer_cast_fix, already applied upstream.
+    + debian/mono-mcs.manpages:
+      - Added mozroots.1
+    + debian/mono-classlib-1.0.install:
+      - Added dotnet.pc
+    + debian/control:
+      - Added libgdiplus to "Recommends" of mono. (Closes: #333851)
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Sat, 12 Nov 2005 21:54:15 +0200
+
 mono (1.1.9.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 0e2e190614..0000a51497 100644
--- a/debian/control
+++ b/debian/control
@@ -37,13 +37,14 @@ Description: fast CLI (.NET) JIT compiler for Mono
 Package: mono
 Architecture: i386 powerpc amd64 ia64
 Depends: mono-common (= ${Source-Version}), mono-jit (= ${Source-Version})
+Recommends: libgdiplus
 Description: Mono CLI (.NET) runtime
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
  Mono provides a complete .NET CLR including compiler and runtime, which can
  produce and execute CIL bytecode (assemblies), and a .NET class library.
  .
- mono is a metapackage containing dependencies for the runtime of  Mono.
+ mono is a metapackage containing dependencies for the runtime of Mono.
  If you do not need all of them (or try to work around X11
  dependencies), install the core packages manually: mono-jit, mono-mcs or
  mono-utils.
diff --git a/debian/mono-classlib-1.0.install b/debian/mono-classlib-1.0.install
index ca6cf8152d..497e54c14b 100644
--- a/debian/mono-classlib-1.0.install
+++ b/debian/mono-classlib-1.0.install
@@ -1,9 +1,10 @@
 debian/tmp/usr/lib/mono/gac/*/1.0.*/
 debian/tmp/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/
-debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/
+debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.JScript/7.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/7.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/
 debian/tmp/usr/lib/mono/gac/cscompmgd/7.0.*/
 debian/tmp/usr/lib/mono/1.0/
+debian/tmp/usr/lib/pkgconfig/dotnet.pc
diff --git a/debian/mono-classlib-2.0.install b/debian/mono-classlib-2.0.install
index c058fee2fd..b1873d3726 100644
--- a/debian/mono-classlib-2.0.install
+++ b/debian/mono-classlib-2.0.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/lib/mono/gac/*/2.0.*/
 debian/tmp/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/
-debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/
+debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.JScript/8.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/8.0.*/
 debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/
diff --git a/debian/mono-mcs.manpages b/debian/mono-mcs.manpages
index ff0a113ffb..ddc7bce303 100644
--- a/debian/mono-mcs.manpages
+++ b/debian/mono-mcs.manpages
@@ -17,6 +17,7 @@ debian/tmp/usr/share/man/man1/mkbundle.1
 debian/tmp/usr/share/man/man1/mono-service.1
 debian/tmp/usr/share/man/man1/mono-shlib-cop.1
 debian/tmp/usr/share/man/man1/monop.1
+debian/tmp/usr/share/man/man1/mozroots.1
 debian/tmp/usr/share/man/man1/permview.1
 debian/man/resgen.1
 debian/tmp/usr/share/man/man1/secutil.1
diff --git a/debian/patches/00list b/debian/patches/00list
index 40ad351ce5..f449ec64a9 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1 @@
 remove_broken_dllmap_from_mono-shlib-cop
-datetime_doparse_fix
-s390_compile_fix
-64bit_implicit_pointer_cast_fix
-fix_xsp2_inherits
diff --git a/debian/rules b/debian/rules
index 5897af3666..1c0d48b010 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,8 @@ install: build
 	rm -f debian/tmp/usr/bin/prj2make
 	rm -f debian/usr/share/man/man1/prj2make.1
 	rm -f debian/tmp/usr/lib/mono/1.0/prj2make.exe*
+	# there is no xbuild.exe thus we don't want the wrapper script
+	rm -f debian/tmp/usr/bin/xbuild
 	install -D -m755 cli-wrapper debian/mono-common/usr/bin/cli-wrapper
 	cd debian/detector && \
 	  $(MAKE) && install -D -m755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli