[Pkg-anonymity-tools] [torbrowser-launcher] 04/06: update for new upstream version

[Holger Levsen]

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

holger pushed a commit to branch debian
in repository torbrowser-launcher.

commit 9a19edab78bb0161eec0e83e7b1d0b4a86e132c2
Author: u451f <u at 451f.org>
Date:   Tue Jul 22 01:16:37 2014 +0200

    update for new upstream version
---
 debian/changelog | 24 ++++++++++++++++++++++++
 debian/control   |  8 ++++----
 debian/rules     |  7 ++++++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93b2ae3..05f30a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+torbrowser-launcher (0.1.1-1.1) unstable; urgency=low
+
+  [ Ulrike Uhlig ]
+    * Non-maintainer upload in coordination with maintainer.
+    * New upstream version.
+    * debian/control:
+        * Adding myself to uploaders.
+        * Adding Vcs-Browser now pointing to upstream debian/ branch.
+        * restricting Architecture to i386 and amd64 (Closes: #752240)
+        * Build dependency dh-apparmor added.
+    * debian/rules:
+        * use dh_apparmor (Closes: #751449)
+
+ --  Ulrike Uhlig <u at 451f.org>  Mon, 21 Jul 2014 23:06:57 +0200
+
+torbrowser-launcher (0.1.0-1.2) unstable; urgency=low
+
+  [ Ulrike Uhlig ]
+    * Non-maintainer upload in coordination with maintainer.
+    * debian/control:
+      - Deleted problematic Vcs-Git and Vcs-Browser information.
+
+ --  Ulrike Uhlig <u at 451f.org>  Sun, 06 Jul 2014 16:00:51 +0200
+
 torbrowser-launcher (0.1.0-1.1) unstable; urgency=low
 
   [ Ulrike Uhlig ]
diff --git a/debian/control b/debian/control
index e739ae0..5f3bf35 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
 Source: torbrowser-launcher
 Maintainer: Jacob Appelbaum <jacob at appelbaum.net>
+Uploaders: Ulrike Uhlig <u at 451f.org>
 Section: contrib/python
 Priority: optional
-Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 7.4.3)
+Build-Depends: python-all (>= 2.6.6-3), debhelper (>= 7.4.3), dh-apparmor
 Standards-Version: 3.9.5
 Homepage: https://micahflee.com/torbrowser-launcher/
-Vcs-Git: git://github.com/micahflee/torbrowser-launcher.git
-Vcs-Browser: https://github.com/micahflee/torbrowser-launcher.git
+Vcs-Browser: https://github.com/micahflee/torbrowser-launcher/tree/debian
 
 Package: torbrowser-launcher
-Architecture: all
+Architecture: i386 amd64
 Depends: ${misc:Depends}, ${python:Depends}, python-gtk2, python-psutil, python-twisted, python-lzma, python-pygame, gnupg, wmctrl, python-txsocksx, python-parsley
 Suggests: apparmor
 Description: helps download, update and run the Tor Browser Bundle
diff --git a/debian/rules b/debian/rules
index e0e64f5..0258b14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,9 @@
 %:
 	dh $@ --with python2 --buildsystem=python_distutils
 
-
+override_dh_install:
+	cp apparmor/usr.bin.torbrowser-launcher debian/torbrowser-launcher/etc/apparmor.d/usr.bin.torbrowser-launcher
+	cp apparmor/torbrowser.Tor.tor debian/torbrowser-launcher/etc/apparmor.d/torbrowser.Tor.tor
+	cp apparmor/torbrowser.start-tor-browser debian/torbrowser-launcher/etc/apparmor.d/torbrowser.start-tor-browser
+	cp apparmor/torbrowser.Browser.firefox debian/torbrowser-launcher/etc/apparmor.d/torbrowser.Browser.firefox
+	dh_apparmor --profile-name=usr.bin.torbrowser-launcher -ptorbrowser-launcher

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/torbrowser-launcher.git