Skip to content

Commit

Permalink
Fixes the conflicting package for Firefox present in meilix-default-s…
Browse files Browse the repository at this point in the history
…ettings metapackage (#134)

* deleted the blacklist.d/firefox file because it causes conflicting and it doesn't let firefox to start.

* updated travis
  • Loading branch information
meets2tarun authored and mariobehling committed Aug 3, 2017
1 parent 8f1c01d commit 035f126
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ deploy:
- provider: releases
skip_cleanup: true
api_key:
secure: "tVVKOMh0dZCrHkAfoqIYJYleJwTwXptumugYVcGi/WDaeFi9o1ROTKVdLXUO2CcAUgWUphWjnckF4uVdKBcCB87Af0hgQBXdpDJ4VSb2FFjjY3Lf5dpR1FTYR6Tqsn821mYM17wtwmO1tlg8zFqd1yysr36wZ0EqzFwBtV2FA0jNfxGtFyyJRZnDcCQqwREc2iIENSt8tE787HbwPaWGBEkpC8zYwNYkQXPgFvTi+Z/6Tnobz7gnk9wQFuzFDymr6sDTQF+2ycfGnJnXDOZjqC5haDZbXop6dR/ru6hwO6U4khQIFHEPMZEEHnocB1gOOSiM9Z/yztmY18X4jzx8gZAMIrdKwYlZzEeVAbnlX0WXfjOFmcKIvaMtdNZg9QJil3ePPq/80uNo4TGUy+04ll6jBqqMf4BTs/dxohLyksxN79iuAplRtEl96ZQG+0VI1B0OE3WjwtcuvcuTW7oZ1sOULY4UsNmIdPpJZqIrQpN4AevRJ6DV844uvJ63Sbdzyu0EjMTp+h+2dWiQnnW4aP0mbYsBGWTj0vM2CD/fHtM9W6oVNqLsF7pEe9fg7d2hYJS7Zkuwco33WHqy4JGvLl9uyzSsy0cueJgwg5DYJ8zWDzhlCbKtEk1kG+eKVj+C5rG4shOMK4zf+0iVn5BCNB5d3OgLpAGJwFx1uqqTMrc="
secure: "nAvyjKgkn5G7BYXq85kNXBgb3fdzVSVibvaJKWftimjhHjKzjNfcoUk/IvuoEmwpP6TofgVRx2T689DaUqW29TVXV5O23DvOyJE6SpO7xn0yPC12SPPy3nwwCWkGYvy77akz3N+DvIwGZ712lF2gttTB/mjNB1ZcX5438nCDI1hUw5TcH2QoajhxGJVDJoHQBUxWcOLQh+N+6+ZGnenR7wfLcYOmC6dLNSS9Mn2f/IPF3y3xmq3HZ7CJpHJcfIQ1a0bnHa2h7CIMRZZeXzK/W2RD1qaZ2upz33lVgpCq+/pJCED3vk+XZgmATJML8vzRsY1FlgXgEfWYmaJlsUEcNb/Llu4hwmA9pFO0pI432S3z4pX7NlcVy8Om0eaYvMbyWX4VTOz1urutWTNHQ5337wbkaPYk5ELoI7Ph2pe0uvtlrHzCO6sQWjg79asyFj2zxefOWxRM4d8k1eRQoUZaRpq95wBVYbVCiZqMc+V7TrABBlfC7f8iDmTA4nLmH6f8RIHFL018ikgd6CaRbpSO2XSSNmktR7fuLmC68vBZ64CCxVGMn0poNbdHZVphQ3KgiKH2c2Qb990XgwV/YYDNrjgh2qwpB+NzhE3PJIYWs1AGyEU9fJRJV2ElfLeel9vAWqWSZ/7q+0yPb6ScVCQ4SOJ1TYUpb8qOV3VqgbN/BwQ="
file_glob: true # http://stackoverflow.com/a/28579635/1320237
file: "/home/travis/${image_name}"
on:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/etc/apport/blacklist.d/firefox
/etc/apport/native-origins.d/firefox
/etc/apt/.sources.list.d
/etc/chromium/default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: meilix-default-settings
Version: 1.0
Architecture: all
Maintainer: meilix <vanhonit@gmail.com>
Installed-Size: 99629
Installed-Size: 99628
Section: x11
Priority: extra
Homepage: http://mbm.vn
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions meilix-default-settings/etc/apport/blacklist.d/firefox

This file was deleted.

6 changes: 3 additions & 3 deletions meilix-default-settings_1.0.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 8.0.0)
Package-List:
meilix-default-settings deb x11 extra arch=all
Checksums-Sha1:
48b63d4d7130a5be9ebbc20533310244844dc866 24044532 meilix-default-settings_1.0.tar.xz
0f60332b0e4063b5659d2e5afa225a4455f9aee1 24045200 meilix-default-settings_1.0.tar.xz
Checksums-Sha256:
b7d18f3c424bd4d2a2ee8e219cab311c35cfee1c3e2ecb5ccb8e967311a8beac 24044532 meilix-default-settings_1.0.tar.xz
ae2351fc85c97f3a64167d01357f3f11eaba6d94d36e05cb63852f5c976af00d 24045200 meilix-default-settings_1.0.tar.xz
Files:
0edaeb23ae58b505d4e9a544e3ff229b 24044532 meilix-default-settings_1.0.tar.xz
bb2258ecb0f596cafe878761f539d6a0 24045200 meilix-default-settings_1.0.tar.xz
Binary file modified meilix-default-settings_1.0.tar.xz
Binary file not shown.
Binary file modified meilix-default-settings_1.0_all.deb
Binary file not shown.
18 changes: 9 additions & 9 deletions meilix-default-settings_1.0_amd64.changes
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ Changes:
.
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
Checksums-Sha1:
2b7608809851e3f660e92feb5be995807ec7787c 618 meilix-default-settings_1.0.dsc
48b63d4d7130a5be9ebbc20533310244844dc866 24044532 meilix-default-settings_1.0.tar.xz
f9603ff97719fbcc625b36eb8c0440953867aee6 36076012 meilix-default-settings_1.0_all.deb
5b2de3412893f3ff75fcccadc8d614be419fa69a 618 meilix-default-settings_1.0.dsc
0f60332b0e4063b5659d2e5afa225a4455f9aee1 24045200 meilix-default-settings_1.0.tar.xz
38752dc3a4c3494db57af02a68eaf0f142635655 36081764 meilix-default-settings_1.0_all.deb
Checksums-Sha256:
cf030a7c10c4e0f3499ed69f24eb35cf4188f26f5c03a28ef99c56e57eac43b1 618 meilix-default-settings_1.0.dsc
b7d18f3c424bd4d2a2ee8e219cab311c35cfee1c3e2ecb5ccb8e967311a8beac 24044532 meilix-default-settings_1.0.tar.xz
d23125e2c954525ea6bc9ea808cabe73e62d25ccb9b41bb0b5647adac48c8ce4 36076012 meilix-default-settings_1.0_all.deb
a077a209c97ffb8ab691fe14df0a366cdbdbc0b546c2cf5f56dc540503e19cb5 618 meilix-default-settings_1.0.dsc
ae2351fc85c97f3a64167d01357f3f11eaba6d94d36e05cb63852f5c976af00d 24045200 meilix-default-settings_1.0.tar.xz
12666c91549cd050f42d1f87514ec236a03e3cff31ab8c2e874974d56cc412c9 36081764 meilix-default-settings_1.0_all.deb
Files:
c7974b4304f6eaecccf1e95e24adf6df 618 x11 extra meilix-default-settings_1.0.dsc
0edaeb23ae58b505d4e9a544e3ff229b 24044532 x11 extra meilix-default-settings_1.0.tar.xz
b1f6b245f4f1dab00e0f5ea9c5fbe710 36076012 x11 extra meilix-default-settings_1.0_all.deb
52e9d3e91d3cf0143a0e3a4fc6b66d68 618 x11 extra meilix-default-settings_1.0.dsc
bb2258ecb0f596cafe878761f539d6a0 24045200 x11 extra meilix-default-settings_1.0.tar.xz
34f2a8d5b8756eb6d3585a2bba43abba 36081764 x11 extra meilix-default-settings_1.0_all.deb

0 comments on commit 035f126

Please sign in to comment.