Your message dated Mon, 19 Jun 2017 11:08:17 +0000
with message-id <e1dmuxz-000fmv...@fasolo.debian.org>
and subject line Bug#858526: fixed in ublock-origin 1.12.4+dfsg-1
has caused the Debian Bug report #858526,
regarding ublock-origin: Build the chromium extension
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
858526: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858526
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: ublock-origin
Severity: wishlist
Tags: patch

After reading <20170322205820.kizersirlmrph...@hephaestus.silentflame.com>
I figured I would try to build the Chromium extension.  It appears to be
fairly straight forward, so I offer up the attached patch.

I've tried to mimic the intentions of the Firefox packaging, but feel
free to make any changes you deem necessary.  I've never really looked
at the internals of extensions before, so this was cobbled together by
referencing the structure of chromium-lwn4chrome.  I did give it a test
run and it seems to work as expected.

-- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
From 66aef6cf4c1bd2eb0a951df84c2ba185c4096ab7 Mon Sep 17 00:00:00 2001
From: James McCoy <james...@debian.org>
Date: Wed, 22 Mar 2017 21:01:28 -0400
Subject: [PATCH] Add support for chromium

---
 debian/chromium-ublock-origin.docs                        |  1 +
 debian/chromium-ublock-origin.install                     |  2 ++
 debian/chromium/ublock-origin                             |  2 ++
 debian/control                                            | 15 +++++++++++++++
 debian/patches/0003-patch-make-assets.sh-for-Debian.patch |  7 +++++--
 debian/rules                                              |  9 ++++++++-
 debian/{docs => xul-ext-ublock-origin.docs}               |  0
 7 files changed, 33 insertions(+), 3 deletions(-)
 create mode 120000 debian/chromium-ublock-origin.docs
 create mode 100644 debian/chromium-ublock-origin.install
 create mode 100755 debian/chromium/ublock-origin
 rename debian/{docs => xul-ext-ublock-origin.docs} (100%)

