[Pkg-mozext-commits] [firetray] 76/84: Use Files-Excluded feature of uscan

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firetray.

commit 0beeb55781f4a18d3a2696500ee5f688ba007435
Author: David Prévot <taffit at debian.org>
Date:   Sat Jul 19 15:58:42 2014 -0400

    Use Files-Excluded feature of uscan
---
 debian/README.source | 33 ---------------------------------
 debian/copyright     |  5 +++++
 debian/gbp.conf      | 10 ----------
 debian/watch         |  2 +-
 4 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 7592869..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,33 +0,0 @@
-firetray for Debian
--------------------
-
-The upstream firetray source code was repacked. All non-free icons
-were removed.
-
-This packages tracks the upstream Git repository as part of its sources.
-
-It follows git-buildpackage advices as on:
-<http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.UPSTREAM.GIT.TARBALL>
-The tarball created from Git is recorded using pristine-tar.
-
-A quick summary of how one can update the Debian packaging of
-xul-ext-firetray, assuming that one already has the appropriate
-build-dependencies, `devscripts`, `pristine-tar`, and `git-buildpackage`
-installed. $VERSION is assumed to be the new upstream version:
-
-    gbp clone git+ssh://git.debian.org/git/pkg-mozext/firetray.git
-    cd firetray
-    git checkout dfsg-clean
-    git remote add upstream https://github.com/foudfou/FireTray/
-
-    uscan --verbose --rename
-    git fetch upstream
-    git checkout master
-    gbp import-orig --upstream-vcs-tag=v$VERSION ../firetray_$VERSION.orig.tar.gz
-    git tag -s dfsg-clean/$VERSION -m"Create dfsg-clean version $VERSION" dfsg-clean
-    git checkout master
-    git merge dfsg-clean/$VERSION
-
-    [ Make here some adaptations, like updating debian/patches, if needed ]
-
-    gbp buildpackage
diff --git a/debian/copyright b/debian/copyright
index 5b79009..8846c08 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FireTray
 Source: https://github.com/foudfou/FireTray/releases
 Upstream-Contact: Foudil Brétel <foudil.newbie+amo at gmail.com>
+Files-Excluded:  src/chrome/skin/icons/img/firefox22.png
+                 src/chrome/skin/icons/img/seamonkey22.png
+                 src/chrome/skin/icons/img/thunderbird22.png
+                 testing/firefox.xpm
+                 testing/firefox32.png
 
 Files: *
 Copyright: 2011, Foudil Brétel <foudil.newbie+amo at gmail.com>
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index c3c3ebe..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[gbp-buildpackage]
-upstream-tag = dfsg-clean/%(version)s
-pristine-tar-commit = True
-compression = xz
-
-[gbp-dch]
-upstream-tag = dfsg-clean/%(version)s
-
-[gbp-import-orig]
-debian-branch = dfsg-clean
diff --git a/debian/watch b/debian/watch
index fc14afe..2154ea0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-options="uversionmangle=s/a/~alpha/i;s/b/~beta/i;s/rc/~rc/i" \
+options="uversionmangle=s/a/~alpha/i;s/b/~beta/i;s/rc/~rc/i;s/$/+dfsg/" \
 https://github.com/foudfou/FireTray/releases .*/v?(\d[\d\.]*\w*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git