[Pkg-mozext-commits] [SCM] synchronice Bookmarks and Passwords via WebDAV branch, master, updated. debian/4.1.2-1.1-1-ge7514b3

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit e7514b3bcf97448a45de0f3d2ec93a17ef326698
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Mon Feb 6 15:41:10 2012 +0100

    Team upload
    
    * Team upload
    * Removed no more necessary debian-changes-4.1.2-1.0 patch (Closes: #656961)
    * Bump Standard-Versions to 3.9.2 (no changes needed)
    * Updated d/copyright to latest .174 revision
    * Removed Conflicts: iceweasel (<< 3.0) from d/control

diff --git a/debian/changelog b/debian/changelog
index 1078ce8..062796b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+syncplaces (4.1.2-2) UNRELEASED; urgency=low
+
+  * Team upload
+  * Removed no more necessary debian-changes-4.1.2-1.0 patch (Closes: #656961)
+  * Bump Standard-Versions to 3.9.2 (no changes needed)
+  * Updated d/copyright to latest .174 revision
+  * Removed Conflicts: iceweasel (<< 3.0) from d/control
+
+ -- Fabrizio Regalli <fabreg at fabreg.it>  Mon, 06 Feb 2012 15:19:29 +0100
+
 syncplaces (4.1.2-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index fcfa2f3..99f4275 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
 Uploaders: Roman V. Nikolaev <rshadow at rambler.ru>
 Build-Depends: cdbs, debhelper (>= 7), mozilla-devscripts (>= 0.16~)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.andyhalford.com/syncplaces/index.html
 Vcs-Git: git://git.debian.org/pkg-mozext/syncplaces.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mozext/syncplaces.git;a=summary
@@ -12,7 +12,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-mozext/syncplaces.git;a=summary
 Package: xul-ext-syncplaces
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: iceweasel (<< 3.0)
 Recommends: ${xpi:Recommends}
 Provides: ${xpi:Provides}
 Enhances: ${xpi:Enhances}
diff --git a/debian/copyright b/debian/copyright
index c71ac41..7358ee3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: SyncPlaces
-Mainteiner: Andy Halford <syncplaces at andyhalford.com>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: SyncPlaces
+Upstream-Contact: Andy Halford <syncplaces at andyhalford.com>
 Source: http://www.andyhalford.com/syncplaces/index.html
 
 Files: *
diff --git a/debian/patches/debian-changes-4.1.2-1.0 b/debian/patches/debian-changes-4.1.2-1.0
deleted file mode 100644
index 611c151..0000000
--- a/debian/patches/debian-changes-4.1.2-1.0
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Upstream changes introduced in version 4.1.2-1.0
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- syncplaces (4.1.2-1.0) unstable; urgency=low
- .
-   * Non-maintainer upload.
-   * New upstream version (compatible with iceweasel 4.0).
- .
- The person named in the Author field signed this changelog entry.
-Author: Dmitry E. Oboukhov <unera at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- syncplaces-4.1.2.orig/install.rdf
-+++ syncplaces-4.1.2/install.rdf
-@@ -33,7 +33,7 @@
- 			<Description>
- 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- 				<em:minVersion>3.0</em:minVersion>
--				<em:maxVersion>4.0.*</em:maxVersion>
-+				<em:maxVersion>7.*</em:maxVersion>
- 			</Description>
- 		</em:targetApplication>
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d89de3d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes-4.1.2-1.0
diff --git a/install.rdf b/install.rdf
index 1048ca8..7936e75 100644
--- a/install.rdf
+++ b/install.rdf
@@ -33,7 +33,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>3.0</em:minVersion>
-				<em:maxVersion>7.*</em:maxVersion>
+				<em:maxVersion>4.0.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 

-- 
synchronice Bookmarks and Passwords via WebDAV