diff --git a/debian/chromium-ublock-origin.docs 
b/debian/chromium-ublock-origin.docs
new file mode 120000
index 00000000..dc5c60a0
--- /dev/null
+++ b/debian/chromium-ublock-origin.docs
@@ -0,0 +1 @@
+xul-ext-ublock-origin.docs
\ No newline at end of file
diff --git a/debian/chromium-ublock-origin.install 
b/debian/chromium-ublock-origin.install
new file mode 100644
index 00000000..c6711e46
--- /dev/null
+++ b/debian/chromium-ublock-origin.install
@@ -0,0 +1,2 @@
+dist/build/uBlock0.chromium/* usr/share/chromium/extensions/ublock-origin
+debian/chromium/ublock-origin etc/chromium.d
diff --git a/debian/chromium/ublock-origin b/debian/chromium/ublock-origin
new file mode 100755
index 00000000..955a996b
--- /dev/null
+++ b/debian/chromium/ublock-origin
@@ -0,0 +1,2 @@
+#!/bin/sh
+export CHROMIUM_FLAGS="${CHROMIUM_FLAGS} 
--load-extension=/usr/share/chromium/extensions/ublock-origin"
diff --git a/debian/control b/debian/control
index 4e5eb867..32863d43 100644
--- a/debian/control
+++ b/debian/control
@@ -22,3 +22,18 @@ Description: general-purpose lightweight ads, malware, 
trackers blocker
  .
  Compared to other blockers like AdBlock and Ghostery, ┬ÁBlock is focused on
  having a smaller memory and CPU footprint.
+ .
+ This package provides the Mozilla version of the addon.
+
+Package: chromium-ublock-origin
+Architecture: all
+Depends: ${misc:Depends}, fonts-font-awesome
+Recommends: chromium
+Description: general-purpose lightweight ads, malware, trackers blocker 
(Chromium)
+ uBlock is a small footprint blocker for against web ads, malware, trackers,
+ analytics and similar invasive items.
+ .
+ Compared to other blockers like AdBlock and Ghostery, ┬ÁBlock is focused on
+ having a smaller memory and CPU footprint.
+ .
+ This package provides the Chromium version of the addon.
diff --git a/debian/patches/0003-patch-make-assets.sh-for-Debian.patch 
b/debian/patches/0003-patch-make-assets.sh-for-Debian.patch
index c9e4caa0..3e7ac771 100644
--- a/debian/patches/0003-patch-make-assets.sh-for-Debian.patch
+++ b/debian/patches/0003-patch-make-assets.sh-for-Debian.patch
@@ -11,7 +11,7 @@ diff --git a/tools/make-assets.sh b/tools/make-assets.sh
 index fade452..49b5da0 100755
 --- a/tools/make-assets.sh
 +++ b/tools/make-assets.sh
-@@ -6,24 +6,16 @@ DES=$1/assets
+@@ -6,26 +6,18 @@ DES=$1/assets
  
  printf "*** Packaging assets in $DES... "
  
@@ -39,4 +39,7 @@ index fade452..49b5da0 100755
 +cp -R ./uAssets/filters/*                                       $DES/ublock/
  cp -R ./assets/ublock/filter-lists.json                          $DES/ublock/
  
- cp ../uAssets/checksums/ublock0.txt                              
$DES/checksums.txt
+-cp ../uAssets/checksums/ublock0.txt                              
$DES/checksums.txt
++cp ./uAssets/checksums/ublock0.txt                              
$DES/checksums.txt
+ 
+ echo "done."
diff --git a/debian/rules b/debian/rules
index ced99f91..d51925cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,16 @@
 
 override_dh_auto_build:
        ./tools/make-firefox.sh
+       ./tools/make-chromium.sh
        xpi-pack dist/build/uBlock0.firefox xul-ext-ublock-origin.xpi
 
 
 override_dh_auto_install:
        install-xpi xul-ext-ublock-origin.xpi -x LICENSE.txt
+       dh_install -p chromium-ublock-origin -X LICENSE.txt
+
+
+override_dh_install:
 
 
 override_dh_auto_clean:
@@ -29,9 +34,11 @@ override_dh_auto_clean:
 # installed with debian/xul-ext-ublock-origin.links (revert 020a17e
 # and then revert c14b5b3)
 override_dh_link:
-       dh_link -Xfontawesome-webfont.ttf
+       dh_link -p xul-ext-ublock-origin -Xfontawesome-webfont.ttf
        ln -sf /usr/share/fonts/truetype/font-awesome/fontawesome-webfont.ttf \
                
debian/xul-ext-ublock-origin/usr/share/xul-ext/ublock-origin/css/fonts/fontawesome-webfont.ttf
+       dh_link -p chromium-ublock-origin 
usr/share/fonts/truetype/font-awesome/fontawesome-webfont.ttf \
+               
usr/share/chromium/extensions/ublock-origin/css/fonts/fontawesome-webfont.ttf
 
 
 override_dh_installchangelogs:
diff --git a/debian/docs b/debian/xul-ext-ublock-origin.docs
similarity index 100%
rename from debian/docs
rename to debian/xul-ext-ublock-origin.docs
-- 
2.11.0


--- End Message ---
--- Begin Message ---
Source: ublock-origin
Source-Version: 1.12.4+dfsg-1

We believe that the bug you reported is fixed in the latest version of
ublock-origin, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 858...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sean Whitton <spwhit...@spwhitton.name> (supplier of updated ublock-origin 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Mon, 19 Jun 2017 11:34:01 +0100
Source: ublock-origin
Binary: xul-ext-ublock-origin chromium-ublock-origin ublock-origin-doc
Architecture: all source
Version: 1.12.4+dfsg-1
Distribution: unstable
Urgency: high
Maintainer: Debian Mozilla Extension Maintainers 
<pkg-mozext-maintainers@lists.alioth.debian.org>
Changed-By: Sean Whitton <spwhit...@spwhitton.name>
Closes: 857797 858526 859569
Description: 
 chromium-ublock-origin - general-purpose lightweight ads, malware, trackers 
blocker (Chrom
 ublock-origin-doc - general-purpose lightweight ads, malware, trackers blocker 
- docu
 xul-ext-ublock-origin - general-purpose lightweight ads, malware, trackers 
blocker
Changes:
 ublock-origin (1.12.4+dfsg-1) unstable; urgency=medium
 .
   * New upstream release.
   * Bump standards version to 4.0.0 (no changes required).
   * Refresh 0001-Disable-nonfree-filters-by-default.patch.
 .
 ublock-origin (1.11.4+dfsg-2) experimental; urgency=high
 .
   * Add missing Breaks/Replaces of ublock-origin-doc (Closes: #859569).
     Thanks Andreas Beckmann for reporting this error.
 .
 ublock-origin (1.11.4+dfsg-1) experimental; urgency=medium
 .
   * New upstream release.
   * Move larger media files to new -doc package (Closes: #857797).
   * Build the Chromium extension (Closes: #858526).
     Thanks to James McCoy for the patch.
     - New binary package: chromium-ublock-origin.
     - Update 0003-patch-make-assets.sh-for-Debian.patch.
   * Extend 0001-Disable-nonfree-filters-by-default.patch to apply to new
     file assets/assets.json.
   * Refresh other patches.
   * Bump debhelper compat & build-dep to 10.
Checksums-Sha1: 
 5dcbd8d554a159e06fc87ec52f0138ec70f2d65c 2347 ublock-origin_1.12.4+dfsg-1.dsc
 a6613676879ea072aea8a958798fe656684fef93 13352220 
ublock-origin_1.12.4+dfsg.orig.tar.xz
 3bf0a2339ac18bdc62672985c156dd7ebbc18d21 72080 
ublock-origin_1.12.4+dfsg-1.debian.tar.xz
 11ee0aeebc4ce7228ac756d945db36df0c7dd9ec 1134060 
chromium-ublock-origin_1.12.4+dfsg-1_all.deb
 40a9f2d89170fde70478f4f4d2a3a1b3ccaf9404 5773030 
ublock-origin-doc_1.12.4+dfsg-1_all.deb
 c41e275e13271a39bc91242ffde16c1261cdc8d5 7150 
ublock-origin_1.12.4+dfsg-1_i386.buildinfo
 1c07f6f0f2730c31f0f0a93525f6d3c6c0260269 1134162 
xul-ext-ublock-origin_1.12.4+dfsg-1_all.deb
Checksums-Sha256: 
 33713e3274ec2d10ad05793dd5231bfd2b16497b22f65cea9f5d2aecf954648d 2347 
ublock-origin_1.12.4+dfsg-1.dsc
 ebe2dedb8be676281555c9275c5cf0f8f934a3493de7e1956fac2d7e6ab1695f 13352220 
ublock-origin_1.12.4+dfsg.orig.tar.xz
 35e0ed1d6094ea2cac047bfba4d15948963df8755d844e05b264505b5fbc3d69 72080 
ublock-origin_1.12.4+dfsg-1.debian.tar.xz
 65f22f131d8344b3a261fb90dd5ffb911d1ae6a854c099e686af8da886834492 1134060 
chromium-ublock-origin_1.12.4+dfsg-1_all.deb
 5b1d77df6886bed6c77f2f2f2933ccb9014f61ac2e2cb9aa818b39261d9637b0 5773030 
ublock-origin-doc_1.12.4+dfsg-1_all.deb
 213f0c5c7f95a0ce8eb33418849780cb9d8ab590bcecdd6fd35feeca96690f24 7150 
ublock-origin_1.12.4+dfsg-1_i386.buildinfo
 cacda9b996db47fa8c446ccd181de4ab1146fc01af6aa5c105e516912b52b217 1134162 
xul-ext-ublock-origin_1.12.4+dfsg-1_all.deb
Files: 
 7a855e6a7ebc1654654006486104039b 2347 web optional 
ublock-origin_1.12.4+dfsg-1.dsc
 7b9369e32fad9b21fc09c69611ba2688 13352220 web optional 
ublock-origin_1.12.4+dfsg.orig.tar.xz
 ea3c5cec90f0852fd51048d8477bbb49 72080 web optional 
ublock-origin_1.12.4+dfsg-1.debian.tar.xz
 fa4f5c12f1382d435918b782cdfe409d 1134060 web optional 
chromium-ublock-origin_1.12.4+dfsg-1_all.deb
 91a37793ad00827f1d959eae3e4675d7 5773030 doc optional 
ublock-origin-doc_1.12.4+dfsg-1_all.deb
 4a615c466b8a7a4d8b320b5dee475610 7150 web optional 
ublock-origin_1.12.4+dfsg-1_i386.buildinfo
 b31ccb4ae576cdb1c8921dd7089e36ae 1134162 web optional 
xul-ext-ublock-origin_1.12.4+dfsg-1_all.deb

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAllHrOoACgkQaVt65L8G
YkCQug//djpVXxXCc7+fjIbe2N7djYIpNjqfI1y9ojRRqxA/hIvSQ27ny2yihp4d
WoUKoNfndzAouNDlV8nkhO6Ccbaiom+kgMClZVAxJ7Ly3yXuUukR9AakvQVQXZG0
xjXHdIzYd0gJR3RXj3KhxlpuMoHwNkuNRgevYlC75XrFzYpvDhZ8RG46w8Gde0Xd
gw4JJGGHg8yhXezdEtzS291NRy2GQIMqJ+0XPacbrtLARWUXGDx1d8CXHC3heQHp
iw0wISufNmujpRqKrZE9xnkbYcVpMVqrF6LMXMzMQZ6fSgK+DQaOlrzGdpfKbpbt
r098ovWGoDE9LoETiRZYlocSWm0h7C7bEjn9hLX7F3Il9gBG0KR50ATkYC2/w0G+
oHIVEQzH4belQuJl6PkR9JcHnYJB1ibTEqTxcKp/17wdyHH0Zy6quRj9W2SlsoBg
YuRZXj+kh2WycJ8BvfuUbmpu5o0SkYTQcA+fROjOyClCvq0u5HUmbayzqCkZax+y
WEdtoed3Ln6WFbomLxDdRFJLlZzGstSwL4x4VANvKy13fR+C+ZQ/dQYhKyEbWU0n
g4V94sjqKEiSukd2LnnxOodwtq91GSgMU8QaX+3Sn/VHXn1UgDxCpA6hwCmoa/Gc
Me/KIWBmJKyX2bJoNuuq8d8hP77EoEAkykKedDG/5dq9fNhJqsg=
=gT/J
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
Pkg-mozext-maintainers mailing list
Pkg-mozext-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-mozext-maintainers

Reply via email to