[Pkg-cli-apps-commits] [SCM] pinta branch, master, updated. debian/0.2-1-3-g4f7b88c

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 4f7b88c7e2f148d3e6fca89aa45395a19ada7f9b
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Wed May 5 20:42:54 2010 +0200

    Various changes (removed quilt, debsrc1.0 etc), TODO copyright

diff --git a/debian/changelog b/debian/changelog
index c71095e..26ee845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pinta (0.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/force_unicode: Merged upstream
+  * debian/{control/rules): Remove quilt references
+  * debian/source/format: Specify 1.0 explicitly
+  // TODO: copyright 
+
+ -- Stefan Ebner <sebner at ubuntu>  Wed, 05 May 2010 20:28:45 +0200
+
 pinta (0.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #569171)
diff --git a/debian/control b/debian/control
index ff32355..c7f2f13 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: Iain Lane <laney at ubuntu.com>
-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.5.7)
 Build-Depends-Indep: mono-devel (>= 2.4.3),
                      mono-xbuild (>= 2.4.3),
                      libgtk2.0-cil-dev
diff --git a/debian/format b/debian/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/format
@@ -0,0 +1 @@
+1.0
diff --git a/debian/patches/force_unicode b/debian/patches/force_unicode
deleted file mode 100644
index 7bafcd8..0000000
--- a/debian/patches/force_unicode
+++ /dev/null
@@ -1,67 +0,0 @@
-Description: Force source files to be treated as unicode
-Origin: vendor, Debian
-Author: Iain Lane <laney at ubuntu.com>
-Last-Updated: 2010-03-14
-
-Index: pinta.git/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
-===================================================================
---- pinta.git.orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2010-03-13 18:20:01.547274363 +0000
-+++ pinta.git/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2010-03-14 14:42:45.086023080 +0000
-@@ -10,6 +10,7 @@
-     <RootNamespace>Pinta.Gui.Widgets</RootNamespace>
-     <AssemblyName>Pinta.Gui.Widgets</AssemblyName>
-     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <CodePage>65001</CodePage>
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-     <DebugSymbols>true</DebugSymbols>
-@@ -55,4 +56,4 @@
-     <Compile Include="Dialogs\SimpleEffectDialog.cs" />
-   </ItemGroup>
-   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
--</Project>
-\ No newline at end of file
-+</Project>
-Index: pinta.git/Pinta/Pinta.csproj
-===================================================================
---- pinta.git.orig/Pinta/Pinta.csproj	2010-03-13 18:20:01.557272951 +0000
-+++ pinta.git/Pinta/Pinta.csproj	2010-03-14 14:42:45.086023080 +0000
-@@ -10,6 +10,7 @@
-     <RootNamespace>Pinta</RootNamespace>
-     <AssemblyName>Pinta</AssemblyName>
-     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <CodePage>65001</CodePage>
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-     <DebugSymbols>true</DebugSymbols>
-Index: pinta.git/Pinta.Resources/Pinta.Resources.csproj
-===================================================================
---- pinta.git.orig/Pinta.Resources/Pinta.Resources.csproj	2010-03-13 18:20:01.547274363 +0000
-+++ pinta.git/Pinta.Resources/Pinta.Resources.csproj	2010-03-14 14:42:45.086023080 +0000
-@@ -10,6 +10,7 @@
-     <RootNamespace>Pinta.Resources</RootNamespace>
-     <AssemblyName>Pinta.Resources</AssemblyName>
-     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <CodePage>65001</CodePage>
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-     <DebugSymbols>true</DebugSymbols>
-@@ -325,4 +326,4 @@
-     </EmbeddedResource>
-   </ItemGroup>
-   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
--</Project>
-\ No newline at end of file
-+</Project>
-Index: pinta.git/Pinta.Core/Pinta.Core.csproj
-===================================================================
---- pinta.git.orig/Pinta.Core/Pinta.Core.csproj	2010-03-14 14:42:50.747273667 +0000
-+++ pinta.git/Pinta.Core/Pinta.Core.csproj	2010-03-14 14:42:54.436023126 +0000
-@@ -10,6 +10,7 @@
-     <RootNamespace>Pinta.Core</RootNamespace>
-     <AssemblyName>Pinta.Core</AssemblyName>
-     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-+    <CodePage>65001</CodePage>
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-     <DebugSymbols>true</DebugSymbols>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d81f15c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-force_unicode
diff --git a/debian/rules b/debian/rules
index 9a4d1ef..2b5ee35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cli-common/cli.make
-include /usr/share/quilt/quilt.make
 
 override_dh_auto_build:
 	xbuild $(CURDIR)/Pinta.sln
@@ -18,4 +17,4 @@ override_dh_auto_clean:
 	$(CURDIR)/bin/
 
 %:
-	dh --with quilt $@
+	dh $@

-- 
pinta