[Pkg-cli-apps-commits] [SCM] XML Schema Definition (XSD) diagram viewer branch, master, updated. debian/0.9-2-8-g9c4ff97

[Mathieu Malaterre]

The following commit has been merged in the master branch:
commit 9c4ff9799685093f0720d27d6c6ca8156dc740e4
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Mon Apr 9 16:56:17 2012 +0200

    Prepare for next release

diff --git a/ILMerge.exe b/ILMerge.exe
deleted file mode 100644
index bdd546a..0000000
Binary files a/ILMerge.exe and /dev/null differ
diff --git a/XSDDiagram.exe b/XSDDiagram.exe
deleted file mode 100644
index b6687f8..0000000
Binary files a/XSDDiagram.exe and /dev/null differ
diff --git a/XSDDiagram.pdb b/XSDDiagram.pdb
deleted file mode 100644
index ed48609..0000000
Binary files a/XSDDiagram.pdb and /dev/null differ
diff --git a/XSDDiagramConsole.exe b/XSDDiagramConsole.exe
deleted file mode 100644
index 3751fe4..0000000
Binary files a/XSDDiagramConsole.exe and /dev/null differ
diff --git a/debian/control b/debian/control
index 580cd08..b2b82c6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.5.7), quilt (>= 0.46-7~)
+Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.8~)
 Build-Depends-Indep: mono-devel, mono-xbuild
 Standards-Version: 3.9.3
 Homepage: http://regis.cosnier.free.fr/?page=XSDDiagram
diff --git a/debian/copyright b/debian/copyright
index f0f8254..f86ca1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Name: XSDDiagram
 Maintainer: Regis Cosnier
 Upstream-Source: http://regis.cosnier.free.fr/?page=XSDDiagram
@@ -8,7 +8,7 @@ Copyright: 2006-2008 Regis COSNIER
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2010, Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Copyright: 2010-2012, Mathieu Malaterre <malat at debian.org>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/patches/series b/debian/patches/series
index 5af60ee..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-use_default_framework.patch
diff --git a/debian/rules b/debian/rules
index b582f76..0cf9acb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/cli-common/cli.make
-include /usr/share/quilt/quilt.make
-
 VER_MAJOR = 0
 VER_MINOR = 10
 
@@ -18,14 +15,31 @@ $(UPSTREAM_SRC).zip:
 get-orig-source: $(UPSTREAM_SRC).zip
 	mkdir $(DEBIAN_SRC_DIR)
 	unzip $(UPSTREAM_SRC).zip -d $(DEBIAN_SRC_DIR)
+	# remove junk files:
+	find $(DEBIAN_SRC_DIR) -name "*.exe" -delete
+	find $(DEBIAN_SRC_DIR) -name "*.pdb" -delete
 	GZIP="--best --no-name" tar czf $(DEBIAN_SRC_TAR) $(DEBIAN_SRC_DIR)
 	rm -rf $(DEBIAN_SRC_DIR)
 
+#debian/xsddiagram.1:
+#	help2man --output=debian/xsddiagram.1 --no-info xsddiagram
+
+override_dh_auto_clean:
+	find . -type f -name *.exe -delete
+	find . -type f -name *.mdb -delete
+	find . -type f -name *.dll -delete
+	rm -rf xsddiagram/obj/
+	rm -rf obj/
+	rm XSDDiagramConsole/bin/Debug/XSDDiagramConsole.exe.config
+	rm XSDDiagramConsole/obj/Debug/XSDDiagramConsole2010.csproj.FilesWrittenAbsolute.txt
+	rm XSDDiagrams/obj/Debug/XSDDiagrams2010.csproj.FilesWrittenAbsolute.txt
+	rm bin/Debug/XSDDiagram.exe.config
+
 override_dh_auto_build:
-	MONO_IOMAP=all xbuild $(CURDIR)/XSDDiagram.sln
+	MONO_IOMAP=all xbuild $(CURDIR)/XSDDiagram2010.sln
 
 override_dh_auto_install:
 	install -D -m0755 $(CURDIR)/debian/xsddiagram.sh $(CURDIR)/debian/xsddiagram/usr/bin/xsddiagram
 
 %:
-	dh --with quilt $@
+	dh $@ --with cli
diff --git a/debian/xsddiagram.install b/debian/xsddiagram.install
index c3b6504..cf68bd9 100644
--- a/debian/xsddiagram.install
+++ b/debian/xsddiagram.install
@@ -1,3 +1,4 @@
 bin/Debug/XSDDiagram.exe usr/lib/xsddiagram
+bin/Debug/XSDDiagrams.dll usr/lib/cli
 debian/xsddiagram.xpm usr/share/pixmaps
 debian/xsddiagram.desktop usr/share/applications

-- 
XML Schema Definition (XSD) diagram viewer