[Pkg-mozext-commits] [SCM] Packaging for flashblock branch, master, updated. b19b89b06d8477fa49a85c00845a4c96ef8d3d8c
Alexander GQ Gerasiov
gq at cs.msu.su
Mon Dec 5 22:07:08 UTC 2011
The following commit has been merged in the master branch:
commit 39d0d9a56d280f50954adaeda52bdaca9d71dfd4
Author: Alexander GQ Gerasiov <gq at cs.msu.su>
Date: Mon Nov 23 04:32:19 2009 +0300
Version 1.5.11-1.
Not the best idea to commit all changes at once, but...
* Imported Upstream version 1.5.11
* med-xpi-unpack and original xpi used instead of import from cvs.
* Bring package under maintenance of Debian Mozilla Extension Maintainers.
* Bump Standard's version to 3.8.3
* Binary package renamed according to DebMozExtTeam. Old package's name left
in Conflicts/Replaces.
* debian/control updated to use mozilla-devscripts power.
* debian/rules reduced to drop all staff related to cvs import.
* debian/copyright replaced with machine-readable one.
* Finally upload to Debian (Closes: #469906).
Signed-off-by: Alexander GQ Gerasiov <gq at cs.msu.su>
diff --git a/debian/changelog b/debian/changelog
index cf8de03..d311dd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+flashblock (1.5.11-1) unstable; urgency=low
+
+ * Imported Upstream version 1.5.11
+ * med-xpi-unpack and original xpi used instead of import from cvs.
+ * Bring package under maintenance of Debian Mozilla Extension Maintainers.
+ * Bump Standard's version to 3.8.3
+ * Binary package renamed according to DebMozExtTeam. Old package's name left
+ in Conflicts/Replaces.
+ * debian/control updated to use mozilla-devscripts power.
+ * debian/rules reduced to drop all staff related to cvs import.
+ * debian/copyright replaced with machine-readable one.
+ * Finally upload to Debian (Closes: #469906).
+
+ -- Alexander GQ Gerasiov <gq at debian.org> Mon, 23 Nov 2009 02:24:00 +0300
+
flashblock (1.3.14~a2+snapshot20090627-0ubuntu1) karmic; urgency=low
* New upstream release
@@ -82,6 +97,6 @@ flashblock (1.3.9a-0ubuntu1) hardy; urgency=low
flashblock (1.3.9a-1) unstable; urgency=low
- * Initial release from CVS checkout (Closes: #469906)
+ * Initial release from CVS checkout
-- Philippe Coval <rzr at users.sf.net> Sun, 16 Mar 2008 14:17:35 +0100
diff --git a/debian/control b/debian/control
index 9f6ec3c..ecfbfba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,22 @@
Source: flashblock
Section: web
Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
-XSBC-Original-Maintainer: Philippe Coval <rzr at gna.org>
-Build-Depends: debhelper (>= 5), zip, cdbs, mozilla-devscripts (>= 0.5~)
-Standards-Version: 3.8.0
+Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers at lists.alioth.debian.org>
+Uploaders: Alexander GQ Gerasiov <gq at debian.org>, Philippe Coval <rzr at gna.org>
+Build-Depends: debhelper (>= 7), cdbs, mozilla-devscripts (>= 0.16~)
+Standards-Version: 3.8.3
Homepage: http://flashblock.mozdev.org
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/flashblock.ubuntu/
+Vcs-Git: git://git.debian.org/pkg-mozext/flashblock.git
+Vcs-Browser: http://git.debian.org/?p=pkg-mozext/flashblock.git;a=summary
-Package: flashblock
+Package: xul-ext-flashblock
Architecture: all
-Depends: ${misc:Depends},firefox | abrowser | abrowser-3.5 | firefox-3.5 | firefox-3.0, apturl (>= 0.1.2ubuntu1) | midbrower
-Enhances: flashplugin-nonfree
+Depends: ${misc:Depends}
+Recommends: ${xpi:Recommends}
+Provides: ${xpi:Provides}
+Enhances: ${xpi:Enhances}
+Conflicts: flashblock (<< 1.5.11)
+Replaces: flashblock (<< 1.5.11)
Description: mozilla extension that replaces flash elements with a button
An extension for Firefox, Seamonkey and similar web browsers which blocks
all Adobe/Macromedia Flash content from loading, leaving placeholders on
diff --git a/debian/copyright b/debian/copyright
index 6d691ae..5c7fb29 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,68 +1,32 @@
-This package was debianized by Philippe Coval <rzr at gna.org> on
-Fri, 07 Mar 2008 21:16:53 +0100.
+Format-Specification:
+ http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Name: flashblock
+Maintainer: Ted Mielczarek <luser_mozdev at perilith.com>
+Source: http://flashblock.mozdev.org
+
+Files: *
+Copyright: 2004-2009 Ted Mielczarek <luser_mozdev at perilith.com>
+ Ted Drake
+ Przemyslaw Bialik
+ Lorenzo Colitti
+ Philip Chee <philip.chee at gmail.com>
+License: MPL-1.1 or GPL-2 or LGPL-2.1
+
+Files: debian/*
+Copyright: 2008-2009 Philippe Coval <rzr at gna.org>
+ 2009 Alexander GQ Gerasiov <gq at debian.org>
+License: MPL-1.1 or GPL-2 or LGPL-2.1
+
+License: MPL-1.1
+ You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ The copy of this License is also available in 'MPL' file shipped with this
+ package.
+
+License: GPL-2
+ On Debian systems the full text of the GNU General Public
+ License can be found in the `/usr/share/common-licenses/GPL-2' file.
+
+License: LGPL-2.1
+ On Debian systems the full text of the GNU General Public
+ License can be found in the `/usr/share/common-licenses/LGPL-2.1' file.
-It was downloaded from http://flashblock.mozdev.org
-Through CVS :pserver:guest at mozdev.org:/cvs co flashblock/sources (# guest)
-
-Upstream Author:
-
- Ted Mielczarek <luser_mozdev at perilith.com>.
-
-Copyright:
-
- Copyright (C) 2004 Ted Mielczarek
-
-License:
-
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this collection are subject to
- the Mozilla Public License Version 1.1 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is the "Flashblock" extension for Mozilla and Firefox.
-
- The Initial Developer of the Original Code is
- Ted Mielczarek <luser_mozdev at perilith.com>.
-
- Portions created by the Initial Developer are Copyright (C) 2004
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Ted Drake
- Przemyslaw Bialik
- Lorenzo Colitti
- Philip Chee <philip.chee at gmail.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
-
- On Debian systems, the complete text of the GNU General Public
- License v2 can be found in the file `/usr/share/common-licenses/GPL-2' ;
- the complete text of the GNU Lesser General Public License v2.1 can be
- found in the file `/usr/share/common-licenses/LGPL-2.1'.
-
- The complete text of the Mozilla Public License can be found in the MPL
- file in the same directory as this file.
-
-The Debian packaging is (C) 2008, Philippe Coval <rzr at gna.org> and
-is licensed under the GPL-2/LGPL-2.1/MPL-1.1, see :
- `/usr/share/common-licenses/GPL-2' ,
- `/usr/share/common-licenses/LGPL-2.1' and as above for MPL.
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 0c39303..0000000
--- a/debian/links
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/flashblock usr/lib/iceweasel/extensions/{3d7eb24f-2740-49df-8937-200b1cc08f8a}
-usr/share/flashblock usr/lib/firefox-addons/extensions/{3d7eb24f-2740-49df-8937-200b1cc08f8a}
-usr/share/flashblock usr/lib/midbrowser/extensions/{3d7eb24f-2740-49df-8937-200b1cc08f8a}
-usr/share/flashblock usr/lib/seamonkey/extensions/{3d7eb24f-2740-49df-8937-200b1cc08f8a}
diff --git a/debian/rules b/debian/rules
index 59be2f5..768fe76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,6 @@
#!/usr/bin/make -f
-# Name of the binary package containing the extension
-MOZ_EXTENSION_PKG := flashblock
-
-# xpi.mk will run a build command before packaging an .xpi file. you can use this
-# to produce an .xpi. if you define this, the clean rule will remove any .xpi file
-# found in the top level directory
-MOZ_XPI_BUILD_COMMAND = sh firefox-xpi.sh
-
-DEB_INSTALL_DOCS_ALL := debian/MPL
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/mozilla-devscripts/xpi.mk
-PACKAGE?=${MOZ_EXTENSION_PKG}
-
-SNAPSHOT_DATE?=$(shell dpkg-parsechangelog | grep Version: | sed -e "s/.*snapshot\(.*\)-.*/\1/g")
-VERSION=$(shell dpkg-parsechangelog | grep Version: | sed -e "s/Version: \(.*snapshot.*\)-.*/\1/g")
-CVSROOT=":pserver:guest at mozdev.org:/cvs" # at login prompt type "guest" password
-ORIG_DIR?=..
-
-get-orig-source:
- mkdir -p "${ORIG_DIR}/tmp"
- cd "${ORIG_DIR}/tmp" \
- && echo "pass=guest" && cvs -d ${CVSROOT} login \
- && cvs -d ${CVSROOT} co -D ${SNAPSHOT_DATE} "${PACKAGE}/source" \
- && sync && mv "${PACKAGE}/source" "${PACKAGE}-${VERSION}" \
- && tar cfz "../${PACKAGE}_${VERSION}.orig.tar.gz" --exclude "CVS" \
- "${PACKAGE}-${VERSION}"
-
-#eof "$Id: flashblock/debian/rules $"
+DEB_INSTALL_DOCS_ALL := debian/MPL
--
Packaging for flashblock
More information about the Pkg-mozext-commits
mailing list