Your message dated Thu, 23 Mar 2017 08:00:13 +0000 with message-id <e1cqxfj-00041e...@fasolo.debian.org> and subject line Bug#858526: fixed in ublock-origin 1.11.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.11.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: Wed, 22 Mar 2017 22:17:30 -0700 Source: ublock-origin Binary: xul-ext-ublock-origin chromium-ublock-origin ublock-origin-doc Architecture: all source Version: 1.11.4+dfsg-1 Distribution: experimental Urgency: medium Maintainer: Debian Mozilla Extension Maintainers <pkg-mozext-maintainers@lists.alioth.debian.org> Changed-By: Sean Whitton <spwhit...@spwhitton.name> Closes: 857797 858526 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.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: 3ad8af1522a371489d11460ea08f19dda6505bc7 2347 ublock-origin_1.11.4+dfsg-1.dsc cb4852945812c54d11e243abe7ed016cbbc710f4 13307224 ublock-origin_1.11.4+dfsg.orig.tar.xz d7abef87c890a5e3c1f90915d768076dbdf243ec 66536 ublock-origin_1.11.4+dfsg-1.debian.tar.xz 40b8e4d8b377deb84a83f37b2c2cc323fcca8a77 1081292 chromium-ublock-origin_1.11.4+dfsg-1_all.deb 7e84ed11e92b044c7553eba2742d74256ddb4d2b 5760456 ublock-origin-doc_1.11.4+dfsg-1_all.deb ec59fcf5d60a7e64dd9ec4f359502b0314d06fc3 6425 ublock-origin_1.11.4+dfsg-1_amd64.buildinfo d0018bb57c6266de05a6538a6d1a8d32849eee63 1081556 xul-ext-ublock-origin_1.11.4+dfsg-1_all.deb Checksums-Sha256: 1ea3d227e6aac0017a4e910b3d9fa880aef589f1a3722db6df701adbb1be2fd9 2347 ublock-origin_1.11.4+dfsg-1.dsc 54b79458890c4bd0e6ea4dd02fcf60f5b61c41b2aece7ef778ce33e6c6448ffa 13307224 ublock-origin_1.11.4+dfsg.orig.tar.xz 02ccb8fd6f88c2406c0a17ba63a43489bfe821cc98629d335766e01178b48673 66536 ublock-origin_1.11.4+dfsg-1.debian.tar.xz 42a4cef1214b48a17f2a1e90d020bbd579d1374e54833944fa156409e4f04049 1081292 chromium-ublock-origin_1.11.4+dfsg-1_all.deb 6dc0c789ef39e364c741afda13b015fa6af01b48212974d378e2be1ca70f9c08 5760456 ublock-origin-doc_1.11.4+dfsg-1_all.deb 3c8dda825f05ddc01fb0888c2dc1914be87b50477d92d730561dbf14a581d92d 6425 ublock-origin_1.11.4+dfsg-1_amd64.buildinfo 5a42c288db331c42bdcd4921a83b980d976acd68e27b7f4e5a5bb7b37c16a946 1081556 xul-ext-ublock-origin_1.11.4+dfsg-1_all.deb Files: d4b9b4a2a257d8fe33c1809ad6c0075d 2347 web optional ublock-origin_1.11.4+dfsg-1.dsc 8812484a8e542cb98636b36bc32b6cd9 13307224 web optional ublock-origin_1.11.4+dfsg.orig.tar.xz d3464789494abe5370b6c5c45d7d55cd 66536 web optional ublock-origin_1.11.4+dfsg-1.debian.tar.xz aadb4f65baad9e1f1d6e88db2f4dda4f 1081292 web optional chromium-ublock-origin_1.11.4+dfsg-1_all.deb 09ff41f58d12c3522b5afaa792b9d851 5760456 doc optional ublock-origin-doc_1.11.4+dfsg-1_all.deb a88ab92a086c2a5e7bde8bd18aadefa9 6425 web optional ublock-origin_1.11.4+dfsg-1_amd64.buildinfo 01f49aa9d5df00a0e0d1d4d4462dfc59 1081556 web optional xul-ext-ublock-origin_1.11.4+dfsg-1_all.deb -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAljTXcQACgkQaVt65L8G YkDo7g//RQ8QRo+Cuu/E7QZsEBuNfy5zLLz1u8FXY0PIoVlY0cHleh7OC4p71djr ecYMcYMIGTuV3MsIjqAz2ffxQ87Kz5lWpsqHMnUy+djvsSbH4ndcWylvfMAUAlKG HSDDU8n/dPxkL3reZlg18KnmvhxZnPFqH4JipnBwruSNe9D4FR+OIGiFV9h76iy3 cp5Qy43VXFq1YCB1Kkg5Hz/RcW76jAU82dB3SSIeaBLc82CEeprT8vtyqHKeSZ5B SlJrw+j4URqbnpiFtcHCaGaTSbFW1MpVBHptc4mPy/jslLq1ZGInbnhgmoFYDaqz eVQka93B3PJ6841y3i6WpiVWZp7dqmIOIT9FdUtx01ut5T+LYV8qOvZOQMlRERHK 4utVpeygpG9ytw4+hDZaiLOO493KEXhnoVsu1BCiRdU0Zci2BqPiYoaJuoKAeD/L ReLgMp0Djg7ok/xTpTRSdN5PQv1NuIwA0AA7WuYJW1PYDglWW+9RJdUDnp55z6Ue 43l+iilMjbNGrncNtQAHxFYUkrwL8/G65psjIXwNNy6inAS7CEAjZGbUrh7UAhZ1 DF/SZdmgL2jrwLLN3maRBwSzjtl0kg1fSddLerxB4Xg5EX3JGWquy5cVGHike+Pg gBnL9GbKozjrxzCroNv7jKbk6yAxlLWaQmyPQCDAcH/6KNkg8ZI= =GeOt -----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
